Clang-format of source files

1 files changed, 516 insertions, 497 deletions

diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index a41e94c..0ff04b7 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -16,31 +16,27 @@
  *      a "native" datatype for the H5T interface.
  */
 
-#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 */
 
-
-#include "H5private.h"        /* Generic Functions            */
-#include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5Pprivate.h"        /* Property lists            */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Tpkg.h"        /* Datatypes                */
+#include "H5private.h"   /* Generic Functions            */
+#include "H5CXprivate.h" /* API Contexts                         */
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5Pprivate.h"  /* Property lists            */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Tpkg.h"      /* Datatypes                */
 
 /* Static local functions */
-static H5T_t *H5T__get_native_type(H5T_t *dt, H5T_direction_t direction,
-    size_t *struct_align, size_t *offset, size_t *comp_size);
-static H5T_t *H5T__get_native_integer(size_t prec, H5T_sign_t sign,
-    H5T_direction_t direction, size_t *struct_align, size_t *offset,
-    size_t *comp_size);
-static H5T_t *H5T__get_native_float(size_t size, H5T_direction_t direction,
-    size_t *struct_align, size_t *offset, size_t *comp_size);
-static H5T_t* H5T__get_native_bitfield(size_t prec, H5T_direction_t direction,
-    size_t *struct_align, size_t *offset, size_t *comp_size);
-static herr_t H5T__cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size,
-    size_t nelems, size_t align, size_t *struct_align);
-
-
+static H5T_t *H5T__get_native_type(H5T_t *dt, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                                   size_t *comp_size);
+static H5T_t *H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
+                                      size_t *struct_align, size_t *offset, size_t *comp_size);
+static H5T_t *H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_align,
+                                    size_t *offset, size_t *comp_size);
+static H5T_t *H5T__get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_align,
+                                       size_t *offset, size_t *comp_size);
+static herr_t H5T__cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size, size_t nelems,
+                              size_t align, size_t *struct_align);
 
 /*-------------------------------------------------------------------------
  * Function:    H5Tget_native_type
@@ -75,39 +71,37 @@ static herr_t H5T__cmp_offset(size_t *comp_size, size_t *offset, size_t elem_siz
 hid_t
 H5Tget_native_type(hid_t type_id, H5T_direction_t direction)
 {
-    H5T_t       *dt;                /* Datatype to create native datatype from */
-    H5T_t       *new_dt = NULL;     /* Datatype for native datatype created */
-    size_t      comp_size = 0;      /* Compound datatype's size */
-    hid_t       ret_value;          /* Return value */
+    H5T_t *dt;               /* Datatype to create native datatype from */
+    H5T_t *new_dt    = NULL; /* Datatype for native datatype created */
+    size_t comp_size = 0;    /* Compound datatype's size */
+    hid_t  ret_value;        /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE2("i", "iTd", type_id, direction);
 
     /* Check arguments */
-    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, H5I_INVALID_HID, "not a data type")
-    if(direction != H5T_DIR_DEFAULT && direction != H5T_DIR_ASCEND
-            && direction != H5T_DIR_DESCEND)
+    if (direction != H5T_DIR_DEFAULT && direction != H5T_DIR_ASCEND && direction != H5T_DIR_DESCEND)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not valid direction value")
 
     /* Get the native type */
