Source formatted

1 files changed, 260 insertions, 275 deletions

diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index b97d421..010d47a 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -18,139 +18,136 @@
  *        uninitialized data points of a dataset.
  */
 
-#include "H5Omodule.h"          /* This source code file is part of the H5O module */
-
-
-#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, H5O_t *open_oh, unsigned mesg_flags,
-    unsigned *ioflags, size_t p_size, const uint8_t *p);
+#include "H5Omodule.h" /* This source code file is part of the H5O module */
+
+#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, 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, 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, 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_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__fill_debug(H5F_t *f, const void *_mesg, FILE *stream,
-    int indent, int fwidth);
+static herr_t H5O__fill_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__fill_debug(H5F_t *f, 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                          */
-    H5O__fill_pre_copy_file,    /* 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                          */
+    H5O__fill_pre_copy_file,                   /* 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                  */
-    H5O__fill_pre_copy_file,            /* 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                  */
+    H5O__fill_pre_copy_file,                   /* 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                 */
 }};
 
 /* Format version bounds for fill value */
@@ -162,13 +159,15 @@ const unsigned H5O_fill_ver_bounds[] = {
 };
 
 /* 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);
@@ -176,7 +175,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
  *
@@ -194,27 +192,27 @@ H5FL_BLK_EXTERN(type_conv);
  */
 static void *
 H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, 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_fill_t    *fill = NULL;
-    void *ret_value = NULL;     /* Return value */
+    H5O_fill_t *fill      = NULL;
+    void *      ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
     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")
 
     /* 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++;
 
@@ -225,51 +223,52 @@ H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
         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((size_t)fill->size > p_size)
+                if ((size_t)fill->size > p_size)
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "destination buffer too small")
-                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")
                 H5MM_memcpy(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")
             H5MM_memcpy(fill->buf, p, (size_t)fill->size);
 
@@ -285,8 +284,8 @@ H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
     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);
     } /* end if */
@@ -294,7 +293,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__fill_new_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__fill_old_decode
  *
