Clang-format of source files

1 files changed, 184 insertions, 192 deletions

diff --git a/src/H5Otest.c b/src/H5Otest.c
index 5d242f3..1d38a85 100644
--- a/src/H5Otest.c
+++ b/src/H5Otest.c
@@ -21,58 +21,49 @@
 /* Module Setup */
 /****************/
 
-#define H5A_FRIEND		/*suppress error about including H5Apkg	  */
-#include "H5Omodule.h"          /* This source code file is part of the H5O module */
-#define H5O_TESTING		/*suppress warning about H5O testing funcs*/
-
+#define H5A_FRIEND     /*suppress error about including H5Apkg	  */
+#include "H5Omodule.h" /* This source code file is part of the H5O module */
+#define H5O_TESTING    /*suppress warning about H5O testing funcs*/
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Opkg.h"             /* Object headers			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5CXprivate.h" /* API Contexts                         */
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__is_attr_dense_test
@@ -95,37 +86,37 @@
 htri_t
 H5O__is_attr_dense_test(hid_t oid)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    H5O_loc_t *loc;             /* Pointer to object's location */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    htri_t ret_value = FAIL;    /* Return value */
+    H5O_t *     oh = NULL;              /* Object header */
+    H5O_ainfo_t ainfo;                  /* Attribute information for object */
+    H5O_loc_t * loc;                    /* Pointer to object's location */
+    hbool_t     api_ctx_pushed = FALSE; /* Whether API context pushed */
+    htri_t      ret_value      = FAIL;  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Set API context */
-    if(H5CX_push() < 0)
+    if (H5CX_push() < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set API context")
     api_ctx_pushed = TRUE;
 
     /* Get the object header */
-    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_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A__get_ainfo(loc->file, 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 if dense storage is being used */
-    if(H5F_addr_defined(ainfo.fheap_addr)) {
+    if (H5F_addr_defined(ainfo.fheap_addr)) {
         /* Check for any messages in object header */
         HDassert(H5O__msg_count_real(oh, H5O_MSG_ATTR) == 0);
 
@@ -135,15 +126,14 @@ H5O__is_attr_dense_test(hid_t oid)
         ret_value = FALSE;
 
 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_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-    if(api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop() < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__is_attr_dense_test() */
+} /* H5O__is_attr_dense_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__is_attr_empty_test
@@ -165,34 +155,34 @@ done:
 htri_t
 H5O__is_attr_empty_test(hid_t oid)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5B2_t *bt2_name = NULL;    /* v2 B-tree handle for name index */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    htri_t ainfo_exists = FALSE;        /* Whether the attribute info exists in the file */
-    H5O_loc_t *loc;             /* Pointer to object's location */
-    hsize_t nattrs;             /* Number of attributes */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    htri_t ret_value = FAIL;    /* Return value */
+    H5O_t *     oh       = NULL;        /* Object header */
+    H5B2_t *    bt2_name = NULL;        /* v2 B-tree handle for name index */
+    H5O_ainfo_t ainfo;                  /* Attribute information for object */
+    htri_t      ainfo_exists = FALSE;   /* Whether the attribute info exists in the file */
+    H5O_loc_t * loc;                    /* Pointer to object's location */
+    hsize_t     nattrs;                 /* Number of attributes */
+    hbool_t     api_ctx_pushed = FALSE; /* Whether API context pushed */
+    htri_t      ret_value      = FAIL;  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Set API context */
-    if(H5CX_push() < 0)
+    if (H5CX_push() < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set API context")
     api_ctx_pushed = TRUE;
 
     /* Get the object header */
-    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_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if((ainfo_exists = H5A__get_ainfo(loc->file, 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 */
 
@@ -200,10 +190,10 @@ H5O__is_attr_empty_test(hid_t oid)
     nattrs = H5O__msg_count_real(oh, H5O_MSG_ATTR);
 
     /* Check for later version of object header format & attribute info available */
-    if(oh->version > H5O_VERSION_1) {
-        if(ainfo_exists) {
+    if (oh->version > H5O_VERSION_1) {
+        if (ainfo_exists) {
             /* Check for using dense storage */
-            if(H5F_addr_defined(ainfo.fheap_addr)) {
+            if (H5F_addr_defined(ainfo.fheap_addr)) {
                 /* Check for any messages in object header */
                 HDassert(nattrs == 0);
 
@@ -211,15 +201,17 @@ H5O__is_attr_empty_test(hid_t oid)
                 H5_BEGIN_TAG(loc->addr);
 
                 /* Open the name index v2 B-tree */
-                if(NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
-                    HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
+                if (NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
+                    HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTOPENOBJ, FAIL,
+                                    "unable to open v2 B-tree for name index")
 
                 /* Reset metadata tag in API context */
                 H5_END_TAG
 
                 /* Retrieve # of records in name index */
-                if(H5B2_get_nrec(bt2_name, &nattrs) < 0)
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
+                if (H5B2_get_nrec(bt2_name, &nattrs) < 0)
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL,
+                                "unable to retrieve # of records from name index")
             } /* end if */
 
             /* Verify that attribute count in object header is correct */
@@ -234,17 +226,16 @@ H5O__is_attr_empty_test(hid_t oid)
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name) < 0)
+    if (bt2_name && H5B2_close(bt2_name) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    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_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-    if(api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop() < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__is_attr_empty_test() */
+} /* H5O__is_attr_empty_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__num_attrs_test
@@ -267,34 +258,34 @@ done:
 herr_t
 H5O__num_attrs_test(hid_t oid, hsize_t *nattrs)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5B2_t *bt2_name = NULL;    /* v2 B-tree handle for name index */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    H5O_loc_t *loc;             /* Pointer to object's location */
-    hsize_t obj_nattrs;         /* Number of attributes */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh       = NULL;          /* Object header */
+    H5B2_t *    bt2_name = NULL;          /* v2 B-tree handle for name index */
+    H5O_ainfo_t ainfo;                    /* Attribute information for object */
+    H5O_loc_t * loc;                      /* Pointer to object's location */
+    hsize_t     obj_nattrs;               /* Number of attributes */
+    hbool_t     api_ctx_pushed = FALSE;   /* Whether API context pushed */
+    herr_t      ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Set API context */
-    if(H5CX_push() < 0)
+    if (H5CX_push() < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set API context")
     api_ctx_pushed = TRUE;
 
     /* Get the object header */
-    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_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A__get_ainfo(loc->file, 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 */
 
@@ -302,9 +293,9 @@ H5O__num_attrs_test(hid_t oid, hsize_t *nattrs)
     obj_nattrs = H5O__msg_count_real(oh, H5O_MSG_ATTR);
 
     /* Check for later version of object header format */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for using dense storage */
-        if(H5F_addr_defined(ainfo.fheap_addr)) {
+        if (H5F_addr_defined(ainfo.fheap_addr)) {
             /* Check for any messages in object header */
             HDassert(obj_nattrs == 0);
 
@@ -312,14 +303,14 @@ H5O__num_attrs_test(hid_t oid, hsize_t *nattrs)
             H5_BEGIN_TAG(loc->addr);
 
             /* Open the name index v2 B-tree */
-            if(NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
+            if (NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
                 HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
             /* Reset metadata tag in API context */
             H5_END_TAG
 
             /* Retrieve # of records in name index */
-            if(H5B2_get_nrec(bt2_name, &obj_nattrs) < 0)
+            if (H5B2_get_nrec(bt2_name, &obj_nattrs) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
         } /* end if */
 
@@ -332,17 +323,16 @@ H5O__num_attrs_test(hid_t oid, hsize_t *nattrs)
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name) < 0)
+    if (bt2_name && H5B2_close(bt2_name) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for name index")
-    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_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-    if(api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop() < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__num_attrs_test() */
+} /* H5O__num_attrs_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__attr_dense_info_test
@@ -367,22 +357,22 @@ done:
 herr_t
 H5O__attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5B2_t *bt2_name = NULL;    /* v2 B-tree handle for name index */
-    H5B2_t *bt2_corder = NULL;  /* v2 B-tree handle for creation order index */
-    H5O_ainfo_t ainfo;          /* Attribute information for object */
-    H5O_loc_t *loc;            /* Pointer to object's location */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh         = NULL;        /* Object header */
+    H5B2_t *    bt2_name   = NULL;        /* v2 B-tree handle for name index */
+    H5B2_t *    bt2_corder = NULL;        /* v2 B-tree handle for creation order index */
+    H5O_ainfo_t ainfo;                    /* Attribute information for object */
+    H5O_loc_t * loc;                      /* Pointer to object's location */
+    hbool_t     api_ctx_pushed = FALSE;   /* Whether API context pushed */
+    herr_t      ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Set API context */
-    if(H5CX_push() < 0)
+    if (H5CX_push() < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set API context")
     api_ctx_pushed = TRUE;
 
@@ -390,40 +380,42 @@ H5O__attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
     H5_BEGIN_TAG(loc->addr);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Check for (& retrieve if available) attribute info */
-        if(H5A__get_ainfo(loc->file, oh, &ainfo) < 0)
+        if (H5A__get_ainfo(loc->file, oh, &ainfo) < 0)
             HGOTO_ERROR_TAG(H5E_ATTR, H5E_CANTGET, FAIL, "can't check for attribute info message")
     } /* end if */
 
     /* Check for 'dense' attribute storage file addresses being defined */
-    if(!H5F_addr_defined(ainfo.fheap_addr))
+    if (!H5F_addr_defined(ainfo.fheap_addr))
         HGOTO_DONE_TAG(FAIL)
-    if(!H5F_addr_defined(ainfo.name_bt2_addr))
+    if (!H5F_addr_defined(ainfo.name_bt2_addr))
         HGOTO_DONE_TAG(FAIL)
 
     /* Open the name index v2 B-tree */
-    if(NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
+    if (NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
         HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index")
 
     /* Retrieve # of records in name index */
-    if(H5B2_get_nrec(bt2_name, name_count) < 0)
+    if (H5B2_get_nrec(bt2_name, name_count) < 0)
         HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
 
     /* Check if there is a creation order index */
-    if(H5F_addr_defined(ainfo.corder_bt2_addr)) {
+    if (H5F_addr_defined(ainfo.corder_bt2_addr)) {
         /* Open the creation order index v2 B-tree */
-        if(NULL == (bt2_corder = H5B2_open(loc->file, ainfo.corder_bt2_addr, NULL)))
-            HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index")
+        if (NULL == (bt2_corder = H5B2_open(loc->file, ainfo.corder_bt2_addr, NULL)))
+            HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTOPENOBJ, FAIL,
+                            "unable to open v2 B-tree for creation order index")
 
         /* Retrieve # of records in creation order index */
-        if(H5B2_get_nrec(bt2_corder, corder_count) < 0)
-            HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from creation order index")
+        if (H5B2_get_nrec(bt2_corder, corder_count) < 0)
+            HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTCOUNT, FAIL,
+                            "unable to retrieve # of records from creation order index")
     } /* end if */
     else
         *corder_count = 0;
@@ -433,19 +425,18 @@ H5O__attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
 
 done:
     /* Release resources */
-    if(bt2_name && H5B2_close(bt2_name) < 0)
+    if (bt2_name && H5B2_close(bt2_name) < 0)
         HDONE_ERROR(H5E_OHDR, 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_OHDR, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for creation order index")
-    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_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-    if(api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop() < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__attr_dense_info_test() */
+} /* H5O__attr_dense_info_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__check_msg_marked_test
@@ -470,45 +461,45 @@ done:
 herr_t
 H5O__check_msg_marked_test(hid_t oid, hbool_t flag_val)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5O_loc_t *loc;            /* Pointer to object's location */
-    H5O_mesg_t *idx_msg;        /* Pointer to message */
-    unsigned idx;               /* Index of message */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh = NULL;           /* Object header */
+    H5O_loc_t * loc;                 /* Pointer to object's location */
+    H5O_mesg_t *idx_msg;             /* Pointer to message */
+    unsigned    idx;                 /* Index of message */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Locate "unknown" message  */
-    for(idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
-        if(idx_msg->type->id == H5O_UNKNOWN_ID) {
+    for (idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
+        if (idx_msg->type->id == H5O_UNKNOWN_ID) {
             /* Check for "unknown" message having the correct flags */
-            if(((idx_msg->flags & H5O_MSG_FLAG_WAS_UNKNOWN) > 0) != flag_val)
-                HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "'unknown' message has incorrect 'was unknown' flag value")
+            if (((idx_msg->flags & H5O_MSG_FLAG_WAS_UNKNOWN) > 0) != flag_val)
+                HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL,
+                            "'unknown' message has incorrect 'was unknown' flag value")
 
             /* Break out of loop, to indicate that the "unknown" message was found */
             break;
         } /* end if */
 
     /* Check for not finding an "unknown" message */
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "'unknown' message type not found")
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__check_msg_marked_test() */
+} /* H5O__check_msg_marked_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__expunge_chunks_test
@@ -531,16 +522,16 @@ done:
 herr_t
 H5O__expunge_chunks_test(const H5O_loc_t *loc)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    haddr_t chk_addr[16];       /* Array of chunk addresses */
-    size_t nchunks;             /* Number of chunks in object header */
-    size_t u;                   /* Local index variable */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t * oh = NULL;           /* Object header */
+    haddr_t chk_addr[16];        /* Array of chunk addresses */
+    size_t  nchunks;             /* Number of chunks in object header */
+    size_t  u;                   /* Local index variable */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Safety check */
@@ -548,24 +539,24 @@ H5O__expunge_chunks_test(const H5O_loc_t *loc)
     HDassert(0 < nchunks && nchunks < NELMTS(chk_addr));
 
     /* Iterate over all the chunks, saving the chunk addresses */
-    for(u = 0; u < oh->nchunks; u++)
+    for (u = 0; u < oh->nchunks; u++)
         chk_addr[u] = oh->chunk[u].addr;
 
     /* Release the object header */
-    if(H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Iterate over all the saved chunk addresses, evicting them from the cache */
     /* (in reverse order, so that chunk #0 is unpinned) */
-    for(u = nchunks - 1; u < nchunks; u--)
-        if(H5AC_expunge_entry(loc->file, (u == 0 ? H5AC_OHDR : H5AC_OHDR_CHK), chk_addr[u], H5AC__NO_FLAGS_SET) < 0)
+    for (u = nchunks - 1; u < nchunks; u--)
+        if (H5AC_expunge_entry(loc->file, (u == 0 ? H5AC_OHDR : H5AC_OHDR_CHK), chk_addr[u],
+                               H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTEXPUNGE, FAIL, "unable to expunge object header chunk")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__expunge_chunks_test() */
+} /* H5O__expunge_chunks_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__get_rc_test
@@ -589,7 +580,7 @@ done:
 herr_t
 H5O__get_rc_test(const H5O_loc_t *loc, unsigned *rc)
 {
-    H5O_t *oh = NULL;           /* Object header */
+    H5O_t *oh        = NULL;    /* Object header */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
@@ -599,7 +590,7 @@ H5O__get_rc_test(const H5O_loc_t *loc, unsigned *rc)
     HDassert(rc);
 
     /* Get the object header */
-    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_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Save the refcount for the object header */
@@ -607,13 +598,12 @@ H5O__get_rc_test(const H5O_loc_t *loc, unsigned *rc)
 
 done:
     /* Release the object header */
-    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_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__get_rc_test() */
+} /* H5O__get_rc_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__msg_get_chunkno_test
@@ -638,31 +628,31 @@ done:
 herr_t
 H5O__msg_get_chunkno_test(hid_t oid, unsigned msg_type, unsigned *chunk_num)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5O_loc_t *loc;            /* Pointer to object's location */
-    H5O_mesg_t *idx_msg;        /* Pointer to message */
-    unsigned idx;               /* Index of message */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh = NULL;                /* Object header */
+    H5O_loc_t * loc;                      /* Pointer to object's location */
+    H5O_mesg_t *idx_msg;                  /* Pointer to message */
+    unsigned    idx;                      /* Index of message */
+    hbool_t     api_ctx_pushed = FALSE;   /* Whether API context pushed */
+    herr_t      ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Set API context */
-    if(H5CX_push() < 0)
+    if (H5CX_push() < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set API context")
     api_ctx_pushed = TRUE;
 
     /* Get the object header */
-    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_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Locate first message of given type */
-    for(idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
-        if(idx_msg->type->id == msg_type) {
+    for (idx = 0, idx_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, idx_msg++)
+        if (idx_msg->type->id == msg_type) {
             /* Set the chunk number for the message */
             *chunk_num = idx_msg->chunkno;
 
@@ -671,19 +661,18 @@ H5O__msg_get_chunkno_test(hid_t oid, unsigned msg_type, unsigned *chunk_num)
         } /* end if */
 
     /* Check for not finding a message of the given type*/
-    if(idx == oh->nmesgs)
+    if (idx == oh->nmesgs)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "message of type not found")
 
 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_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-    if(api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop() < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__msg_get_chunkno_test() */
+} /* H5O__msg_get_chunkno_test() */
 
-
 /*--------------------------------------------------------------------------
  NAME
     H5O__msg_move_to_new_chunk_test
@@ -706,76 +695,80 @@ done:
 herr_t
 H5O__msg_move_to_new_chunk_test(hid_t oid, unsigned msg_type)
 {
-    H5O_t *oh = NULL;           /* Object header */
-    H5O_loc_t *loc;             /* Pointer to object's location */
-    H5O_mesg_t *curr_msg;       /* Pointer to current message */
-    unsigned idx;               /* Index of message */
-    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *     oh = NULL;                /* Object header */
+    H5O_loc_t * loc;                      /* Pointer to object's location */
+    H5O_mesg_t *curr_msg;                 /* Pointer to current message */
+    unsigned    idx;                      /* Index of message */
+    hbool_t     api_ctx_pushed = FALSE;   /* Whether API context pushed */
+    herr_t      ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Get object location for object */
-    if(NULL == (loc = H5O_get_loc(oid)))
+    if (NULL == (loc = H5O_get_loc(oid)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Set API context */
-    if(H5CX_push() < 0)
+    if (H5CX_push() < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set API context")
     api_ctx_pushed = TRUE;
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Locate first message of given type */
-    for(idx = 0, curr_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, curr_msg++)
-        if(curr_msg->type->id == msg_type) {
-            H5O_msg_alloc_info_t found_msg;     /* Information about message to move */
-            unsigned msg_chunkno = curr_msg->chunkno;         /* Chunk that the message is in */
-            uint8_t *end_chunk_data = (oh->chunk[msg_chunkno].image + oh->chunk[msg_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[msg_chunkno].gap);     /* End of message data in chunk */
-            uint8_t *end_msg = curr_msg->raw + curr_msg->raw_size;  /* End of current message */
-            size_t gap_size = 0;            /* Size of gap after current message */
-            size_t null_size = 0;           /* Size of NULL message after current message */
-            unsigned null_msgno = 0;        /* Index of NULL message after current message */
-            size_t total_size;              /* Total size of available space "around" current message */
-            size_t new_idx;                 /* Index of new null message */
+    for (idx = 0, curr_msg = &oh->mesg[0]; idx < oh->nmesgs; idx++, curr_msg++)
+        if (curr_msg->type->id == msg_type) {
+            H5O_msg_alloc_info_t found_msg;                       /* Information about message to move */
+            unsigned             msg_chunkno = curr_msg->chunkno; /* Chunk that the message is in */
+            uint8_t *            end_chunk_data =
+                (oh->chunk[msg_chunkno].image + oh->chunk[msg_chunkno].size) -
+                (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[msg_chunkno].gap); /* End of message data in chunk */
+            uint8_t *end_msg    = curr_msg->raw + curr_msg->raw_size;    /* End of current message */
+            size_t   gap_size   = 0; /* Size of gap after current message */
+            size_t   null_size  = 0; /* Size of NULL message after current message */
+            unsigned null_msgno = 0; /* Index of NULL message after current message */
+            size_t   total_size;     /* Total size of available space "around" current message */
+            size_t   new_idx;        /* Index of new null message */
 
             /* Check if the message is the last one in the chunk */
-            if(end_msg == end_chunk_data)
+            if (end_msg == end_chunk_data)
                 gap_size = oh->chunk[msg_chunkno].gap;
             else {
-                H5O_mesg_t *tmp_msg;    /* Temp. pointer to message to operate on */
-                unsigned v;             /* Local index variable */
+                H5O_mesg_t *tmp_msg; /* Temp. pointer to message to operate on */
+                unsigned    v;       /* Local index variable */
 
                 /* Check for null message after this message, in same chunk */
-                for(v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
-                    if(tmp_msg->type->id == H5O_NULL_ID && (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) == end_msg) {
+                for (v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
+                    if (tmp_msg->type->id == H5O_NULL_ID &&
+                        (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) == end_msg) {
                         null_msgno = v;
-                        null_size = (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + tmp_msg->raw_size;
+                        null_size  = (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + tmp_msg->raw_size;
                         break;
                     } /* end if */
 
                     /* XXX: Should also check for NULL message in front of current message... */
 
                 } /* end for */
-            } /* end else */
+            }     /* end else */
 
             /* Add up current message's total available space */
             total_size = curr_msg->raw_size + gap_size + null_size;
 
             /* Set up "found message" info for moving the message */
-            found_msg.msgno = (int)idx;
-            found_msg.id = curr_msg->type->id;
-            found_msg.chunkno = msg_chunkno;
-            found_msg.gap_size = gap_size;
-            found_msg.null_size = null_size;
+            found_msg.msgno      = (int)idx;
+            found_msg.id         = curr_msg->type->id;
+            found_msg.chunkno    = msg_chunkno;
+            found_msg.gap_size   = gap_size;
+            found_msg.null_size  = null_size;
             found_msg.total_size = total_size;
             found_msg.null_msgno = null_msgno;
 
             /* Allocate and initialize new chunk in the file, moving the found message */
             /* (*new_idx returned from this routine is unused here) */
-            if(H5O__alloc_chunk(loc->file, oh, (curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh)), oh->nmesgs, &found_msg, &new_idx) < 0)
+            if (H5O__alloc_chunk(loc->file, oh, (curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh)),
+                                 oh->nmesgs, &found_msg, &new_idx) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, FAIL, "can't allocate new object header chunk")
 
             /* Break out of loop, the message was found */
@@ -783,11 +776,10 @@ H5O__msg_move_to_new_chunk_test(hid_t oid, unsigned msg_type)
         } /* end if */
 
 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_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
-    if(api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop() < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRESET, FAIL, "can't reset API context")
 
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5O__msg_move_to_new_chunk_test() */
-
+} /* H5O__msg_move_to_new_chunk_test() */