Clang-format of source files

1 files changed, 243 insertions, 269 deletions

diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 789f20c..3eecfb3 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -20,63 +20,54 @@
 /* Module Setup */
 /****************/
 
-#include "H5Tmodule.h"          /* This source code file is part of the H5T module */
-
+#include "H5Tmodule.h" /* This source code file is part of the H5T module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                        */
-#include "H5ACprivate.h"        /* Metadata cache                           */
-#include "H5CXprivate.h"        /* API Contexts                             */
-#include "H5Eprivate.h"         /* Error handling                           */
-#include "H5FLprivate.h"        /* Free lists                               */
-#include "H5FOprivate.h"        /* File objects                             */
-#include "H5Iprivate.h"         /* IDs                                      */
-#include "H5Lprivate.h"         /* Links                                    */
-#include "H5MMprivate.h"        /* Memory Management                        */
-#include "H5Oprivate.h"         /* Object headers                           */
-#include "H5Pprivate.h"         /* Property lists                           */
-#include "H5Tpkg.h"             /* Datatypes                                */
-#include "H5VLprivate.h"        /* Virtual Object Layer                     */
-
+#include "H5private.h"   /* Generic Functions                        */
+#include "H5ACprivate.h" /* Metadata cache                           */
+#include "H5CXprivate.h" /* API Contexts                             */
+#include "H5Eprivate.h"  /* Error handling                           */
+#include "H5FLprivate.h" /* Free lists                               */
+#include "H5FOprivate.h" /* File objects                             */
+#include "H5Iprivate.h"  /* IDs                                      */
+#include "H5Lprivate.h"  /* Links                                    */
+#include "H5MMprivate.h" /* Memory Management                        */
+#include "H5Oprivate.h"  /* Object headers                           */
+#include "H5Pprivate.h"  /* Property lists                           */
+#include "H5Tpkg.h"      /* Datatypes                                */
+#include "H5VLprivate.h" /* Virtual Object Layer                     */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 static H5T_t *H5T__open_oid(const H5G_loc_t *loc);
 
-
 /*********************/
 /* Public Variables */
 /*********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -87,8 +78,6 @@ H5FL_EXTERN(H5VL_t);
 /* Declare a free list to manage the H5VL_object_t struct */
 H5FL_EXTERN(H5VL_object_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tcommit2
  *
@@ -103,67 +92,65 @@ H5FL_EXTERN(H5VL_object_t);
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id,
-    hid_t tcpl_id, hid_t tapl_id)
+H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id)
 {
-    void *data = NULL;                  /* VOL-managed datatype data */
-    H5VL_object_t *new_obj = NULL;      /* VOL object that holds the datatype object and the VOL info */
-    H5T_t *dt = NULL;                   /* High level datatype object that wraps the VOL object */
-    H5VL_object_t *vol_obj = NULL;      /* object of loc_id */
+    void *            data    = NULL; /* VOL-managed datatype data */
+    H5VL_object_t *   new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */
+    H5T_t *           dt      = NULL; /* High level datatype object that wraps the VOL object */
+    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
     H5VL_loc_params_t loc_params;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "i*siiii", loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id);
 
     /* Check arguments */
-    if(!name)
+    if (!name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "name parameter cannot be NULL")
-    if(!*name)
+    if (!*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "name parameter cannot be an empty string")
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_is_named(dt))
+    if (H5T_is_named(dt))
         HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is already committed")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == lcpl_id)
+    if (H5P_DEFAULT == lcpl_id)
         lcpl_id = H5P_LINK_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
