Clang-format of source files

1 files changed, 439 insertions, 463 deletions

diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c
index d6b9f7a..bf75634 100644
--- a/src/H5Oattribute.c
+++ b/src/H5Oattribute.c
@@ -24,122 +24,114 @@
 /* Module Setup */
 /****************/
 
-#define H5A_FRIEND              /* Suppress error about including H5Apkg.h */
-#include "H5Omodule.h"          /* This source code file is part of the H5O module */
-
+#define H5A_FRIEND     /* Suppress error about including H5Apkg.h */
+#include "H5Omodule.h" /* This source code file is part of the H5O module */
 
 /***********/
 /* 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 */
-    H5O_ainfo_t *ainfo;         /* Attribute info struct */
+    H5F_t *      f;     /* Pointer to file for insertion */
+    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 */
-    H5A_t *attr;                /* Attribute data to update object header with */
+    H5F_t *f;    /* Pointer to file attribute is in */
+    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 */
-    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 */
+    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 removing an attribute */
 typedef struct {
     /* down */
-    H5F_t *f;                   /* Pointer to file attribute is in */
-    const char *name;           /* Name of attribute to open */
+    H5F_t *     f;    /* Pointer to file attribute is in */
+    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;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5O__attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata);
-static htri_t H5O__attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr,
-    const char* name_to_open);
+static herr_t H5O__attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg, unsigned H5_ATTR_UNUSED sequence,
+                                    unsigned *oh_modified, void *_udata);
+static htri_t H5O__attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char *name_to_open);
 static herr_t H5O__attr_open_cb(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence,
-    unsigned H5_ATTR_UNUSED *oh_modified, void *_udata);
+                                unsigned H5_ATTR_UNUSED *oh_modified, void *_udata);
 static herr_t H5O__attr_open_by_idx_cb(const H5A_t *attr, void *_ret_attr);
-static herr_t H5O__attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata);
+static herr_t H5O__attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg, unsigned H5_ATTR_UNUSED sequence,
+                                 unsigned *oh_modified, void *_udata);
 static herr_t H5O__attr_rename_chk_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg,
-    unsigned H5_ATTR_UNUSED sequence, unsigned H5_ATTR_UNUSED *oh_modified, void *_udata);
-static herr_t H5O__attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata);
+                                      unsigned H5_ATTR_UNUSED sequence, unsigned H5_ATTR_UNUSED *oh_modified,
+                                      void *_udata);
+static herr_t H5O__attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg, unsigned H5_ATTR_UNUSED sequence,
+                                      unsigned *oh_modified, void *_udata);
 static herr_t H5O__attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo);
-static herr_t H5O__attr_remove_cb(H5O_t *oh, H5O_mesg_t *mesg,
-    unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata);
+static herr_t H5O__attr_remove_cb(H5O_t *oh, H5O_mesg_t *mesg, unsigned H5_ATTR_UNUSED sequence,
+                                  unsigned *oh_modified, void *_udata);
 static herr_t H5O__attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg,
-    unsigned H5_ATTR_UNUSED sequence, unsigned H5_ATTR_UNUSED *oh_modified, void *_udata);
+                                  unsigned H5_ATTR_UNUSED sequence, unsigned H5_ATTR_UNUSED *oh_modified,
+                                  void *_udata);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_to_dense_cb
  *
@@ -154,12 +146,12 @@ static herr_t H5O__attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg,
  *-------------------------------------------------------------------------
  */
 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_STATIC
 