-    if(NULL == (new_dt = H5T__get_native_type(dt, direction, NULL, NULL, &comp_size)))
+    if (NULL == (new_dt = H5T__get_native_type(dt, direction, NULL, NULL, &comp_size)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "cannot retrieve native type")
 
     /* Get an ID for the new type */
-    if((ret_value = H5I_register(H5I_DATATYPE, new_dt, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATATYPE, new_dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register data type")
 
 done:
     /* Error cleanup */
-    if(ret_value < 0)
-        if(new_dt && H5T_close_real(new_dt) < 0)
+    if (ret_value < 0)
+        if (new_dt && H5T_close_real(new_dt) < 0)
             HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, H5I_INVALID_HID, "unable to release datatype")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Tget_native_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__get_native_type
  *
@@ -123,71 +117,74 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5T_t *
-H5T__get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_align,
-    size_t *offset, size_t *comp_size)
+H5T__get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                     size_t *comp_size)
 {
-    H5T_t       *super_type;        /* Super type of VL, array and enum datatypes */
-    H5T_t       *nat_super_type;    /* Native form of VL, array & enum super datatype */
-    H5T_t       *new_type = NULL;   /* New native datatype */
-    H5T_t       *memb_type = NULL;  /* Datatype of member */
-    H5T_t       **memb_list = NULL; /* List of compound member IDs */
-    size_t      *memb_offset = NULL; /* List of member offsets in compound type, including member size and alignment */
-    char        **comp_mname = NULL; /* List of member names in compound type */
-    char        *memb_name = NULL;  /* Enum's member name */
-    void        *memb_value = NULL; /* Enum's member value */
-    void        *tmp_memb_value = NULL; /* Enum's member value */
-    hsize_t     *dims = NULL;       /* Dimension sizes for array */
-    H5T_class_t h5_class;           /* Class of datatype to make native */
-    size_t      size;               /* Size of datatype to make native */
-    size_t      prec;               /* Precision of datatype to make native */
-    int         snmemb;             /* Number of members in compound & enum types */
-    unsigned    nmemb = 0;          /* Number of members in compound & enum types */
-    unsigned    u;                  /* Local index variable */
-    H5T_t       *ret_value = NULL;      /* Return value */
+    H5T_t * super_type;       /* Super type of VL, array and enum datatypes */
+    H5T_t * nat_super_type;   /* Native form of VL, array & enum super datatype */
+    H5T_t * new_type  = NULL; /* New native datatype */
+    H5T_t * memb_type = NULL; /* Datatype of member */
+    H5T_t **memb_list = NULL; /* List of compound member IDs */
+    size_t *memb_offset =
+        NULL; /* List of member offsets in compound type, including member size and alignment */
+    char **     comp_mname     = NULL; /* List of member names in compound type */
+    char *      memb_name      = NULL; /* Enum's member name */
+    void *      memb_value     = NULL; /* Enum's member value */
+    void *      tmp_memb_value = NULL; /* Enum's member value */
+    hsize_t *   dims           = NULL; /* Dimension sizes for array */
+    H5T_class_t h5_class;              /* Class of datatype to make native */
+    size_t      size;                  /* Size of datatype to make native */
+    size_t      prec;                  /* Precision of datatype to make native */
+    int         snmemb;                /* Number of members in compound & enum types */
+    unsigned    nmemb = 0;             /* Number of members in compound & enum types */
+    unsigned    u;                     /* Local index variable */
+    H5T_t *     ret_value = NULL;      /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(dtype);
 
-    if(H5T_NO_CLASS == (h5_class = H5T_get_class(dtype, FALSE)))
+    if (H5T_NO_CLASS == (h5_class = H5T_get_class(dtype, FALSE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid class")
 
-    if(0 == (size =  H5T_get_size(dtype)))
+    if (0 == (size = H5T_get_size(dtype)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid size")
 
-    switch(h5_class) {
-        case H5T_INTEGER:
-            {
-                H5T_sign_t  sign;       /* Signedness of integer type */
+    switch (h5_class) {
+        case H5T_INTEGER: {
+            H5T_sign_t sign; /* Signedness of integer type */
 
-                if(H5T_SGN_ERROR == (sign =  H5T_get_sign(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid signess")
+            if (H5T_SGN_ERROR == (sign = H5T_get_sign(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid signess")
 
-                prec =  dtype->shared->u.atomic.prec;
+            prec = dtype->shared->u.atomic.prec;
 
-                if(NULL == (ret_value = H5T__get_native_integer(prec, sign, direction, struct_align, offset, comp_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer type")
-            } /* end case */
-            break;
+            if (NULL ==
+                (ret_value = H5T__get_native_integer(prec, sign, direction, struct_align, offset, comp_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer type")
+        } /* end case */
+        break;
 
         case H5T_FLOAT:
-            if(NULL == (ret_value = H5T__get_native_float(size, direction, struct_align, offset, comp_size)))
+            if (NULL == (ret_value = H5T__get_native_float(size, direction, struct_align, offset, comp_size)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
             break;
 
         case H5T_STRING:
-            if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
+            if (NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
-            if(H5T_IS_VL_STRING(dtype->shared)) {
+            if (H5T_IS_VL_STRING(dtype->shared)) {
                 /* Update size, offset and compound alignment for parent. */
-                if(H5T__cmp_offset(comp_size, offset, sizeof(char *), (size_t)1, H5T_POINTER_COMP_ALIGN_g, struct_align) < 0)
+                if (H5T__cmp_offset(comp_size, offset, sizeof(char *), (size_t)1, H5T_POINTER_COMP_ALIGN_g,
+                                    struct_align) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
             } /* end if */
             else {
                 /* Update size, offset and compound alignment for parent. */
-                if(H5T__cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align) < 0)
+                if (H5T__cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g,
+                                    struct_align) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
             } /* end else */
             break;
@@ -197,295 +194,300 @@ H5T__get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_ali
         case H5T_TIME:
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "time type is not supported yet")
 
-        case H5T_BITFIELD:
-            {
-                prec =  dtype->shared->u.atomic.prec;
+        case H5T_BITFIELD: {
+            prec = dtype->shared->u.atomic.prec;
 
-                if(NULL == (ret_value = H5T__get_native_bitfield(prec, direction, struct_align, offset, comp_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer for bitfield type")
-            } /* end case */
-            break;
+            if (NULL ==
+                (ret_value = H5T__get_native_bitfield(prec, direction, struct_align, offset, comp_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer for bitfield type")
+        } /* end case */
+        break;
 
         case H5T_OPAQUE:
-            if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
-                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
+            if (NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
             /* Update size, offset and compound alignment for parent. */
-            if(H5T__cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align) < 0)
+            if (H5T__cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g,
+                                struct_align) < 0)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
             break;
 
-        case H5T_REFERENCE:
-            {
-                H5T_t *dt;          /* Datatype to make native */
-                size_t align;
-                size_t ref_size;
+        case H5T_REFERENCE: {
+            H5T_t *dt; /* Datatype to make native */
+            size_t align;
+            size_t ref_size;
+
+            if (NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy reference type")
 
-                if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy reference type")
+            /* Decide if the data type is object reference. */
+            if (NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_OBJ_g)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
 
-                /* Decide if the data type is object reference. */
-                if(NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_OBJ_g)))
+            /* Update size, offset and compound alignment for parent. */
+            if (0 == H5T_cmp(ret_value, dt, FALSE)) {
+                align    = H5T_HOBJREF_COMP_ALIGN_g;
+                ref_size = sizeof(hobj_ref_t);
+            } /* end if */
+            else {
+                /* Decide if the data type is dataset region reference. */
+                if (NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_DSETREG_g)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
 
-                /* Update size, offset and compound alignment for parent. */
-                if(0 == H5T_cmp(ret_value, dt, FALSE)) {
-                    align = H5T_HOBJREF_COMP_ALIGN_g;
-                    ref_size = sizeof(hobj_ref_t);
+                if (0 == H5T_cmp(ret_value, dt, FALSE)) {
+                    align    = H5T_HDSETREGREF_COMP_ALIGN_g;
+                    ref_size = sizeof(hdset_reg_ref_t);
                 } /* end if */
                 else {
-                    /* Decide if the data type is dataset region reference. */
-                    if(NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_DSETREG_g)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
-
-                    if (0 == H5T_cmp(ret_value, dt, FALSE)) {
-                        align = H5T_HDSETREGREF_COMP_ALIGN_g;
-                        ref_size = sizeof(hdset_reg_ref_t);
-                    } /* end if */
-                    else {
-                        /* Only pointers to underlying opaque reference types */
-                        align = H5T_REF_COMP_ALIGN_g;
-                        ref_size = sizeof(H5R_ref_t);
-                    } /* end else */
+                    /* Only pointers to underlying opaque reference types */
+                    align    = H5T_REF_COMP_ALIGN_g;
+                    ref_size = sizeof(H5R_ref_t);
                 } /* end else */
+            }     /* end else */
 
-                if(H5T__cmp_offset(comp_size, offset, ref_size, (size_t)1, align, struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
-            } /* end case */
-            break;
+            if (H5T__cmp_offset(comp_size, offset, ref_size, (size_t)1, align, struct_align) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+        } /* end case */
+        break;
+
+        case H5T_COMPOUND: {
+            size_t children_size = 0; /* Total size of compound members */
+            size_t children_st_align =
+                0; /* The max alignment among compound members.  This'll be the compound alignment */
+
+            if ((snmemb = H5T_get_nmembers(dtype)) <= 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "compound data type doesn't have any member")
+            H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
+
+            if (NULL == (memb_list = (H5T_t **)H5MM_calloc(nmemb * sizeof(H5T_t *))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (NULL == (memb_offset = (size_t *)H5MM_calloc(nmemb * sizeof(size_t))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (NULL == (comp_mname = (char **)H5MM_calloc(nmemb * sizeof(char *))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+
+            /* Construct child compound type and retrieve a list of their IDs, offsets, total size, and
+             * alignment for compound type. */
+            for (u = 0; u < nmemb; u++) {
+                if (NULL == (memb_type = H5T_get_member_type(dtype, u)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
+
+                if (NULL == (comp_mname[u] = H5T__get_member_name(dtype, u)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
+
+                if (NULL == (memb_list[u] = H5T__get_native_type(memb_type, direction, &children_st_align,
+                                                                 &(memb_offset[u]), &children_size)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member identifier retrieval failed")
+
+                if (H5T_close_real(memb_type) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+            } /* end for */
+
+            /* The alignment for whole compound type */
+            if (children_st_align && children_size % children_st_align)
+                children_size += children_st_align - (children_size % children_st_align);
+
+            /* Construct new compound type based on native type */
+            if (NULL == (new_type = H5T__create(H5T_COMPOUND, children_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot create a compound type")
+
+            /* Insert members for the new compound type */
+            for (u = 0; u < nmemb; u++)
+                if (H5T__insert(new_type, comp_mname[u], memb_offset[u], memb_list[u]) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member to compound datatype")
+
+            /* Update size, offset and compound alignment for parent in the case of
+             * nested compound type.  The alignment for a compound type as one field in
+             * a compound type is the biggest compound alignment among all its members.
+             * e.g. in the structure
+             *    typedef struct s1 {
+             *        char            c;
+             *        int             i;
+             *        s2              st;
+             *        unsigned long long       l;
+             *    } s1;
+             *    typedef struct s2 {
+             *        short           c2;
+             *        long            l2;
+             *        long long       ll2;
+             *    } s2;
+             * The alignment for ST in S1 is the biggest structure alignment of all the
+             * members of S2, which is probably the LL2 of 'long long'. -SLU 2010/4/28
+             */
+            if (H5T__cmp_offset(comp_size, offset, children_size, (size_t)1, children_st_align,
+                                struct_align) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
-        case H5T_COMPOUND:
-            {
-                size_t      children_size = 0;/* Total size of compound members */
-                size_t      children_st_align = 0;    /* The max alignment among compound members.  This'll be the compound alignment */
-
-                if((snmemb = H5T_get_nmembers(dtype)) <= 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "compound data type doesn't have any member")
-                H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
-
-                if(NULL == (memb_list   = (H5T_t **)H5MM_calloc(nmemb * sizeof(H5T_t *))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(NULL == (memb_offset = (size_t *)H5MM_calloc(nmemb * sizeof(size_t))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(NULL == (comp_mname = (char **)H5MM_calloc(nmemb * sizeof(char *))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-
-                /* Construct child compound type and retrieve a list of their IDs, offsets, total size, and alignment for compound type. */
-                for(u = 0; u < nmemb; u++) {
-                    if(NULL == (memb_type = H5T_get_member_type(dtype, u)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
-
-                    if(NULL == (comp_mname[u] = H5T__get_member_name(dtype, u)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
-
-                    if(NULL == (memb_list[u] = H5T__get_native_type(memb_type, direction, &children_st_align, &(memb_offset[u]), &children_size)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member identifier retrieval failed")
-
-                    if(H5T_close_real(memb_type) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
-                } /* end for */
-
-                /* The alignment for whole compound type */
-                if(children_st_align && children_size % children_st_align)
-                    children_size += children_st_align - (children_size % children_st_align);
-
-                /* Construct new compound type based on native type */
-                if(NULL == (new_type = H5T__create(H5T_COMPOUND, children_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot create a compound type")
-
-                /* Insert members for the new compound type */
-                for(u = 0; u < nmemb; u++)
-                    if(H5T__insert(new_type, comp_mname[u], memb_offset[u], memb_list[u]) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member to compound datatype")
-
-                /* Update size, offset and compound alignment for parent in the case of
-                 * nested compound type.  The alignment for a compound type as one field in
-                 * a compound type is the biggest compound alignment among all its members.
-                 * e.g. in the structure
-                 *    typedef struct s1 {
-                 *        char            c;
-                 *        int             i;
-                 *        s2              st;
-                 *        unsigned long long       l;
-                 *    } s1;
-                 *    typedef struct s2 {
-                 *        short           c2;
-                 *        long            l2;
-                 *        long long       ll2;
-                 *    } s2;
-                 * The alignment for ST in S1 is the biggest structure alignment of all the
-                 * members of S2, which is probably the LL2 of 'long long'. -SLU 2010/4/28
-                 */
-                if(H5T__cmp_offset(comp_size, offset, children_size, (size_t)1, children_st_align, struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+            /* Close member data type */
+            for (u = 0; u < nmemb; u++) {
+                if (H5T_close_real(memb_list[u]) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
 
-                /* Close member data type */
-                for(u = 0; u < nmemb; u++) {
-                    if(H5T_close_real(memb_list[u]) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+                /* Free member names in list */
+                comp_mname[u] = (char *)H5MM_xfree(comp_mname[u]);
+            } /* end for */
+
+            /* Free lists for members */
+            memb_list   = (H5T_t **)H5MM_xfree(memb_list);
+            memb_offset = (size_t *)H5MM_xfree(memb_offset);
+            comp_mname  = (char **)H5MM_xfree(comp_mname);
+
+            ret_value = new_type;
+        } /* end case */
+        break;
+
+        case H5T_ENUM: {
+            H5T_path_t *tpath; /* Type conversion info    */
+            hid_t       super_type_id, nat_super_type_id;
+
+            /* Don't need to do anything special for alignment, offset since the ENUM type usually is integer.
+             */
+
+            /* Retrieve base type for enumerated type */
+            if (NULL == (super_type = H5T_get_super(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get base type for enumerate type")
+            if (NULL == (nat_super_type =
+                             H5T__get_native_type(super_type, direction, struct_align, offset, comp_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "base native type retrieval failed")
+
+            if ((super_type_id = H5I_register(H5I_DATATYPE, super_type, FALSE)) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
+            if ((nat_super_type_id = H5I_register(H5I_DATATYPE, nat_super_type, FALSE)) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
+
+            /* Allocate room for the enum values */
+            if (NULL == (tmp_memb_value = H5MM_calloc(H5T_get_size(super_type))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (NULL == (memb_value = H5MM_calloc(H5T_get_size(nat_super_type))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+
+            /* Construct new enum type based on native type */
+            if (NULL == (new_type = H5T__enum_create(nat_super_type)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create enum type")
+
+            /* Find the conversion function */
+            if (NULL == (tpath = H5T_path_find(super_type, nat_super_type)))
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL,
+                            "unable to convert between src and dst data types")
+
+            /* Retrieve member info and insert members into new enum type */
+            if ((snmemb = H5T_get_nmembers(dtype)) <= 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "enumerate data type doesn't have any member")
+            H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
+            for (u = 0; u < nmemb; u++) {
+                if (NULL == (memb_name = H5T__get_member_name(dtype, u)))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member name")
+                if (H5T__get_member_value(dtype, u, tmp_memb_value) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
+                H5MM_memcpy(memb_value, tmp_memb_value, H5T_get_size(super_type));
+
+                if (H5T_convert(tpath, super_type_id, nat_super_type_id, (size_t)1, (size_t)0, (size_t)0,
+                                memb_value, NULL) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
+
+                if (H5T__enum_insert(new_type, memb_name, memb_value) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member")
+                memb_name = (char *)H5MM_xfree(memb_name);
+            }
+            memb_value     = H5MM_xfree(memb_value);
+            tmp_memb_value = H5MM_xfree(tmp_memb_value);
+
+            /* Close base type */
+            if (H5I_dec_app_ref(nat_super_type_id) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+            /* Close super type */
+            if (H5I_dec_app_ref(super_type_id) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+
+            ret_value = new_type;
+        } /* end case */
+        break;
+
+        case H5T_ARRAY: {
+            int      sarray_rank; /* Array's rank */
+            unsigned array_rank;  /* Array's rank */
+            hsize_t  nelems       = 1;
+            size_t   super_offset = 0;
+            size_t   super_size   = 0;
+            size_t   super_align  = 0;
+
+            /* Retrieve dimension information for array data type */
+            if ((sarray_rank = H5T__get_array_ndims(dtype)) <= 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension rank")
+            H5_CHECKED_ASSIGN(array_rank, unsigned, sarray_rank, int);
+            if (NULL == (dims = (hsize_t *)H5MM_malloc(array_rank * sizeof(hsize_t))))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
+            if (H5T__get_array_dims(dtype, dims) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension size")
+
+            /* Retrieve base type for array type */
+            if (NULL == (super_type = H5T_get_super(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for array type")
+            if (NULL == (nat_super_type = H5T__get_native_type(super_type, direction, &super_align,
+                                                               &super_offset, &super_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
+
+            /* Close super type */
+            if (H5T_close_real(super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
+
+            /* Create a new array type based on native type */
+            if (NULL == (new_type = H5T__array_create(nat_super_type, array_rank, dims)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create array type")
+
+            /* Close base type */
+            if (H5T_close_real(nat_super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
+
+            for (u = 0; u < array_rank; u++)
+                nelems *= dims[u];
+            H5_CHECK_OVERFLOW(nelems, hsize_t, size_t);
+            if (H5T__cmp_offset(comp_size, offset, super_size, (size_t)nelems, super_align, struct_align) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
-                    /* Free member names in list */
-                    comp_mname[u] = (char *)H5MM_xfree(comp_mname[u]);
-                } /* end for */
+            dims = (hsize_t *)H5MM_xfree(dims);
 
-                /* Free lists for members */
-                memb_list = (H5T_t **)H5MM_xfree(memb_list);
-                memb_offset = (size_t *)H5MM_xfree(memb_offset);
-                comp_mname = (char **)H5MM_xfree(comp_mname);
+            ret_value = new_type;
+        } /* end case */
+        break;
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+        case H5T_VLEN: {
+            size_t vl_align   = 0;
+            size_t vl_size    = 0;
+            size_t super_size = 0;
 
-        case H5T_ENUM:
-            {
-                H5T_path_t *tpath;    /* Type conversion info    */
-                hid_t       super_type_id, nat_super_type_id;
-
-                /* Don't need to do anything special for alignment, offset since the ENUM type usually is integer. */
-
-                /* Retrieve base type for enumerated type */
-                if(NULL == (super_type = H5T_get_super(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get base type for enumerate type")
-                if(NULL == (nat_super_type = H5T__get_native_type(super_type, direction, struct_align, offset, comp_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "base native type retrieval failed")
-
-                if((super_type_id = H5I_register(H5I_DATATYPE, super_type, FALSE)) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
-                if((nat_super_type_id = H5I_register(H5I_DATATYPE, nat_super_type, FALSE)) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype")
-
-                /* Allocate room for the enum values */
-                if(NULL == (tmp_memb_value = H5MM_calloc(H5T_get_size(super_type))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(NULL == (memb_value = H5MM_calloc(H5T_get_size(nat_super_type))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-
-                /* Construct new enum type based on native type */
-                if(NULL == (new_type = H5T__enum_create(nat_super_type)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create enum type")
-
-                /* Find the conversion function */
-                if(NULL == (tpath = H5T_path_find(super_type, nat_super_type)))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to convert between src and dst data types")
-
-                /* Retrieve member info and insert members into new enum type */
-                if((snmemb = H5T_get_nmembers(dtype)) <= 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "enumerate data type doesn't have any member")
-                H5_CHECKED_ASSIGN(nmemb, unsigned, snmemb, int);
-                for(u = 0; u < nmemb; u++) {
-                    if(NULL == (memb_name = H5T__get_member_name(dtype, u)))
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member name")
-                    if(H5T__get_member_value(dtype, u, tmp_memb_value) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
-                    H5MM_memcpy(memb_value, tmp_memb_value, H5T_get_size(super_type));
-
-                    if(H5T_convert(tpath, super_type_id, nat_super_type_id, (size_t)1, (size_t)0, (size_t)0, memb_value, NULL) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
-
-                    if(H5T__enum_insert(new_type, memb_name, memb_value) < 0)
-                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member")
-                    memb_name = (char *)H5MM_xfree(memb_name);
-                }
-                memb_value = H5MM_xfree(memb_value);
-                tmp_memb_value = H5MM_xfree(tmp_memb_value);
-
-                /* Close base type */
-                if(H5I_dec_app_ref(nat_super_type_id) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
-                /* Close super type */
-                if(H5I_dec_app_ref(super_type_id) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
+            /* Retrieve base type for array type */
+            if (NULL == (super_type = H5T_get_super(dtype)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for VL type")
+            /* Don't need alignment, offset information if this VL isn't a field of compound type.  If it
+             * is, go to a few steps below to compute the information directly. */
+            if (NULL ==
+                (nat_super_type = H5T__get_native_type(super_type, direction, NULL, NULL, &super_size)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+            /* Close super type */
+            if (H5T_close_real(super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
 
-        case H5T_ARRAY:
-            {
-                int         sarray_rank;        /* Array's rank */
-                unsigned    array_rank;         /* Array's rank */
-                hsize_t     nelems = 1;
-                size_t      super_offset = 0;
-                size_t      super_size = 0;
-                size_t      super_align = 0;
-
-                /* Retrieve dimension information for array data type */
-                if((sarray_rank = H5T__get_array_ndims(dtype)) <= 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension rank")
-                H5_CHECKED_ASSIGN(array_rank, unsigned, sarray_rank, int);
-                if(NULL == (dims = (hsize_t*)H5MM_malloc(array_rank * sizeof(hsize_t))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if(H5T__get_array_dims(dtype, dims) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension size")
-
-                /* Retrieve base type for array type */
-                if(NULL == (super_type = H5T_get_super(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for array type")
-                if(NULL == (nat_super_type = H5T__get_native_type(super_type, direction, &super_align,
-                                                         &super_offset, &super_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
-
-                /* Close super type */
-                if(H5T_close_real(super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                /* Create a new array type based on native type */
-                if(NULL == (new_type = H5T__array_create(nat_super_type, array_rank, dims)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create array type")
-
-                /* Close base type */
-                if(H5T_close_real(nat_super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                for(u = 0; u < array_rank; u++)
-                    nelems *= dims[u];
-                H5_CHECK_OVERFLOW(nelems, hsize_t, size_t);
-                if(H5T__cmp_offset(comp_size, offset, super_size, (size_t)nelems, super_align, struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+            /* Create a new array type based on native type */
+            if (NULL == (new_type = H5T__vlen_create(nat_super_type)))
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create VL type")
 
-                dims = (hsize_t *)H5MM_xfree(dims);
+            /* Close base type */
+            if (H5T_close_real(nat_super_type) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+            /* Update size, offset and compound alignment for parent compound type directly. */
+            vl_align = H5T_HVL_COMP_ALIGN_g;
+            vl_size  = sizeof(hvl_t);
 
-        case H5T_VLEN:
-            {
-                size_t      vl_align = 0;
-                size_t      vl_size  = 0;
-                size_t      super_size = 0;
-
-                /* Retrieve base type for array type */
-                if(NULL == (super_type = H5T_get_super(dtype)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for VL type")
-                /* Don't need alignment, offset information if this VL isn't a field of compound type.  If it
-                 * is, go to a few steps below to compute the information directly. */
-                if(NULL == (nat_super_type = H5T__get_native_type(super_type, direction, NULL, NULL, &super_size)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed")
-
-                /* Close super type */
-                if(H5T_close_real(super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                /* Create a new array type based on native type */
-                if(NULL == (new_type = H5T__vlen_create(nat_super_type)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create VL type")
-
-                /* Close base type */
-                if(H5T_close_real(nat_super_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
-
-                /* Update size, offset and compound alignment for parent compound type directly. */
-                vl_align = H5T_HVL_COMP_ALIGN_g;
-                vl_size  = sizeof(hvl_t);
-
-                if(H5T__cmp_offset(comp_size, offset, vl_size, (size_t)1, vl_align, struct_align) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+            if (H5T__cmp_offset(comp_size, offset, vl_size, (size_t)1, vl_align, struct_align) < 0)
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
-                ret_value = new_type;
-            } /* end case */
-            break;
+            ret_value = new_type;
+        } /* end case */
+        break;
 
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
@@ -495,30 +497,30 @@ H5T__get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_ali
 
 done:
     /* Error cleanup */
-    if(NULL == ret_value) {
-        if(new_type)
-            if(H5T_close_real(new_type) < 0)
+    if (NULL == ret_value) {
+        if (new_type)
+            if (H5T_close_real(new_type) < 0)
                 HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, NULL, "unable to release datatype")
 
         /* Free lists for members */
-        if(memb_list) {
-            for(u = 0; u < nmemb; u++)
-                if(memb_list[u] && H5T_close_real(memb_list[u]) < 0)
+        if (memb_list) {
+            for (u = 0; u < nmemb; u++)
+                if (memb_list[u] && H5T_close_real(memb_list[u]) < 0)
                     HDONE_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
 
             memb_list = (H5T_t **)H5MM_xfree(memb_list);
         } /* end if */
         memb_offset = (size_t *)H5MM_xfree(memb_offset);
-        if(comp_mname) {
-            for(u = 0; u < nmemb; u++)
-                if(comp_mname[u])
+        if (comp_mname) {
+            for (u = 0; u < nmemb; u++)
+                if (comp_mname[u])
                     H5MM_xfree(comp_mname[u]);
             comp_mname = (char **)H5MM_xfree(comp_mname);
         } /* end if */
-        memb_name = (char *)H5MM_xfree(memb_name);
-        memb_value = H5MM_xfree(memb_value);
+        memb_name      = (char *)H5MM_xfree(memb_name);
+        memb_value     = H5MM_xfree(memb_value);
         tmp_memb_value = H5MM_xfree(tmp_memb_value);
-        dims = (hsize_t *)H5MM_xfree(dims);
+        dims           = (hsize_t *)H5MM_xfree(dims);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -547,68 +549,78 @@ H5_GCC_DIAG_OFF("duplicated-branches")
  *-------------------------------------------------------------------------
  */
 static H5T_t *
-H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
-    size_t *struct_align, size_t *offset, size_t *comp_size)
+H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, size_t *struct_align,
+                        size_t *offset, size_t *comp_size)
 {
-    H5T_t       *dt;            /* Appropriate native datatype to copy */
-    hid_t       tid = (-1);     /* Datatype ID of appropriate native datatype */
-    size_t      align = 0;      /* Alignment necessary for native datatype */
-    size_t  native_size = 0;    /* Datatype size of the native type */
-    enum match_type {           /* The different kinds of integers we can match */
-        H5T_NATIVE_INT_MATCH_CHAR,
-        H5T_NATIVE_INT_MATCH_SHORT,
-        H5T_NATIVE_INT_MATCH_INT,
-        H5T_NATIVE_INT_MATCH_LONG,
-        H5T_NATIVE_INT_MATCH_LLONG,
-        H5T_NATIVE_INT_MATCH_UNKNOWN
-    } match = H5T_NATIVE_INT_MATCH_UNKNOWN;
-    H5T_t       *ret_value = NULL;      /* Return value */
+    H5T_t *dt;                 /* Appropriate native datatype to copy */
+    hid_t  tid         = (-1); /* Datatype ID of appropriate native datatype */
+    size_t align       = 0;    /* Alignment necessary for native datatype */
+    size_t native_size = 0;    /* Datatype size of the native type */
+    enum match_type {          /* The different kinds of integers we can match */
+                      H5T_NATIVE_INT_MATCH_CHAR,
+                      H5T_NATIVE_INT_MATCH_SHORT,
+                      H5T_NATIVE_INT_MATCH_INT,
+                      H5T_NATIVE_INT_MATCH_LONG,
+                      H5T_NATIVE_INT_MATCH_LLONG,
+                      H5T_NATIVE_INT_MATCH_UNKNOWN
+    } match          = H5T_NATIVE_INT_MATCH_UNKNOWN;
+    H5T_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
-    if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
-        if(prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
-            match = H5T_NATIVE_INT_MATCH_CHAR;
+    if (direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
+        if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
+            match       = H5T_NATIVE_INT_MATCH_CHAR;
             native_size = sizeof(char);
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
-            match = H5T_NATIVE_INT_MATCH_SHORT;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_SHORT;
             native_size = sizeof(short);
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
-            match = H5T_NATIVE_INT_MATCH_INT;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_INT;
             native_size = sizeof(int);
-        } else if(prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
-            match = H5T_NATIVE_INT_MATCH_LONG;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LONG;
             native_size = sizeof(long);
-        } else if(prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LLONG_g))) {
-            match = H5T_NATIVE_INT_MATCH_LLONG;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LLONG_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
-        } else {  /* If no native type matches the querried datatype, simply choose the type of biggest size. */
-            match = H5T_NATIVE_INT_MATCH_LLONG;
+        }
+        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+            match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
         }
-    } else if(direction == H5T_DIR_DESCEND) {
-        if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
-            match = H5T_NATIVE_INT_MATCH_LLONG;
+    }
+    else if (direction == H5T_DIR_DESCEND) {
+        if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_LONG_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
-        } else if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
-            match = H5T_NATIVE_INT_MATCH_LONG;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_INT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_LONG;
             native_size = sizeof(long);
-        } else if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
-            match = H5T_NATIVE_INT_MATCH_INT;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SHORT_g))) {
+            match       = H5T_NATIVE_INT_MATCH_INT;
             native_size = sizeof(int);
-        } else if(prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
-            match = H5T_NATIVE_INT_MATCH_SHORT;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_SCHAR_g))) {
+            match       = H5T_NATIVE_INT_MATCH_SHORT;
             native_size = sizeof(short);
-        } else {
-            match = H5T_NATIVE_INT_MATCH_CHAR;
+        }
+        else {
+            match       = H5T_NATIVE_INT_MATCH_CHAR;
             native_size = sizeof(char);
         }
     }
 
     /* Set the appropriate native datatype information */
-    switch(match) {
+    switch (match) {
         case H5T_NATIVE_INT_MATCH_CHAR:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_SCHAR;
             else
                 tid = H5T_NATIVE_UCHAR;
@@ -617,7 +629,7 @@ H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_SHORT:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_SHORT;
             else
                 tid = H5T_NATIVE_USHORT;
@@ -625,7 +637,7 @@ H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_INT:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_INT;
             else
                 tid = H5T_NATIVE_UINT;
@@ -634,7 +646,7 @@ H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_LONG:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_LONG;
             else
                 tid = H5T_NATIVE_ULONG;
@@ -643,7 +655,7 @@ H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             break;
 
         case H5T_NATIVE_INT_MATCH_LLONG:
-            if(sign == H5T_SGN_2)
+            if (sign == H5T_SGN_2)
                 tid = H5T_NATIVE_LLONG;
             else
                 tid = H5T_NATIVE_ULLONG;
@@ -658,15 +670,15 @@ H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
 
     /* Create new native type */
     HDassert(tid >= 0);
-    if(NULL == (dt = (H5T_t *)H5I_object(tid)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
+    if (NULL == (dt = (H5T_t *)H5I_object(tid)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
 
-    if(NULL == (ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
+    if (NULL == (ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
 
     /* compute size and offset of compound type member. */
-    if(H5T__cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+    if (H5T__cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -695,93 +707,94 @@ H5_GCC_DIAG_OFF("duplicated-branches")
  *
  *-------------------------------------------------------------------------
  */
-static H5T_t*
-H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_align,
-    size_t *offset, size_t *comp_size)
+static H5T_t *
+H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                      size_t *comp_size)
 {
-    H5T_t       *dt=NULL;       /* Appropriate native datatype to copy */
-    hid_t       tid=(-1);       /* Datatype ID of appropriate native datatype */
-    size_t      align=0;        /* Alignment necessary for native datatype */
-    size_t     native_size=0;  /* Datatype size of the native type */
-    enum match_type {           /* The different kinds of floating point types we can match */
-        H5T_NATIVE_FLOAT_MATCH_FLOAT,
-        H5T_NATIVE_FLOAT_MATCH_DOUBLE,
-#if H5_SIZEOF_LONG_DOUBLE !=0
-        H5T_NATIVE_FLOAT_MATCH_LDOUBLE,
+    H5T_t *dt          = NULL; /* Appropriate native datatype to copy */
+    hid_t  tid         = (-1); /* Datatype ID of appropriate native datatype */
+    size_t align       = 0;    /* Alignment necessary for native datatype */
+    size_t native_size = 0;    /* Datatype size of the native type */
+    enum match_type {          /* The different kinds of floating point types we can match */
+                      H5T_NATIVE_FLOAT_MATCH_FLOAT,
+                      H5T_NATIVE_FLOAT_MATCH_DOUBLE,
+#if H5_SIZEOF_LONG_DOUBLE != 0
+                      H5T_NATIVE_FLOAT_MATCH_LDOUBLE,
 #endif
-        H5T_NATIVE_FLOAT_MATCH_UNKNOWN
-    } match=H5T_NATIVE_FLOAT_MATCH_UNKNOWN;
-    H5T_t       *ret_value = NULL;      /* Return value */
+                      H5T_NATIVE_FLOAT_MATCH_UNKNOWN
+    } match          = H5T_NATIVE_FLOAT_MATCH_UNKNOWN;
+    H5T_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
-    HDassert(size>0);
+    HDassert(size > 0);
 
-    if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
-        if(size<=sizeof(float)) {
-            match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
+    if (direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
+        if (size <= sizeof(float)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_FLOAT;
             native_size = sizeof(float);
         }
-        else if(size<=sizeof(double)) {
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+        else if (size <= sizeof(double)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
             native_size = sizeof(double);
         }
-#if H5_SIZEOF_LONG_DOUBLE !=0
-        else if(size<=sizeof(long double)) {
-            match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        else if (size <= sizeof(long double)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
             native_size = sizeof(long double);
         }
 #endif
-        else {   /* If not match, return the biggest datatype */
-#if H5_SIZEOF_LONG_DOUBLE !=0
-            match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
+        else { /* If not match, return the biggest datatype */
+#if H5_SIZEOF_LONG_DOUBLE != 0
+            match       = H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
             native_size = sizeof(long double);
 #else
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+            match       = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
             native_size = sizeof(double);
 #endif
+        }
     }
-    } else {
-#if H5_SIZEOF_LONG_DOUBLE !=0
-        if(size>sizeof(double)) {
-            match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
+    else {
+#if H5_SIZEOF_LONG_DOUBLE != 0
+        if (size > sizeof(double)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
             native_size = sizeof(long double);
         }
-        else if(size>sizeof(float)) {
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+        else if (size > sizeof(float)) {
+            match       = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
             native_size = sizeof(double);
         }
         else {
-            match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
+            match       = H5T_NATIVE_FLOAT_MATCH_FLOAT;
             native_size = sizeof(float);
         }
 #else
-        if(size>sizeof(float)) {
-            match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
+        if (size > sizeof(float)) {
+            match = H5T_NATIVE_FLOAT_MATCH_DOUBLE;
             native_size = sizeof(double);
         }
         else {
-            match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
+            match = H5T_NATIVE_FLOAT_MATCH_FLOAT;
             native_size = sizeof(float);
         }
 #endif
     }
 
     /* Set the appropriate native floating point information */
-    switch(match) {
+    switch (match) {
         case H5T_NATIVE_FLOAT_MATCH_FLOAT:
-            tid = H5T_NATIVE_FLOAT;
+            tid   = H5T_NATIVE_FLOAT;
             align = H5T_NATIVE_FLOAT_COMP_ALIGN_g;
             break;
 
         case H5T_NATIVE_FLOAT_MATCH_DOUBLE:
-            tid = H5T_NATIVE_DOUBLE;
+            tid   = H5T_NATIVE_DOUBLE;
             align = H5T_NATIVE_DOUBLE_COMP_ALIGN_g;
             break;
 
-#if H5_SIZEOF_LONG_DOUBLE !=0
+#if H5_SIZEOF_LONG_DOUBLE != 0
         case H5T_NATIVE_FLOAT_MATCH_LDOUBLE:
-            tid = H5T_NATIVE_LDOUBLE;
+            tid   = H5T_NATIVE_LDOUBLE;
             align = H5T_NATIVE_LDOUBLE_COMP_ALIGN_g;
             break;
 #endif
@@ -791,15 +804,15 @@ H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_ali
     } /* end switch */
 
     /* Create new native type */
-    HDassert(tid>=0);
-    if(NULL==(dt=(H5T_t *)H5I_object(tid)))
+    HDassert(tid >= 0);
+    if (NULL == (dt = (H5T_t *)H5I_object(tid)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
-    if((ret_value=H5T_copy(dt, H5T_COPY_TRANSIENT))==NULL)
+    if ((ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)) == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
     /* compute offset of compound type member. */
-    if(H5T__cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align)<0)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+    if (H5T__cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -829,78 +842,85 @@ H5_GCC_DIAG_OFF("duplicated-branches")
  *
  *-------------------------------------------------------------------------
  */
-static H5T_t*
-H5T__get_native_bitfield(size_t prec, H5T_direction_t direction,
-    size_t *struct_align, size_t *offset, size_t *comp_size)
+static H5T_t *
+H5T__get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_align, size_t *offset,
+                         size_t *comp_size)
 {
-    H5T_t       *dt;            /* Appropriate native datatype to copy */
-    hid_t       tid=(-1);       /* Datatype ID of appropriate native datatype */
-    size_t      align=0;        /* Alignment necessary for native datatype */
-    size_t      native_size=0;  /* Datatype size of the native type */
-    H5T_t       *ret_value = NULL;      /* Return value */
+    H5T_t *dt;                 /* Appropriate native datatype to copy */
+    hid_t  tid         = (-1); /* Datatype ID of appropriate native datatype */
+    size_t align       = 0;    /* Alignment necessary for native datatype */
+    size_t native_size = 0;    /* Datatype size of the native type */
+    H5T_t *ret_value   = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
-    if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
-        if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
-            tid = H5T_NATIVE_B8;
+    if (direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
+        if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
+            tid         = H5T_NATIVE_B8;
             native_size = 1;
-            align = H5T_NATIVE_UINT8_ALIGN_g;
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
-            tid = H5T_NATIVE_B16;
+            align       = H5T_NATIVE_UINT8_ALIGN_g;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
+            tid         = H5T_NATIVE_B16;
             native_size = 2;
-            align = H5T_NATIVE_UINT16_ALIGN_g;
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
-            tid = H5T_NATIVE_B32;
+            align       = H5T_NATIVE_UINT16_ALIGN_g;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
+            tid         = H5T_NATIVE_B32;
             native_size = 4;
-            align = H5T_NATIVE_UINT32_ALIGN_g;
-        } else if(prec<=H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B64_g))) {
-            tid = H5T_NATIVE_B64;
+            align       = H5T_NATIVE_UINT32_ALIGN_g;
+        }
+        else if (prec <= H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B64_g))) {
+            tid         = H5T_NATIVE_B64;
             native_size = 8;
-            align = H5T_NATIVE_UINT64_ALIGN_g;
-        } else {  /* If no native type matches the querried datatype, simply choose the type of biggest size. */
-            tid = H5T_NATIVE_B64;
+            align       = H5T_NATIVE_UINT64_ALIGN_g;
+        }
+        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+            tid         = H5T_NATIVE_B64;
             native_size = 8;
-            align = H5T_NATIVE_UINT64_ALIGN_g;
+            align       = H5T_NATIVE_UINT64_ALIGN_g;
         }
-    } else if(direction == H5T_DIR_DESCEND) {
-        if(prec>H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
-            tid = H5T_NATIVE_B64;
+    }
+    else if (direction == H5T_DIR_DESCEND) {
+        if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B32_g))) {
+            tid         = H5T_NATIVE_B64;
             native_size = 8;
-            align = H5T_NATIVE_UINT64_ALIGN_g;
-        } else if(prec>H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
-            tid = H5T_NATIVE_B32;
+            align       = H5T_NATIVE_UINT64_ALIGN_g;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B16_g))) {
+            tid         = H5T_NATIVE_B32;
             native_size = 4;
-            align = H5T_NATIVE_UINT32_ALIGN_g;
-        } else if(prec>H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
-            tid = H5T_NATIVE_B16;
+            align       = H5T_NATIVE_UINT32_ALIGN_g;
+        }
+        else if (prec > H5T_get_precision((H5T_t *)H5I_object(H5T_NATIVE_B8_g))) {
+            tid         = H5T_NATIVE_B16;
             native_size = 2;
-            align = H5T_NATIVE_UINT16_ALIGN_g;
-        } else {
-            tid = H5T_NATIVE_B8;
+            align       = H5T_NATIVE_UINT16_ALIGN_g;
+        }
+        else {
+            tid         = H5T_NATIVE_B8;
             native_size = 1;
-            align = H5T_NATIVE_UINT8_ALIGN_g;
+            align       = H5T_NATIVE_UINT8_ALIGN_g;
         }
     }
 
     /* Create new native type */
-    HDassert(tid>=0);
-    if(NULL==(dt=(H5T_t *)H5I_object(tid)))
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
+    HDassert(tid >= 0);
+    if (NULL == (dt = (H5T_t *)H5I_object(tid)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
 
-    if((ret_value=H5T_copy(dt, H5T_COPY_TRANSIENT))==NULL)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
+    if ((ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT)) == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type")
 
     /* compute size and offset of compound type member. */
-    if(H5T__cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align)<0)
-         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
+    if (H5T__cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T__get_native_bitfield() */
 H5_GCC_DIAG_ON("duplicated-branches")
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5T__cmp_offset
  *
@@ -918,27 +938,26 @@ H5_GCC_DIAG_ON("duplicated-branches")
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T__cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size,
-    size_t nelems, size_t align, size_t *struct_align)
+H5T__cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size, size_t nelems, size_t align,
+                size_t *struct_align)
 {
     FUNC_ENTER_STATIC_NOERR
 
-    if(offset && comp_size) {
-        if(align > 1 && *comp_size % align) {
+    if (offset && comp_size) {
+        if (align > 1 && *comp_size % align) {
             /* Add alignment value */
-            *offset = *comp_size +  (align - *comp_size % align);
+            *offset = *comp_size + (align - *comp_size % align);
             *comp_size += (align - *comp_size % align);
         } /* end if */
         else
             *offset = *comp_size;
 
         /* compute size of compound type member. */
-        *comp_size += nelems* elem_size;
+        *comp_size += nelems * elem_size;
     } /* end if */
 
-    if(struct_align && *struct_align < align)
+    if (struct_align && *struct_align < align)
         *struct_align = align;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T__cmp_offset() */
-