+    else if (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link creation property list")
 
     /* Get correct property list */
     if (H5P_DEFAULT == tcpl_id)
         tcpl_id = H5P_DATATYPE_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
+    else if (TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
 
     /* Set the LCPL for the API context */
     H5CX_set_lcpl(lcpl_id);
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&tapl_id, H5P_CLS_TACC, loc_id, TRUE) < 0)
+    if (H5CX_set_apl(&tapl_id, H5P_CLS_TACC, loc_id, TRUE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
 
     /* Fill in location struct fields */
-    loc_params.type         = H5VL_OBJECT_BY_SELF;
-    loc_params.obj_type     = H5I_get_type(loc_id);
+    loc_params.type     = H5VL_OBJECT_BY_SELF;
+    loc_params.obj_type = H5I_get_type(loc_id);
 
     /* Get the object from the loc_id */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
 
     /* Commit the type */
-    if(NULL == (data = H5VL_datatype_commit(vol_obj, &loc_params, name, type_id, lcpl_id, tcpl_id, tapl_id, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
+    if (NULL == (data = H5VL_datatype_commit(vol_obj, &loc_params, name, type_id, lcpl_id, tcpl_id, tapl_id,
+                                             H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
     /* Set up VOL object */
-    if(NULL == (new_obj = H5FL_CALLOC(H5VL_object_t)))
+    if (NULL == (new_obj = H5FL_CALLOC(H5VL_object_t)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "can't allocate top object structure")
     new_obj->connector = vol_obj->connector;
-    new_obj->connector->nrefs ++;
+    new_obj->connector->nrefs++;
     new_obj->data = data;
 
     /* Set the committed type object to the VOL connector pointer in the H5T_t struct */
@@ -173,7 +160,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcommit2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__commit_named
  *
@@ -188,13 +174,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
-    hid_t lcpl_id, hid_t tcpl_id)
+H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, hid_t lcpl_id, hid_t tcpl_id)
 {
-    H5O_obj_create_t ocrt_info;         /* Information for object creation */
-    H5T_obj_create_t tcrt_info;         /* Information for named datatype creation */
-    H5T_state_t old_state;              /* The state of the datatype before H5T__commit. */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_obj_create_t ocrt_info;           /* Information for object creation */
+    H5T_obj_create_t tcrt_info;           /* Information for named datatype creation */
+    H5T_state_t      old_state;           /* The state of the datatype before H5T__commit. */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -209,16 +194,16 @@ H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
     old_state = dt->shared->state;
 
     /* Set up named datatype creation info */
-    tcrt_info.dt = dt;
+    tcrt_info.dt      = dt;
     tcrt_info.tcpl_id = tcpl_id;
 
     /* Set up object creation information */
     ocrt_info.obj_type = H5O_TYPE_NAMED_DATATYPE;
     ocrt_info.crt_info = &tcrt_info;
-    ocrt_info.new_obj = NULL;
+    ocrt_info.new_obj  = NULL;
 
     /* Create the new named datatype and link it to its parent group */
-    if(H5L_link_object(loc, name, &ocrt_info, lcpl_id) < 0)
+    if (H5L_link_object(loc, name, &ocrt_info, lcpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create and link to named datatype")
     HDassert(ocrt_info.new_obj);
 
@@ -226,34 +211,34 @@ done:
     /* If the datatype was committed but something failed after that, we need
      * to return it to the state it was in before it was committed.
      */
-    if(ret_value < 0 && (NULL != ocrt_info.new_obj)) {
-        if(dt->shared->state == H5T_STATE_OPEN && dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
+    if (ret_value < 0 && (NULL != ocrt_info.new_obj)) {
+        if (dt->shared->state == H5T_STATE_OPEN && dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED) {
             /* Remove the datatype from the list of opened objects in the file */
-            if(H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+            if (H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-            if(H5FO_delete(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
-                HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't remove dataset from list of open objects")
+            if (H5FO_delete(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+                HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL,
+                            "can't remove dataset from list of open objects")
 
             /* Close the datatype object */
-            if(H5O_close(&(dt->oloc), NULL) < 0)
+            if (H5O_close(&(dt->oloc), NULL) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release object header")
 
             /* Remove the datatype's object header from the file */
-            if(H5O_delete(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+            if (H5O_delete(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to delete object header")
 
             /* Mark datatype as being back in memory */
-            if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY))
+            if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY))
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to return datatype to memory")
-            dt->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
+            dt->sh_loc.type   = H5O_SHARE_TYPE_UNSHARED;
             dt->shared->state = old_state;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__commit_named() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tcommit_anon
  *
@@ -276,51 +261,50 @@ done:
 herr_t
 H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id)
 {
-    void *dt = NULL;                    /* datatype object created by VOL connector */
-    H5VL_object_t *new_obj = NULL;      /* VOL object that holds the datatype object and the VOL info */
-    H5T_t       *type = NULL;           /* Datatype created */
-    H5VL_object_t *vol_obj = NULL;      /* object of loc_id */
+    void *            dt      = NULL; /* datatype object created by VOL connector */
+    H5VL_object_t *   new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */
+    H5T_t *           type    = NULL; /* Datatype created */
+    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
     H5VL_loc_params_t loc_params;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "iiii", loc_id, type_id, tcpl_id, tapl_id);
 
     /* Check arguments */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(H5T_is_named(type))
+    if (H5T_is_named(type))
         HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "datatype is already committed")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tcpl_id)
+    if (H5P_DEFAULT == tcpl_id)
         tcpl_id = H5P_DATATYPE_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
+    else if (TRUE != H5P_isa_class(tcpl_id, H5P_DATATYPE_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype creation property list")
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&tapl_id, H5P_CLS_TACC, loc_id, TRUE) < 0)
+    if (H5CX_set_apl(&tapl_id, H5P_CLS_TACC, loc_id, TRUE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
 
     /* Fill in location struct fields */
-    loc_params.type         = H5VL_OBJECT_BY_SELF;
-    loc_params.obj_type     = H5I_get_type(loc_id);
+    loc_params.type     = H5VL_OBJECT_BY_SELF;
+    loc_params.obj_type = H5I_get_type(loc_id);
 
     /* Get the file object */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
 
     /* Commit the datatype */
-    if(NULL == (dt = H5VL_datatype_commit(vol_obj, &loc_params, NULL, type_id, H5P_LINK_CREATE_DEFAULT,
-            tcpl_id, tapl_id, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
+    if (NULL == (dt = H5VL_datatype_commit(vol_obj, &loc_params, NULL, type_id, H5P_LINK_CREATE_DEFAULT,
+                                           tcpl_id, tapl_id, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
     /* Setup VOL object */
-    if(NULL == (new_obj = H5FL_CALLOC(H5VL_object_t)))
+    if (NULL == (new_obj = H5FL_CALLOC(H5VL_object_t)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "can't allocate top object structure")
     new_obj->connector = vol_obj->connector;
-    new_obj->connector->nrefs ++;
+    new_obj->connector->nrefs++;
     new_obj->data = dt;
 
     /* Set the committed type object to the VOL connector pointer in the H5T_t struct */
@@ -330,7 +314,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcommit_anon() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__commit_anon
  *
@@ -346,8 +329,8 @@ done:
 herr_t
 H5T__commit_anon(H5F_t *file, H5T_t *type, hid_t tcpl_id)
 {
-    H5O_loc_t *oloc;                    /* Object location for datatype */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_loc_t *oloc;                /* Object location for datatype */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -357,24 +340,23 @@ H5T__commit_anon(H5F_t *file, H5T_t *type, hid_t tcpl_id)
     HDassert(tcpl_id != H5P_DEFAULT);
 
     /* Commit the type */
-    if(H5T__commit(file, type, tcpl_id) < 0)
+    if (H5T__commit(file, type, tcpl_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
     /* Release the datatype's object header */
 
     /* Get the new committed datatype's object location */
-    if(NULL == (oloc = H5T_oloc(type)))
+    if (NULL == (oloc = H5T_oloc(type)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to get object location of committed datatype")
 
     /* Decrement refcount on committed datatype's object header in memory */
-    if(H5O_dec_rc_by_loc(oloc) < 0)
-       HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
+    if (H5O_dec_rc_by_loc(oloc) < 0)
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5T__commit_anon() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__commit
  *
@@ -391,11 +373,11 @@ done:
 herr_t
 H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id)
 {
-    H5O_loc_t   temp_oloc;              /* Temporary object header location */
-    H5G_name_t  temp_path;              /* Temporary path */
-    hbool_t     loc_init = FALSE;       /* Have temp_oloc and temp_path been initialized? */
-    size_t      dtype_size;             /* Size of the datatype message */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_loc_t  temp_oloc;           /* Temporary object header location */
+    H5G_name_t temp_path;           /* Temporary path */
+    hbool_t    loc_init = FALSE;    /* Have temp_oloc and temp_path been initialized? */
+    size_t     dtype_size;          /* Size of the datatype message */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -404,7 +386,7 @@ H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id)
     HDassert(tcpl_id != H5P_DEFAULT);
 
     /* Check if we are allowed to write to this file */
-    if(0 == (H5F_INTENT(file) & H5F_ACC_RDWR))
+    if (0 == (H5F_INTENT(file) & H5F_ACC_RDWR))
         HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /*
@@ -412,30 +394,30 @@ H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id)
      * normally fails on such types (try H5Tclose(H5T_NATIVE_INT)) but closing
      * a named type should always succeed.
      */
-    if(H5T_STATE_NAMED == type->shared->state || H5T_STATE_OPEN == type->shared->state)
+    if (H5T_STATE_NAMED == type->shared->state || H5T_STATE_OPEN == type->shared->state)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is already committed")
-    if(H5T_STATE_IMMUTABLE == type->shared->state)
+    if (H5T_STATE_IMMUTABLE == type->shared->state)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "datatype is immutable")
 
     /* Check for a "sensible" datatype to store on disk */
-    if(H5T_is_sensible(type) <= 0)
+    if (H5T_is_sensible(type) <= 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "datatype is not sensible")
 
     /* Mark datatype as being on disk now.  This step changes the size of
      *  datatype as stored on disk.
      */
-    if(H5T_set_loc(type, H5F_VOL_OBJ(file), H5T_LOC_DISK) < 0)
+    if (H5T_set_loc(type, H5F_VOL_OBJ(file), H5T_LOC_DISK) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype on disk")
 
     /* Reset datatype location and path */
-    if(H5O_loc_reset(&temp_oloc) < 0)
+    if (H5O_loc_reset(&temp_oloc) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize location")
-    if(H5G_name_reset(&temp_path) < 0)
+    if (H5G_name_reset(&temp_path) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize path")
     loc_init = TRUE;
 
     /* Set the version for datatype */
-    if(H5T_set_version(file, type) < 0)
+    if (H5T_set_version(file, type) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set version of datatype")
 
     /* Calculate message size information, for creating object header */
@@ -446,56 +428,58 @@ H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id)
      * Create the object header and open it for write access. Insert the data
      * type message and then give the object header a name.
      */
-    if(H5O_create(file, dtype_size, (size_t)1, tcpl_id, &temp_oloc) < 0)
+    if (H5O_create(file, dtype_size, (size_t)1, tcpl_id, &temp_oloc) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create datatype object header")
-    if(H5O_msg_create(&temp_oloc, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, type) < 0)
+    if (H5O_msg_create(&temp_oloc, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT | H5O_MSG_FLAG_DONTSHARE,
+                       H5O_UPDATE_TIME, type) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to update type header message")
 
     /* Copy the new object header's location into the datatype, taking ownership of it */
-    if(H5O_loc_copy_shallow(&(type->oloc), &temp_oloc) < 0)
+    if (H5O_loc_copy_shallow(&(type->oloc), &temp_oloc) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy datatype location")
-    if(H5G_name_copy(&(type->path), &temp_path, H5_COPY_SHALLOW) < 0)
+    if (H5G_name_copy(&(type->path), &temp_path, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy datatype location")
     loc_init = FALSE;
 
     /* Set the shared info fields */
     H5T_update_shared(type);
-    type->shared->state = H5T_STATE_OPEN;
+    type->shared->state    = H5T_STATE_OPEN;
     type->shared->fo_count = 1;
 
     /* Add datatype to the list of open objects in the file */
-    if(H5FO_top_incr(type->sh_loc.file, type->sh_loc.u.loc.oh_addr) < 0)
+    if (H5FO_top_incr(type->sh_loc.file, type->sh_loc.u.loc.oh_addr) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, FAIL, "can't incr object ref. count")
-    if(H5FO_insert(type->sh_loc.file, type->sh_loc.u.loc.oh_addr, type->shared, TRUE) < 0)
+    if (H5FO_insert(type->sh_loc.file, type->sh_loc.u.loc.oh_addr, type->shared, TRUE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "can't insert datatype into list of open objects")
 
     /* Mark datatype as being on memory again.  Since this datatype may still be
      *  used in memory after committed to disk, change its size back as in memory.
      */
-    if(H5T_set_loc(type, NULL, H5T_LOC_MEMORY) < 0)
+    if (H5T_set_loc(type, NULL, H5T_LOC_MEMORY) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype in memory")
 
 done:
-    if(ret_value < 0) {
-        if(loc_init) {
+    if (ret_value < 0) {
+        if (loc_init) {
             H5O_loc_free(&temp_oloc);
             H5G_name_free(&temp_path);
         } /* end if */
-        if((type->shared->state == H5T_STATE_TRANSIENT || type->shared->state == H5T_STATE_RDONLY) && (type->sh_loc.type == H5O_SHARE_TYPE_COMMITTED)) {
-            if(H5O_dec_rc_by_loc(&(type->oloc)) < 0)
-                HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "unable to decrement refcount on newly created object")
-            if(H5O_close(&(type->oloc), NULL) < 0)
+        if ((type->shared->state == H5T_STATE_TRANSIENT || type->shared->state == H5T_STATE_RDONLY) &&
+            (type->sh_loc.type == H5O_SHARE_TYPE_COMMITTED)) {
+            if (H5O_dec_rc_by_loc(&(type->oloc)) < 0)
+                HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL,
+                            "unable to decrement refcount on newly created object")
+            if (H5O_close(&(type->oloc), NULL) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release object header")
-            if(H5O_delete(file, type->sh_loc.u.loc.oh_addr) < 0)
+            if (H5O_delete(file, type->sh_loc.u.loc.oh_addr) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to delete object header")
             type->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5T__commit() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tcommitted
  *
@@ -511,14 +495,14 @@ done:
 htri_t
 H5Tcommitted(hid_t type_id)
 {
-    H5T_t      *type;           /* Datatype to query */
-    htri_t      ret_value;      /* Return value */
+    H5T_t *type;      /* Datatype to query */
+    htri_t ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", type_id);
 
     /* Check arguments */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Set return value */
@@ -528,7 +512,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tcommitted() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_link
  *
@@ -546,7 +529,7 @@ done:
 int
 H5T_link(const H5T_t *type, int adjust)
 {
-    int ret_value = -1;         /* Return value */
+    int ret_value = -1; /* Return value */
 
     FUNC_ENTER_NOAPI((-1))
 
@@ -554,14 +537,13 @@ H5T_link(const H5T_t *type, int adjust)
     HDassert(type->sh_loc.type == H5O_SHARE_TYPE_COMMITTED);
 
     /* Adjust the link count on the named datatype */
-    if((ret_value = H5O_link(&type->oloc, adjust)) < 0)
+    if ((ret_value = H5O_link(&type->oloc, adjust)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_LINKCOUNT, (-1), "unable to adjust named datatype link count")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_link() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Topen2
  *
@@ -580,50 +562,50 @@ done:
 hid_t
 H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
 {
-    void *dt = NULL;           /* datatype object created by VOL connector */
-    H5VL_object_t *vol_obj = NULL;     /* object of loc_id */
+    void *            dt      = NULL; /* datatype object created by VOL connector */
+    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
     H5VL_loc_params_t loc_params;
-    hid_t        ret_value = H5I_INVALID_HID;      /* Return value */
+    hid_t             ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE3("i", "i*si", loc_id, name, tapl_id);
 
     /* Check args */
-    if(!name)
+    if (!name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "name parameter cannot be NULL")
-    if(!*name)
+    if (!*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "name parameter cannot be an empty string")
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&tapl_id, H5P_CLS_TACC, loc_id, FALSE) < 0)
+    if (H5CX_set_apl(&tapl_id, H5P_CLS_TACC, loc_id, FALSE) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
 
     /* Fill in location struct fields */
-    loc_params.type         = H5VL_OBJECT_BY_SELF;
-    loc_params.obj_type     = H5I_get_type(loc_id);
+    loc_params.type     = H5VL_OBJECT_BY_SELF;
+    loc_params.obj_type = H5I_get_type(loc_id);
 
     /* get the location object */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid file identifier")
 
     /* Open the datatype */
-    if(NULL == (dt = H5VL_datatype_open(vol_obj, &loc_params, name, tapl_id, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
+    if (NULL == (dt = H5VL_datatype_open(vol_obj, &loc_params, name, tapl_id, H5P_DATASET_XFER_DEFAULT,
+                                         H5_REQUEST_NULL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open named datatype")
 
     /* Register the type and return the ID */
-    if((ret_value = H5VL_register(H5I_DATATYPE, dt, vol_obj->connector, TRUE)) < 0)
+    if ((ret_value = H5VL_register(H5I_DATATYPE, dt, vol_obj->connector, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register named datatype")
 
 done:
     /* Cleanup on error */
-    if(H5I_INVALID_HID == ret_value)
-        if(dt && H5VL_datatype_close(vol_obj, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
+    if (H5I_INVALID_HID == ret_value)
+        if (dt && H5VL_datatype_close(vol_obj, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, H5I_INVALID_HID, "unable to release datatype")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Topen2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tget_create_plist
  *
@@ -646,39 +628,41 @@ done:
 hid_t
 H5Tget_create_plist(hid_t dtype_id)
 {
-    H5T_t          *type        = NULL;             /* Datatype object for ID */
-    htri_t          is_named    = FAIL;             /* Is the datatype named? */
-    hid_t           ret_value   = H5I_INVALID_HID;  /* Return value */
+    H5T_t *type      = NULL;            /* Datatype object for ID */
+    htri_t is_named  = FAIL;            /* Is the datatype named? */
+    hid_t  ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE1("i", "i", dtype_id);
 
     /* Check arguments */
-    if(NULL == (type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
+    if (NULL == (type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not a datatype")
 
     /* Check if the datatype is committed */
-    if(FAIL == (is_named = H5T_is_named(type)))
+    if (FAIL == (is_named = H5T_is_named(type)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5I_INVALID_HID, "can't check whether datatype is committed")
 
     /* If the datatype is not committed/named, just copy the default
      * creation property list and return that.
      */
-    if(FALSE == is_named) {
-        H5P_genplist_t *tcpl_plist  = NULL;
+    if (FALSE == is_named) {
+        H5P_genplist_t *tcpl_plist = NULL;
 
         /* Copy the default datatype creation property list */
-        if(NULL == (tcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_DATATYPE_CREATE_ID_g)))
+        if (NULL == (tcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_DATATYPE_CREATE_ID_g)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "can't get default creation property list")
-        if((ret_value = H5P_copy_plist(tcpl_plist, TRUE)) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5I_INVALID_HID, "unable to copy the creation property list")
+        if ((ret_value = H5P_copy_plist(tcpl_plist, TRUE)) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5I_INVALID_HID,
+                        "unable to copy the creation property list")
     } /* end if */
     /* If the datatype is committed, retrieve further information */
     else {
         H5VL_object_t *vol_obj = type->vol_obj;
 
         /* Get the property list through the VOL */
-        if(H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_TCPL, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &ret_value) < 0)
+        if (H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_TCPL, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
+                              &ret_value) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5I_INVALID_HID, "can't get object creation info")
     } /* end else */
 
@@ -686,7 +670,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Tflush
  *
@@ -702,32 +685,32 @@ done:
 herr_t
 H5Tflush(hid_t type_id)
 {
-    H5T_t *dt;                          /* Datatype for this operation */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5T_t *dt;                  /* Datatype for this operation */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(!H5T_is_named(dt))
+    if (!H5T_is_named(dt))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a committed datatype")
 
     /* Set up collective metadata if appropriate */
-    if(H5CX_set_loc(type_id) < 0)
+    if (H5CX_set_loc(type_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
 
     /* Flush metadata for named datatype */
-    if(dt->vol_obj)
-        if(H5VL_datatype_specific(dt->vol_obj, H5VL_DATATYPE_FLUSH, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, type_id) < 0)
+    if (dt->vol_obj)
+        if (H5VL_datatype_specific(dt->vol_obj, H5VL_DATATYPE_FLUSH, H5P_DATASET_XFER_DEFAULT,
+                                   H5_REQUEST_NULL, type_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFLUSH, FAIL, "unable to flush datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Tflush */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Trefresh
  *
@@ -743,32 +726,32 @@ done:
 herr_t
 H5Trefresh(hid_t type_id)
 {
-    H5T_t *dt;                          /* Datatype for this operation */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5T_t *dt;                  /* Datatype for this operation */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", type_id);
 
     /* Check args */
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    if(!H5T_is_named(dt))
+    if (!H5T_is_named(dt))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a committed datatype")
 
     /* Set up collective metadata if appropriate */
-    if(H5CX_set_loc(type_id) < 0)
+    if (H5CX_set_loc(type_id) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
 
     /* Refresh the datatype's metadata */
-    if(dt->vol_obj)
-        if(H5VL_datatype_specific(dt->vol_obj, H5VL_DATATYPE_REFRESH, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, type_id) < 0)
+    if (dt->vol_obj)
+        if (H5VL_datatype_specific(dt->vol_obj, H5VL_DATATYPE_REFRESH, H5P_DATASET_XFER_DEFAULT,
+                                   H5_REQUEST_NULL, type_id) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "unable to refresh datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Trefresh */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__get_create_plist
  *
@@ -791,10 +774,10 @@ done:
 hid_t
 H5T__get_create_plist(const H5T_t *type)
 {
-    H5P_genplist_t      *tcpl_plist;    /* Existing datatype creation propertty list */
-    H5P_genplist_t      *new_plist;     /* New datatype creation property list */
-    hid_t		new_tcpl_id = FAIL;     /* New datatype creation property list */
-    hid_t		ret_value = H5I_INVALID_HID;       /* Return value */
+    H5P_genplist_t *tcpl_plist;                    /* Existing datatype creation propertty list */
+    H5P_genplist_t *new_plist;                     /* New datatype creation property list */
+    hid_t           new_tcpl_id = FAIL;            /* New datatype creation property list */
+    hid_t           ret_value   = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -802,32 +785,31 @@ H5T__get_create_plist(const H5T_t *type)
     HDassert(type);
 
     /* Copy the default datatype creation property list */
-    if(NULL == (tcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_DATATYPE_CREATE_ID_g)))
-         HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5I_INVALID_HID, "can't get default creation property list")
-    if((new_tcpl_id = H5P_copy_plist(tcpl_plist, TRUE)) < 0)
+    if (NULL == (tcpl_plist = (H5P_genplist_t *)H5I_object(H5P_LST_DATATYPE_CREATE_ID_g)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5I_INVALID_HID, "can't get default creation property list")
+    if ((new_tcpl_id = H5P_copy_plist(tcpl_plist, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5I_INVALID_HID, "unable to copy the creation property list")
 
     /* Get property list object for new TCPL */
-    if(NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_tcpl_id)))
+    if (NULL == (new_plist = (H5P_genplist_t *)H5I_object(new_tcpl_id)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, H5I_INVALID_HID, "can't get property list")
 
     /* Retrieve any object creation properties */
-    if(H5O_get_create_plist(&type->oloc, new_plist) < 0)
+    if (H5O_get_create_plist(&type->oloc, new_plist) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5I_INVALID_HID, "can't get object creation info")
 
     /* Set the return value */
     ret_value = new_tcpl_id;
 
 done:
-    if(ret_value < 0)
-        if(new_tcpl_id > 0)
-            if(H5I_dec_app_ref(new_tcpl_id) < 0)
+    if (ret_value < 0)
+        if (new_tcpl_id > 0)
+            if (H5I_dec_app_ref(new_tcpl_id) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTDEC, H5I_INVALID_HID, "unable to close temporary object")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__get_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__open_name
  *
@@ -844,13 +826,13 @@ done:
 H5T_t *
 H5T__open_name(const H5G_loc_t *loc, const char *name)
 {
-    H5T_t       *dt = NULL;             /* Datatype opened in file */
-    H5G_name_t   path;            	/* Datatype group hier. path */
-    H5O_loc_t    oloc;            	/* Datatype object location */
-    H5G_loc_t    type_loc;              /* Group object for datatype */
-    H5O_type_t   obj_type;              /* Type of object at location */
-    hbool_t      obj_found = FALSE;     /* Object at 'name' found */
-    H5T_t        *ret_value = NULL;     /* Return value */
+    H5T_t *    dt = NULL;         /* Datatype opened in file */
+    H5G_name_t path;              /* Datatype group hier. path */
+    H5O_loc_t  oloc;              /* Datatype object location */
+    H5G_loc_t  type_loc;          /* Group object for datatype */
+    H5O_type_t obj_type;          /* Type of object at location */
+    hbool_t    obj_found = FALSE; /* Object at 'name' found */
+    H5T_t *    ret_value = NULL;  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -867,33 +849,32 @@ H5T__open_name(const H5G_loc_t *loc, const char *name)
      * Find the named datatype object header and read the datatype message
      * from it.
      */
-    if(H5G_loc_find(loc, name, &type_loc/*out*/) < 0)
+    if (H5G_loc_find(loc, name, &type_loc /*out*/) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "not found")
     obj_found = TRUE;
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(&oloc, &obj_type) < 0)
+    if (H5O_obj_type(&oloc, &obj_type) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, NULL, "can't get object type")
-    if(obj_type != H5O_TYPE_NAMED_DATATYPE)
+    if (obj_type != H5O_TYPE_NAMED_DATATYPE)
         HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, NULL, "not a named datatype")
 
     /* Open it */
-    if(NULL == (dt = H5T_open(&type_loc)))
+    if (NULL == (dt = H5T_open(&type_loc)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open named datatype")
 
     ret_value = dt;
 
 done:
     /* Error cleanup */
-    if(NULL == ret_value)
-        if(obj_found && H5F_addr_defined(type_loc.oloc->addr))
-            if(H5G_loc_free(&type_loc) < 0)
+    if (NULL == ret_value)
+        if (obj_found && H5F_addr_defined(type_loc.oloc->addr))
+            if (H5G_loc_free(&type_loc) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, NULL, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__open_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_open
  *
@@ -911,58 +892,58 @@ done:
 H5T_t *
 H5T_open(const H5G_loc_t *loc)
 {
-    H5T_shared_t   *shared_fo = NULL;
-    H5T_t          *dt = NULL;
-    H5T_t          *ret_value = NULL;   /* Return value */
+    H5T_shared_t *shared_fo = NULL;
+    H5T_t *       dt        = NULL;
+    H5T_t *       ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(loc);
 
     /* Check if datatype was already open */
-    if(NULL == (shared_fo = (H5T_shared_t *)H5FO_opened(loc->oloc->file, loc->oloc->addr))) {
+    if (NULL == (shared_fo = (H5T_shared_t *)H5FO_opened(loc->oloc->file, loc->oloc->addr))) {
         /* Clear any errors from H5FO_opened() */
         H5E_clear_stack(NULL);
 
         /* Open the datatype object */
-        if(NULL == (dt = H5T__open_oid(loc)))
+        if (NULL == (dt = H5T__open_oid(loc)))
             HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "not found")
 
         /* Add the datatype to the list of opened objects in the file */
-        if(H5FO_insert(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr, dt->shared, FALSE) < 0)
+        if (H5FO_insert(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr, dt->shared, FALSE) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, NULL, "can't insert datatype into list of open objects")
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+        if (H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, NULL, "can't increment object count")
 
         /* Mark any datatypes as being in memory now */
-        if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
+        if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
         dt->shared->fo_count = 1;
     } /* end if */
     else {
-        if(NULL == (dt = H5FL_MALLOC(H5T_t)))
+        if (NULL == (dt = H5FL_MALLOC(H5T_t)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for datatype")
         dt->vol_obj = NULL;
 
 #if defined(H5_USING_MEMCHECKER) || !defined(NDEBUG)
         /* Clear object location */
-        if(H5O_loc_reset(&(dt->oloc)) < 0)
+        if (H5O_loc_reset(&(dt->oloc)) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to reset location")
 
         /* Clear path name */
-        if(H5G_name_reset(&(dt->path)) < 0)
+        if (H5G_name_reset(&(dt->path)) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to reset path")
 #endif /* H5_USING_MEMCHECKER */
 
         /* Shallow copy (take ownership) of the object location object */
-        if(H5O_loc_copy_shallow(&dt->oloc, loc->oloc) < 0)
+        if (H5O_loc_copy_shallow(&dt->oloc, loc->oloc) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy object location")
 
         /* Shallow copy (take ownership) of the group hier. path */
-        if(H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
+        if (H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy path")
 
         /* Set the shared component info */
@@ -972,30 +953,30 @@ H5T_open(const H5G_loc_t *loc)
         dt->shared = shared_fo;
 
         /* Mark any datatypes as being in memory now */
-        if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
+        if (H5T_set_loc(dt, NULL, H5T_LOC_MEMORY) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location")
 
         /* Increment ref. count on shared info */
         shared_fo->fo_count++;
 
         /* Check if the object has been opened through the top file yet */
-        if(H5FO_top_count(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) == 0) {
+        if (H5FO_top_count(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) == 0) {
             /* Open the object through this top file */
-            if(H5O_open(&(dt->oloc)) < 0)
+            if (H5O_open(&(dt->oloc)) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open object header")
         } /* end if */
 
         /* Increment object count for the object in the top file */
-        if(H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
+        if (H5FO_top_incr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, NULL, "can't increment object count")
     } /* end else */
 
     ret_value = dt;
 
 done:
-    if(ret_value == NULL) {
-        if(dt) {
-            if(shared_fo == NULL)   /* Need to free shared fo */
+    if (ret_value == NULL) {
+        if (dt) {
+            if (shared_fo == NULL) /* Need to free shared fo */
                 dt->shared = H5FL_FREE(H5T_shared_t, dt->shared);
 
             H5O_loc_free(&(dt->oloc));
@@ -1004,14 +985,13 @@ done:
             dt = H5FL_FREE(H5T_t, dt);
         } /* end if */
 
-        if(shared_fo)
+        if (shared_fo)
             shared_fo->fo_count--;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T__open_oid
  *
@@ -1029,30 +1009,30 @@ done:
 static H5T_t *
 H5T__open_oid(const H5G_loc_t *loc)
 {
-    H5T_t *dt = NULL;          /* Datatype from the file */
-    H5T_t *ret_value = NULL;   /* Return value */
+    H5T_t *dt        = NULL; /* Datatype from the file */
+    H5T_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC_TAG(loc->oloc->addr)
 
     HDassert(loc);
 
     /* Open named datatype object in file */
-    if(H5O_open(loc->oloc) < 0)
+    if (H5O_open(loc->oloc) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open named datatype")
 
     /* Deserialize the datatype message into a datatype in memory */
-    if(NULL == (dt = (H5T_t *)H5O_msg_read(loc->oloc, H5O_DTYPE_ID, NULL)))
+    if (NULL == (dt = (H5T_t *)H5O_msg_read(loc->oloc, H5O_DTYPE_ID, NULL)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to load type message from object header")
 
     /* Mark the type as named and open */
     dt->shared->state = H5T_STATE_OPEN;
 
     /* Shallow copy (take ownership) of the object location object */
-    if(H5O_loc_copy_shallow(&dt->oloc, loc->oloc) < 0)
+    if (H5O_loc_copy_shallow(&dt->oloc, loc->oloc) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy object location")
 
     /* Shallow copy (take ownership) of the group hier. path */
-    if(H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
+    if (H5G_name_copy(&(dt->path), loc->path, H5_COPY_SHALLOW) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, NULL, "can't copy path")
 
     /* Set the shared component info */
@@ -1062,14 +1042,13 @@ H5T__open_oid(const H5G_loc_t *loc)
     ret_value = dt;
 
 done:
-    if(ret_value == NULL)
-        if(dt == NULL)
+    if (ret_value == NULL)
+        if (dt == NULL)
             H5O_close(loc->oloc, NULL);
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5T__open_oid() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5T_update_shared
  *
@@ -1095,7 +1074,6 @@ H5T_update_shared(H5T_t *dt)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5T_update_shared() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_construct_datatype
  *
@@ -1109,26 +1087,28 @@ H5T_update_shared(H5T_t *dt)
 H5T_t *
 H5T_construct_datatype(H5VL_object_t *vol_obj)
 {
-    ssize_t        nalloc;
-    void          *buf = NULL;
-    H5T_t         *dt = NULL;       /* datatype object from VOL connector */
-    H5T_t         *ret_value = NULL;
+    ssize_t nalloc;
+    void *  buf       = NULL;
+    H5T_t * dt        = NULL; /* datatype object from VOL connector */
+    H5T_t * ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
     /* get required buf size for encoding the datatype */
-    if(H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_BINARY, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &nalloc, NULL, 0) < 0)
+    if (H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_BINARY, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
+                          &nalloc, NULL, 0) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to get datatype serialized size")
 
     /* allocate buffer to store binary description of the datatype */
-    if(NULL == (buf = (void *)H5MM_calloc((size_t)nalloc)))
+    if (NULL == (buf = (void *)H5MM_calloc((size_t)nalloc)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for datatype")
 
     /* get binary description of the datatype */
-    if(H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_BINARY, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &nalloc, buf, (size_t)nalloc) < 0)
+    if (H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_BINARY, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
+                          &nalloc, buf, (size_t)nalloc) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to get serialized datatype")
 
-    if(NULL == (dt = H5T_decode((size_t)nalloc, (const unsigned char *)buf)))
+    if (NULL == (dt = H5T_decode((size_t)nalloc, (const unsigned char *)buf)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "can't decode datatype")
 
     dt->vol_obj = vol_obj;
@@ -1136,13 +1116,12 @@ H5T_construct_datatype(H5VL_object_t *vol_obj)
     ret_value = dt;
 
 done:
-    if(buf)
+    if (buf)
         buf = H5MM_xfree(buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_construct_datatype() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_get_named_type
  *
@@ -1156,17 +1135,16 @@ done:
 H5VL_object_t *
 H5T_get_named_type(const H5T_t *dt)
 {
-    H5VL_object_t *ret_value = NULL;    /* Return value */
+    H5VL_object_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(NULL != dt->vol_obj)
+    if (NULL != dt->vol_obj)
         ret_value = dt->vol_obj;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_named_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_get_actual_type
  *
@@ -1182,12 +1160,12 @@ H5T_get_named_type(const H5T_t *dt)
 H5T_t *
 H5T_get_actual_type(H5T_t *dt)
 {
-    H5T_t *ret_value = NULL;    /* Return value */
+    H5T_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check if the datatype is committed */
-    if(NULL == dt->vol_obj)
+    if (NULL == dt->vol_obj)
         ret_value = dt;
     else
         ret_value = (H5T_t *)H5VL_object_data(dt->vol_obj);
@@ -1195,7 +1173,6 @@ H5T_get_actual_type(H5T_t *dt)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_get_actual_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_save_refresh_state
  *
@@ -1208,25 +1185,25 @@ H5T_get_actual_type(H5T_t *dt)
 herr_t
 H5T_save_refresh_state(hid_t tid, H5O_shared_t *cached_H5O_shared)
 {
-    H5T_t *dt = NULL;                   /* High level datatype object that wraps the VOL object */
-    H5T_t *vol_dt = NULL;               /* H5T_t pointer stored in the datatype's vol_obj field */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5T_t *dt        = NULL;    /* High level datatype object that wraps the VOL object */
+    H5T_t *vol_dt    = NULL;    /* H5T_t pointer stored in the datatype's vol_obj field */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cached_H5O_shared);
 
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(tid, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(tid, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "tid is not a datatype ID")
     vol_dt = (H5T_t *)(dt->vol_obj->data);
-    if(NULL == vol_dt)
+    if (NULL == vol_dt)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "tid is not not a named datatype ID")
 
     /* Increase the count on the file object */
     vol_dt->shared->fo_count += 1;
 
     /* Increment object count for the object in the top file */
-    if(H5FO_top_incr(vol_dt->sh_loc.file, vol_dt->sh_loc.u.loc.oh_addr) < 0)
+    if (H5FO_top_incr(vol_dt->sh_loc.file, vol_dt->sh_loc.u.loc.oh_addr) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINC, FAIL, "can't increment object count")
 
     /* Cache the H5O_shared_t data */
@@ -1236,7 +1213,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_save_refresh_state() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_restore_refresh_state
  *
@@ -1249,25 +1225,25 @@ done:
 herr_t
 H5T_restore_refresh_state(hid_t tid, H5O_shared_t *cached_H5O_shared)
 {
-    H5T_t *dt = NULL;                   /* High level datatype object that wraps the VOL object */
-    H5T_t *vol_dt = NULL;               /* H5T_t pointer stored in the datatype's vol_obj field */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5T_t *dt        = NULL;    /* High level datatype object that wraps the VOL object */
+    H5T_t *vol_dt    = NULL;    /* H5T_t pointer stored in the datatype's vol_obj field */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(cached_H5O_shared);
 
-    if(NULL == (dt = (H5T_t *)H5I_object_verify(tid, H5I_DATATYPE)))
+    if (NULL == (dt = (H5T_t *)H5I_object_verify(tid, H5I_DATATYPE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "tid not a datatype ID")
     vol_dt = (H5T_t *)(dt->vol_obj->data);
-    if(NULL == vol_dt)
+    if (NULL == vol_dt)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "tid is not not a named datatype ID")
 
     /* Restore the H5O_shared_t data */
     H5MM_memcpy(&(vol_dt->sh_loc), cached_H5O_shared, sizeof(H5O_shared_t));
 
     /* Decrement the ref. count for this object in the top file */
-    if(H5FO_top_decr(vol_dt->sh_loc.file, vol_dt->sh_loc.u.loc.oh_addr) < 0)
+    if (H5FO_top_decr(vol_dt->sh_loc.file, vol_dt->sh_loc.u.loc.oh_addr) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDEC, FAIL, "can't decrement object count")
 
     /* Decrease the count on the file object */
@@ -1277,7 +1253,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_restore_refresh_state() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T_already_vol_managed
  *
@@ -1295,6 +1270,5 @@ H5T_already_vol_managed(const H5T_t *dt)
     /* Sanity check */
     HDassert(dt);
 
-    FUNC_LEAVE_NOAPI( dt->vol_obj != NULL )
+    FUNC_LEAVE_NOAPI(dt->vol_obj != NULL)
 } /* end H5T_already_vol_managed() */
-