@@ -172,12 +164,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->ainfo, attr) < 0)
+    if (H5A__dense_insert(udata->f, 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, oh, mesg, FALSE) < 0)
+    if (H5O__release_mesg(udata->f, 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 */
@@ -187,7 +179,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__attr_to_dense_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_create
  *
@@ -203,10 +194,10 @@ done:
 herr_t
 H5O__attr_create(const H5O_loc_t *loc, 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
 
@@ -215,26 +206,26 @@ H5O__attr_create(const H5O_loc_t *loc, H5A_t *attr)
     HDassert(attr);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
+    if (NULL == (oh = H5O_pin(loc)))
+        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, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A__get_ainfo(loc->file, 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;
@@ -247,46 +238,47 @@ H5O__attr_create(const H5O_loc_t *loc, 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, NULL, NULL, H5O_ATTR_ID, attr)) < 0)
+            if ((sharable = H5SM_can_share(loc->file, 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, &ainfo) < 0)
+                if (H5A__dense_create(loc->file, &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.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) < 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) < 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 */
@@ -297,14 +289,13 @@ H5O__attr_create(const H5O_loc_t *loc, 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, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, &ainfo) < 0)
+        if (new_ainfo) {
+            if (H5O__msg_append_real(loc->file, 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, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, &ainfo) < 0)
-                HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute info message")
+        else if (H5O__msg_write_real(loc->file, 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 if */
     else {
         /* Set "bogus" creation index for attribute */
@@ -315,15 +306,15 @@ H5O__attr_create(const H5O_loc_t *loc, 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, &ainfo, attr) < 0)
+        if (H5A__dense_insert(loc->file, &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, oh, H5O_MSG_ATTR, 0, 0, attr) < 0)
-            HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header")
+        if (H5O__msg_append_real(loc->file, oh, H5O_MSG_ATTR, 0, 0, attr) < 0)
+        HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header")
 
     /* Increment reference count for shared attribute object for the
      * object handle created by the caller function H5A__create.  The count
@@ -333,11 +324,11 @@ H5O__attr_create(const H5O_loc_t *loc, 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, H5O_ATTR_ID, &attr->sh_loc, &attr_rc) < 0)
+        if (H5SM_get_refcount(loc->file, 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
@@ -363,26 +354,25 @@ H5O__attr_create(const H5O_loc_t *loc, H5A_t *attr)
          *
          *      *ick* -QAK, 2007/01/08
          */
-        if(attr_rc > 1) {
-            if(H5O__attr_delete(loc->file, oh, attr) < 0)
+        if (attr_rc > 1) {
+            if (H5O__attr_delete(loc->file, 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, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, 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
  *
@@ -397,11 +387,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_STATIC
 
@@ -411,15 +401,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 */
@@ -430,7 +419,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__attr_open_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_open_by_name
  *
@@ -446,12 +434,12 @@ done:
 H5A_t *
 H5O__attr_open_by_name(const H5O_loc_t *loc, const char *name)
 {
-    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 = NULL;            /* 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       = NULL;  /* Return value */
 
     FUNC_ENTER_PACKAGE_TAG(loc->addr)
 
@@ -460,49 +448,49 @@ H5O__attr_open_by_name(const H5O_loc_t *loc, const char *name)
     HDassert(name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         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, oh, &ainfo) < 0)
+        if (H5A__get_ainfo(loc->file, 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, &ainfo, name)))
+            if (NULL == (opened_attr = H5A__dense_open(loc->file, &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) < 0)
+            if (H5O__msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata) < 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 */
@@ -511,7 +499,7 @@ H5O__attr_open_by_name(const H5O_loc_t *loc, const char *name)
         } /* end else */
 
         /* Mark datatype as being on disk now */
-        if(H5T_set_loc(opened_attr->shared->dt, H5F_VOL_OBJ(loc->file), H5T_LOC_DISK) < 0)
+        if (H5T_set_loc(opened_attr->shared->dt, H5F_VOL_OBJ(loc->file), H5T_LOC_DISK) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "invalid datatype location")
     } /* end else */
 
@@ -519,18 +507,17 @@ H5O__attr_open_by_name(const H5O_loc_t *loc, const char *name)
     ret_value = opened_attr;
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, 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_TAG(ret_value)
 } /* end H5O__attr_open_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_open_by_idx_cb
  *
@@ -546,8 +533,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_STATIC
 
@@ -556,14 +543,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
  *
@@ -578,14 +564,13 @@ 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)
+H5O__attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n)
 {
-    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 = NULL;            /* Return value */
+    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       = NULL;  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -593,48 +578,48 @@ 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, idx_type, order, n, NULL, &attr_op, &opened_attr) < 0)
+    if (H5O_attr_iterate_real((hid_t)-1, loc, idx_type, order, n, NULL, &attr_op, &opened_attr) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_BADITER, NULL, "can't locate attribute")
 
     /* 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, H5F_VOL_OBJ(loc->file), H5T_LOC_DISK) < 0)
+            if (H5T_set_loc(opened_attr->shared->dt, H5F_VOL_OBJ(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:
     /* 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
  *
@@ -651,71 +636,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_STATIC
 
     /* 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_ATTR, 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 *)H5VL_object_verify(attr_id_list[u], H5I_ATTR)))
+            if (NULL == (*attr = (H5A_t *)H5VL_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
  *
@@ -731,10 +715,10 @@ done:
 herr_t
 H5O__attr_update_shared(H5F_t *f, 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_PACKAGE
 
@@ -743,22 +727,22 @@ H5O__attr_update_shared(H5F_t *f, H5O_t *oh, H5A_t *attr, H5O_shared_t *update_s
     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, oh, 0, H5O_ATTR_ID, attr, NULL)) == 0)
+    if ((shared_mesg = H5SM_try_share(f, 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, H5O_ATTR_ID, &attr->sh_loc, &attr_rc) < 0)
+    if (H5SM_get_refcount(f, 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
@@ -770,25 +754,24 @@ H5O__attr_update_shared(H5F_t *f, H5O_t *oh, H5A_t *attr, H5O_shared_t *update_s
      *
      *      *ick* -QAK, 2007/01/08
      */
-    if(attr_rc == 1)
+    if (attr_rc == 1)
         /* Increment reference count on attribute components */
-        if(H5O__attr_link(f, oh, attr) < 0)
+        if (H5O__attr_link(f, oh, attr) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust attribute link count")
 
     /* Remove the old attribute from the SOHM storage */
-    if(H5SM_delete(f, oh, &sh_mesg) < 0)
+    if (H5SM_delete(f, 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
  *
@@ -803,13 +786,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_STATIC
 
@@ -819,15 +802,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, oh, mesg->chunkno)))
+        if (NULL == (chk_proxy = H5O__chunk_protect(udata->f, 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.
          * 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);
@@ -835,7 +818,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) */
-            H5MM_memcpy(((H5A_t *)mesg->native)->shared->data, udata->attr->shared->data, udata->attr->shared->data_size);
+            H5MM_memcpy(((H5A_t *)mesg->native)->shared->data, udata->attr->shared->data,
+                        udata->attr->shared->data_size);
         } /* end if */
 
         /* Mark the message as modified */
@@ -843,14 +827,15 @@ H5O__attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
         chk_dirtied = TRUE;
 
         /* Release chunk */
-        if(H5O__chunk_unprotect(udata->f, chk_proxy, chk_dirtied) < 0)
+        if (H5O__chunk_unprotect(udata->f, 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, 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, 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;
@@ -864,13 +849,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, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O__chunk_unprotect(udata->f, 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
  *
@@ -886,9 +870,9 @@ done:
 herr_t
 H5O__attr_write(const H5O_loc_t *loc, 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_PACKAGE
 
@@ -897,55 +881,54 @@ H5O__attr_write(const H5O_loc_t *loc, H5A_t *attr)
     HDassert(attr);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc)))
+    if (NULL == (oh = H5O_pin(loc)))
         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, oh, &ainfo) < 0)
+        if (H5A__get_ainfo(loc->file, 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, &ainfo, attr) < 0)
+        if (H5A__dense_write(loc->file, &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.attr = attr;
+        udata.f     = loc->file;
+        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) < 0)
+        if (H5O__msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata) < 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, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, 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
  *
@@ -960,11 +943,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_STATIC_NOERR
 
@@ -974,7 +958,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;
 
@@ -985,7 +969,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
  *
@@ -1005,13 +988,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_STATIC
 
@@ -1021,11 +1004,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, oh, mesg->chunkno)))
+        if (NULL == (chk_proxy = H5O__chunk_protect(udata->f, oh, mesg->chunkno)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, H5_ITER_ERROR, "unable to load object header chunk")
 
         /* Change the name for the attribute */
@@ -1033,7 +1016,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 */
@@ -1041,24 +1024,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, chk_proxy, chk_dirtied) < 0)
+        if (H5O__chunk_unprotect(udata->f, 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, 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, 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
@@ -1070,22 +1054,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 because
                  *      the "native" pointer has been reset)
                  */
-                if(H5O__release_mesg(udata->f, oh, mesg, FALSE) < 0)
-                    HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, H5_ITER_ERROR, "unable to release previous attribute")
+                if (H5O__release_mesg(udata->f, 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, 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, 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);
@@ -1093,7 +1080,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;
@@ -1107,13 +1094,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, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O__chunk_unprotect(udata->f, 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
  *
@@ -1127,12 +1113,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O__attr_rename(const H5O_loc_t *loc, const char *old_name,
-    const char *new_name)
+H5O__attr_rename(const H5O_loc_t *loc, 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_PACKAGE_TAG(loc->addr)
 
@@ -1142,66 +1127,65 @@ H5O__attr_rename(const H5O_loc_t *loc, const char *old_name,
     HDassert(new_name);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc)))
+    if (NULL == (oh = H5O_pin(loc)))
         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, oh, &ainfo) < 0)