@@ -309,49 +307,48 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5O__fill_old_decode(H5F_t *f, H5O_t *open_oh,
-    unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
-    size_t p_size, const uint8_t *p)
+H5O__fill_old_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
+                     unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p)
 {
-    H5O_fill_t *fill = NULL;    /* Decoded fill value message */
-    htri_t exists = FALSE;
-    H5T_t *dt = NULL;
-    void *ret_value = NULL;     /* Return value */
+    H5O_fill_t *fill      = NULL; /* Decoded fill value message */
+    htri_t      exists    = FALSE;
+    H5T_t *     dt        = NULL;
+    void *      ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
     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 (fill->size > 0) {
         H5_CHECK_OVERFLOW(fill->size, ssize_t, size_t);
-        if((size_t)fill->size > p_size)
+        if ((size_t)fill->size > p_size)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "destination buffer too small")
 
         /* Get the datatype message  */
-        if((exists = H5O_msg_exists_oh(open_oh, H5O_DTYPE_ID)) < 0)
+        if ((exists = H5O_msg_exists_oh(open_oh, H5O_DTYPE_ID)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read object header")
-        if(exists) {
-            if(NULL == (dt = (H5T_t *)H5O_msg_read_oh(f, open_oh, H5O_DTYPE_ID, NULL)))
+        if (exists) {
+            if (NULL == (dt = (H5T_t *)H5O_msg_read_oh(f, open_oh, H5O_DTYPE_ID, NULL)))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "can't read DTYPE message")
             /* Verify size */
-            if(fill->size != (ssize_t)H5T_GET_SIZE(dt))
+            if (fill->size != (ssize_t)H5T_GET_SIZE(dt))
                 HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "inconsistent fill value size")
         } /* end if */
 
-        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")
         H5MM_memcpy(fill->buf, p, (size_t)fill->size);
         fill->fill_defined = TRUE;
@@ -360,14 +357,14 @@ H5O__fill_old_decode(H5F_t *f, H5O_t *open_oh,
         fill->size = (-1);
 
     /* Set return value */
-    ret_value = (void*)fill;
+    ret_value = (void *)fill;
 
 done:
-    if(dt)
+    if (dt)
         H5O_msg_free(H5O_DTYPE_ID, dt);
 
-    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);
     } /* end if */
@@ -375,7 +372,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__fill_old_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__fill_new_encode
  *
@@ -393,7 +389,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_STATIC_NOERR
 
@@ -404,7 +400,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;
 
@@ -415,28 +411,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);
                     H5MM_memcpy(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;
 
@@ -446,7 +443,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;
 
@@ -468,12 +465,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
  *
@@ -498,13 +494,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)
         H5MM_memcpy(p, fill->buf, (size_t)fill->size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__fill_old_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__fill_copy
  *
@@ -524,72 +519,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 = NULL;      /* Return value */
+    const H5O_fill_t *src       = (const H5O_fill_t *)_src;
+    H5O_fill_t *      dst       = (H5O_fill_t *)_dst;
+    void *            ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(src);
 
-    if(!dst && NULL == (dst = H5FL_MALLOC(H5O_fill_t)))
+    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)))
+        if (NULL == (dst->buf = H5MM_malloc((size_t)src->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for fill value")
         H5MM_memcpy(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)))
-                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)))
+                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) < 0) {
+                if (H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, dst->buf, bkg_buf) <
+                    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 */
@@ -597,11 +594,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;
 
@@ -609,19 +606,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)
             (void)H5T_close_real(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
  *
@@ -642,8 +638,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 = 0;          /* Return value */
+    const H5O_fill_t *fill      = (const H5O_fill_t *)_fill;
+    size_t            ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -651,27 +647,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
  *
@@ -699,7 +694,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
  *
@@ -715,32 +709,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) {
                 (void)H5T_close_real(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(H5T_reclaim(fill_type_id, fill_space, fill->buf) < 0) {
+            if (H5T_reclaim(fill_type_id, fill_space, fill->buf) < 0) {
                 H5S_close(fill_space);
                 HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "unable to reclaim variable-length fill value data")
             } /* end if */
@@ -753,19 +747,18 @@ H5O_fill_reset_dyn(H5O_fill_t *fill)
         fill->buf = H5MM_xfree(fill->buf);
     } /* end if */
     fill->size = 0;
-    if(fill->type) {
+    if (fill->type) {
         (void)H5T_close_real(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
  *
@@ -781,7 +774,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_STATIC_NOERR
 
@@ -798,7 +791,6 @@ H5O__fill_reset(void *_fill)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__fill_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__fill_free
  *
@@ -823,7 +815,6 @@ H5O__fill_free(void *fill)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__fill_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__fill_pre_copy_file
  *
@@ -838,11 +829,11 @@ H5O__fill_free(void *fill)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__fill_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src,
-    hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
+H5O__fill_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src, hbool_t H5_ATTR_UNUSED *deleted,
+                        const H5O_copy_t *cpy_info, void H5_ATTR_UNUSED *udata)
 {
-    const H5O_fill_t    *fill_src = (const H5O_fill_t *)mesg_src;   /* Source fill value */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    const H5O_fill_t *fill_src  = (const H5O_fill_t *)mesg_src; /* Source fill value */
+    herr_t            ret_value = SUCCEED;                      /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -852,14 +843,13 @@ H5O__fill_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src,
 
     /* Check to ensure that the version of the message to be copied does not exceed
        the message version allowed by the destination file's high bound */
-    if(fill_src->version > H5O_fill_ver_bounds[H5F_HIGH_BOUND(cpy_info->file_dst)])
+    if (fill_src->version > H5O_fill_ver_bounds[H5F_HIGH_BOUND(cpy_info->file_dst)])
         HGOTO_ERROR(H5E_OHDR, H5E_BADRANGE, FAIL, "fill value message version out of bounds")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__fill_pre_copy_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__fill_debug
  *
@@ -873,11 +863,10 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__fill_debug(H5F_t H5_ATTR_UNUSED *f, const void *_fill, FILE *stream,
-    int indent, int fwidth)
+H5O__fill_debug(H5F_t H5_ATTR_UNUSED *f, const void *_fill, FILE *stream, 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_STATIC_NOERR
 
@@ -888,70 +877,69 @@ H5O__fill_debug(H5F_t H5_ATTR_UNUSED *f, const void *_fill, FILE *stream,
     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) {
+    if (fill->type) {
         H5T_debug(fill->type, stream);
         HDfprintf(stream, "\n");
     } /* end if */
@@ -961,7 +949,6 @@ H5O__fill_debug(H5F_t H5_ATTR_UNUSED *f, const void *_fill, FILE *stream,
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__fill_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_fill_convert
  *
@@ -980,10 +967,10 @@ H5O__fill_debug(H5F_t H5_ATTR_UNUSED *f, const void *_fill, FILE *stream,
 herr_t
 H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed)
 {
-    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(FAIL)
 
@@ -992,9 +979,9 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed)
     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)
             (void)H5T_close_real(fill->type);
         fill->type = NULL;
 
@@ -1007,38 +994,38 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed)
     /*
      * Can we convert between source and destination data types?
      */
-    if(NULL == (tpath = H5T_path_find(fill->type, dset_type)))
+    if (NULL == (tpath = H5T_path_find(fill->type, dset_type)))
         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")
             H5MM_memcpy(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) < 0)
+        if (H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, buf, bkg) < 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);
             H5MM_xfree(fill->buf);
             fill->buf = buf;
@@ -1052,19 +1039,18 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed)
     } /* 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_version
  *
@@ -1079,8 +1065,8 @@ done:
 herr_t
 H5O_fill_set_version(H5F_t *f, H5O_fill_t *fill)
 {
-    unsigned version;           /* Message version */
-    herr_t ret_value = SUCCEED; /* Return value */
+    unsigned version;             /* Message version */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1092,7 +1078,7 @@ H5O_fill_set_version(H5F_t *f, H5O_fill_t *fill)
     version = MAX(fill->version, H5O_fill_ver_bounds[H5F_LOW_BOUND(f)]);
 
     /* Version bounds check */
-    if(version > H5O_fill_ver_bounds[H5F_HIGH_BOUND(f)])
+    if (version > H5O_fill_ver_bounds[H5F_HIGH_BOUND(f)])
         HGOTO_ERROR(H5E_OHDR, H5E_BADRANGE, FAIL, "Filter pipeline version out of bounds")
 
     /* Set the message version */
@@ -1101,4 +1087,3 @@ H5O_fill_set_version(H5F_t *f, H5O_fill_t *fill)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_fill_set_version() */
-