+        if (H5A__get_ainfo(loc->file, 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, &ainfo, old_name, new_name) < 0)
+        if (H5A__dense_rename(loc->file, &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.f        = loc->file;
         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) < 0)
+        if (H5O__msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata) < 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) < 0)
+        if (H5O__msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata) < 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, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, 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_TAG(ret_value)
 } /* end H5O__attr_rename() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_attr_iterate_real
  *
@@ -1215,14 +1199,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, 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, 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 = FAIL;            /* 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 = FAIL;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_TAG(loc->addr)
 
@@ -1233,62 +1216,62 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, H5_index_t idx_type,
     HDassert(attr_op);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
-	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+        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, oh, &ainfo) < 0)
+        if (H5A__get_ainfo(loc->file, 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, oh, H5AC__NO_FLAGS_SET) < 0)
+        if (H5O_unprotect(loc, 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, loc_id, &ainfo, idx_type, order, skip, last_attr, attr_op, op_data)) < 0)
+        if ((ret_value = H5A__dense_iterate(loc->file, 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, oh, idx_type, order, &atable) < 0)
+        if (H5A__compact_build_table(loc->file, 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, oh, H5AC__NO_FLAGS_SET) < 0)
+        if (H5O_unprotect(loc, 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_BADITER, "iteration operator failed");
     } /* end else */
 
 done:
     /* Release resources */
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, 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_TAG(ret_value)
 } /* end H5O_attr_iterate_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_iterate
  *
@@ -1302,11 +1285,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O__attr_iterate(hid_t loc_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, 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 = FAIL;    /* Return value */
+    H5G_loc_t loc;              /* Object location */
+    herr_t    ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1314,18 +1297,18 @@ H5O__attr_iterate(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order,
     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, idx_type, order, skip, last_attr, attr_op, op_data)) < 0)
+    if ((ret_value =
+             H5O_attr_iterate_real(loc_id, loc.oloc, 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
  *
@@ -1349,8 +1332,8 @@ done:
 static herr_t
 H5O__attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo)
 {
-    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_STATIC
 
@@ -1363,40 +1346,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, ainfo, H5_INDEX_NAME, H5_ITER_NATIVE, &atable) < 0)
+        if (H5A__dense_build_table(loc->file, 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, oh, (atable.attrs[u])) < 0)
+                    if (H5O__attr_link(loc->file, oh, (atable.attrs[u])) < 0)
                         HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust attribute link count")
                 } /* end if */
                 else {
@@ -1407,51 +1391,50 @@ 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, oh, H5O_MSG_ATTR, 0, 0, exist_attr) < 0)
+                if (found_open_attr && exist_attr) {
+                    if (H5O__msg_append_real(loc->file, oh, H5O_MSG_ATTR, 0, 0, exist_attr) < 0)
                         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't create message")
 
                 } /* end if */
-                else
-                    if(H5O__msg_append_real(loc->file, oh, H5O_MSG_ATTR, 0, 0, (atable.attrs[u])) < 0)
-                        HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't create message")
+                else if (H5O__msg_append_real(loc->file, 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, ainfo) < 0)
+            if (H5A__dense_delete(loc->file, ainfo) < 0)
                 HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete dense attribute storage")
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Update the message after removing the attribute */
     /* This is particularly needed when removing the last attribute that is
      * accessed via fractal heap/v2 B-tree (HDFFV-9277)
      */
-    if(H5O__msg_write_real(loc->file, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, ainfo) < 0)
+    if (H5O__msg_write_real(loc->file, oh, H5O_MSG_AINFO, H5O_MSG_FLAG_DONTSHARE, 0, ainfo) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUPDATE, FAIL, "unable to update attribute info message")
 
     /* 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) < 0)
+    if (ainfo->nattrs == 0) {
+        if (H5O__msg_remove_real(loc->file, oh, H5O_MSG_AINFO, H5O_ALL, NULL, NULL, TRUE) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute info")
     } /* end if */
 
 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
  *
@@ -1466,11 +1449,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_STATIC
 
@@ -1480,9 +1463,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, oh, mesg, TRUE) < 0)
+        if (H5O__release_mesg(udata->f, 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 */
@@ -1499,7 +1482,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__attr_remove_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_remove
  *
@@ -1515,10 +1497,10 @@ done:
 herr_t
 H5O__attr_remove(const H5O_loc_t *loc, const char *name)
 {
-    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_PACKAGE_TAG(loc->addr)
 
@@ -1527,60 +1509,59 @@ H5O__attr_remove(const H5O_loc_t *loc, const char *name)
     HDassert(name);
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc)))
+    if (NULL == (oh = H5O_pin(loc)))
         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, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A__get_ainfo(loc->file, 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, &ainfo, name) < 0)
+        if (H5A__dense_remove(loc->file, &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.name = name;
+        udata.f     = loc->file;
+        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) < 0)
+        if (H5O__msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata) < 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) < 0)
+    if (ainfo_exists)
+        if (H5O__attr_remove_update(loc, oh, &ainfo) < 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, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, 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_TAG(ret_value)
 } /* end H5O__attr_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_remove_by_idx
  *
@@ -1595,14 +1576,13 @@ 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)
+H5O__attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n)
 {
-    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_PACKAGE_TAG(loc->addr)
 
@@ -1610,70 +1590,69 @@ 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)))
+    if (NULL == (oh = H5O_pin(loc)))
         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, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A__get_ainfo(loc->file, 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, &ainfo, idx_type, order, n) < 0)
+        if (H5A__dense_remove_by_idx(loc->file, &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, oh, idx_type, order, &atable) < 0)
+        if (H5A__compact_build_table(loc->file, 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.name = ((atable.attrs[n])->shared)->name;
+        udata.f     = loc->file;
+        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) < 0)
+        if (H5O__msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata) < 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) < 0)
+    if (ainfo_exists)
+        if (H5O__attr_remove_update(loc, oh, &ainfo) < 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, oh, FALSE) < 0)
+    if (H5O_touch_oh(loc->file, 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_TAG(ret_value)
 } /* end H5O__attr_remove_by_idx() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_count_real
  *
@@ -1689,7 +1668,7 @@ done:
 herr_t
 H5O__attr_count_real(H5F_t *f, H5O_t *oh, hsize_t *nattrs)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1699,26 +1678,26 @@ H5O__attr_count_real(H5F_t *f, 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, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A__get_ainfo(f, 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 */
@@ -1727,7 +1706,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__attr_count_real */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_exists_cb
  *
@@ -1742,11 +1720,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_STATIC_NOERR
 
@@ -1755,7 +1733,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;
 
@@ -1766,7 +1744,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
  *
@@ -1782,9 +1759,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)
 {
-    H5O_t *oh = NULL;           /* Pointer to actual object header */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    htri_t ret_value = FAIL;    /* Return value */
+    H5O_t *     oh = NULL;        /* Pointer to actual object header */
+    H5O_ainfo_t ainfo;            /* Attribute information for object */
+    htri_t      ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_PACKAGE_TAG(loc->addr)
 
@@ -1793,36 +1770,36 @@ H5O__attr_exists(const H5O_loc_t *loc, const char *name)
     HDassert(name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         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, oh, &ainfo) < 0)
+        if (H5A__get_ainfo(loc->file, 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, &ainfo, name)) < 0)
+        if ((ret_value = H5A__dense_exists(loc->file, &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.name = name;
+        udata.f     = loc->file;
+        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) < 0)
+        if (H5O__msg_iterate_real(loc->file, oh, H5O_MSG_ATTR, &op, &udata) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_BADITER, FAIL, "error checking for existence of attribute")
 
         /* Check that we found the attribute */
@@ -1830,13 +1807,12 @@ H5O__attr_exists(const H5O_loc_t *loc, const char *name)
     } /* end else */
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O__attr_exists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__attr_bh_info
  *
@@ -1852,10 +1828,10 @@ done:
 herr_t
 H5O__attr_bh_info(H5F_t *f, 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_PACKAGE
 
@@ -1864,58 +1840,58 @@ H5O__attr_bh_info(H5F_t *f, 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, oh, &ainfo)) < 0)
+        if ((ainfo_exists = H5A__get_ainfo(f, 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, ainfo.name_bt2_addr, NULL)))
+                if (NULL == (bt2_name = H5B2_open(f, 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, &(bh_info->index_size)) < 0)
+                if (H5B2_size(bt2_name, &(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, 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, 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, &(bh_info->index_size)) < 0)
+                if (H5B2_size(bt2_corder, &(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, ainfo.fheap_addr)))
+                if (NULL == (fheap = H5HF_open(f, ainfo.fheap_addr)))
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open fractal heap")
 
                 /* Get heap storage size */
-                if(H5HF_size(fheap, &(bh_info->heap_size)) < 0)
+                if (H5HF_size(fheap, &(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) < 0)
+    if (fheap && H5HF_close(fheap) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, FAIL, "can't close fractal heap")
-    if(bt2_name && H5B2_close(bt2_name) < 0)
+    if (bt2_name && H5B2_close(bt2_name) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    if(bt2_corder && H5B2_close(bt2_corder) < 0)
+    if (bt2_corder && H5B2_close(bt2_corder) < 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() */