[svn-r20065] Description:

    Bring changes from Coverity branch to trunk:

r19975:
Fixed potential mem leak at H5O_attr_open_by_name

r19980:
Fix coverity issue 792.
Free tmp_env_prefix in H5Lexternal.c line 365 if it is not NULL but its contents are 0 when it goes out of scope.

r20039:
Eliminate warnings about nested extern and implicit declarations of parallel_print and address Coverity defects 712-781 by #including h5tools_utils.h in h5diff_array.c, h5diff_attr.c, h5diff_dset.c and h5diff_util.c.

r20046:
Purpose: Address TOCTOU warnings in h5jam and h5unjam

Description: Coverity is afraid that the state of the input file could change
between the call to stat() and the call to open().  This is called a time-of-
check time-of-use (TOCTOU) vulnerability.  Modified stat calls to fstat which
uses an open file pointer so it (hopefully) won't complain any more.

r20047:
Addressed coverity issues 135-137, 462-464.  Local pointers that needed to be freed in case of error were moved out of a switch statement in src/H5Tnative.c, set to NULL, and checked before freeing.

Tested on:
    Mac OS X/32 10.6.6 (amazon) w/debug & production
    (h5committested on Coverity branch)

1 files changed, 164 insertions, 164 deletions

diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 5b685b1..3699757 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -94,8 +94,6 @@ H5T_init_native_interface(void)
  * Programmer:  Raymond Lu
  *              Oct 3, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hid_t
@@ -147,38 +145,39 @@ done:
  * Programmer:  Raymond Lu
  *              Oct 3, 2002
  *
- * Modifications:
- *              Raymond Lu
- *              27 April 2010
- *              I changed the way that the offset, alignment, and size of
- *              nested compound type are calculated by using H5T_cmp_offset.  
- *              The old way had a bug in it (see bug #1850).
- *
  *-------------------------------------------------------------------------
  */
-static H5T_t*
+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_t       *dt;                /* Datatype to make native */
+    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;              /* Number of members in compound & enum types */
-    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 */
-    unsigned    i;                  /* Local index variable */
+    unsigned    nmemb = 0;          /* Number of members in compound & enum types */
+    unsigned    u;                  /* Local index variable */
     H5T_t       *ret_value;         /* Return value */
 
     FUNC_ENTER_NOAPI(H5T_get_native_type, NULL)
 
     assert(dtype);
 
-    if((h5_class = H5T_get_class(dtype, FALSE)) == H5T_NO_CLASS)
+    if(H5T_NO_CLASS == (h5_class = H5T_get_class(dtype, FALSE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid class")
 
-    if((size =  H5T_get_size(dtype)) == 0)
+    if(0 == (size =  H5T_get_size(dtype)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid size")
 
     switch(h5_class) {
@@ -186,35 +185,36 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
             {
                 H5T_sign_t  sign;       /* Signedness of integer type */
 
-                if((sign =  H5T_get_sign(dtype))==H5T_SGN_ERROR)
+                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;
 
-                if((ret_value = H5T_get_native_integer(prec, sign, direction, struct_align, offset, comp_size))==NULL)
+                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((ret_value = H5T_get_native_float(size, direction, struct_align, offset, comp_size))==NULL)
+            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((ret_value=H5T_copy(dtype, H5T_COPY_TRANSIENT))==NULL)
+            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)) {
                 /* 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")
-            } else {
+            } /* 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;
 
         /* The time type will be supported in the future.  Simply return "not supported"
@@ -226,17 +226,17 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
             {
                 prec =  dtype->shared->u.atomic.prec;
 
-                if((ret_value = H5T_get_native_bitfield(prec, direction, struct_align, offset, comp_size))==NULL)
+                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((ret_value=H5T_copy(dtype, H5T_COPY_TRANSIENT))==NULL)
+            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;
 
@@ -246,11 +246,11 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
                 size_t ref_size;
                 int    not_equal;
 
-                if((ret_value=H5T_copy(dtype, H5T_COPY_TRANSIENT))==NULL)
+                if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type")
 
                 /* Decide if the data type is object or dataset region reference. */
-                if(NULL==(dt=(H5T_t *)H5I_object(H5T_STD_REF_OBJ_g)))
+                if(NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_OBJ_g)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type")
                 not_equal = H5T_cmp(ret_value, dt, FALSE);
 
@@ -258,69 +258,65 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
                 if(!not_equal) {
                     align = H5T_HOBJREF_COMP_ALIGN_g;
                     ref_size = sizeof(hobj_ref_t);
-                } else {
+                } /* end if */
+                else {
                     align = H5T_HDSETREGREF_COMP_ALIGN_g;
                     ref_size = sizeof(hdset_reg_ref_t);
-                }
+                } /* end else */
 
-                if(H5T_cmp_offset(comp_size, offset, ref_size, (size_t)1, align, struct_align)<0)
+                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:
             {
-                H5T_t       *memb_type;     /* Datatype of member */
-                H5T_t       **memb_list;    /* List of compound member IDs */
-                size_t      *memb_offset;   /* List of member offsets in compound type, including member size and alignment */
-                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 */
-                char        **comp_mname;   /* List of member names in compound type */
-
-                if((snmemb = H5T_get_nmembers(dtype))<=0)
+                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_ASSIGN_OVERFLOW(nmemb,snmemb,int,unsigned);
+                H5_ASSIGN_OVERFLOW(nmemb, snmemb, int, unsigned);
 
-                if((memb_list   = (H5T_t**)H5MM_malloc(nmemb*sizeof(H5T_t*)))==NULL)
+                if(NULL == (memb_list   = (H5T_t **)H5MM_calloc(nmemb * sizeof(H5T_t *))))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if((memb_offset = (size_t*)H5MM_calloc(nmemb*sizeof(size_t)))==NULL)
+                if(NULL == (memb_offset = (size_t *)H5MM_calloc(nmemb * sizeof(size_t))))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if((comp_mname = (char**)H5MM_malloc(nmemb*sizeof(char*)))==NULL)
+                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(i=0; i<nmemb; i++) {
-                    if((memb_type = H5T_get_member_type(dtype, i, H5T_COPY_TRANSIENT))==NULL)
+                for(u = 0; u < nmemb; u++) {
+                    if(NULL == (memb_type = H5T_get_member_type(dtype, u, H5T_COPY_TRANSIENT)))
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
 
-                    if((comp_mname[i] = H5T_get_member_name(dtype, i))==NULL)
+                    if(NULL == (comp_mname[u] = H5T_get_member_name(dtype, u)))
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed")
 
-                    if((memb_list[i] = H5T_get_native_type(memb_type, direction, &children_st_align, &(memb_offset[i]), &children_size))==NULL)
+                    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(memb_type)<0)
+                    if(H5T_close(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);
+                    children_size += children_st_align - (children_size % children_st_align);
 
                 /* Construct new compound type based on native type */
-                if((new_type=H5T_create(H5T_COMPOUND, children_size))==NULL)
+                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(i=0; i<nmemb; i++) {
-                    if(H5T_insert(new_type, comp_mname[i], memb_offset[i], memb_list[i])<0)
+                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.
-                 * i.g. in the structure
+                 * e.g. in the structure
                  *    typedef struct s1 {
                  *        char            c;
                  *        int             i;
@@ -340,108 +336,105 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset")
 
                 /* Close member data type */
-                for(i=0; i<nmemb; i++) {
-                    if(H5T_close(memb_list[i])<0)
+                for(u = 0; u < nmemb; u++) {
+                    if(H5T_close(memb_list[u]) < 0)
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
 
                     /* Free member names in list */
-                    H5MM_xfree(comp_mname[i]);
-                }
+                    comp_mname[u] = (char *)H5MM_xfree(comp_mname[u]);
+                } /* end for */
 
                 /* Free lists for members */
-                H5MM_xfree(memb_list);
-                H5MM_xfree(memb_offset);
-                H5MM_xfree(comp_mname);
+                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:
             {
-                char        *memb_name;         /* Enum's member name */
-                void        *memb_value, *tmp_memb_value;        /* Enum's member value */
                 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((super_type=H5T_get_super(dtype))==NULL)
+                if(NULL == (super_type = H5T_get_super(dtype)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get base type for enumerate type")
-                if((nat_super_type = H5T_get_native_type(super_type, direction, struct_align, offset, comp_size))==NULL)
+                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)
+                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)
+                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((tmp_memb_value = H5MM_calloc(H5T_get_size(super_type)))==NULL)
+                if(NULL == (tmp_memb_value = H5MM_calloc(H5T_get_size(super_type))))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory")
-                if((memb_value = H5MM_calloc(H5T_get_size(nat_super_type)))==NULL)
+                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((new_type=H5T_enum_create(nat_super_type))==NULL)
+                if(NULL == (new_type=H5T_enum_create(nat_super_type)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create enum type")
 
                 /* Retrieve member info and insert members into new enum type */
-                if((snmemb = H5T_get_nmembers(dtype))<=0)
+                if((snmemb = H5T_get_nmembers(dtype)) <= 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "enumerate data type doesn't have any member")
-                H5_ASSIGN_OVERFLOW(nmemb,snmemb,int,unsigned);
-                for(i=0; i<nmemb; i++) {
-                    if((memb_name=H5T_get_member_name(dtype, i))==NULL)
+                H5_ASSIGN_OVERFLOW(nmemb, snmemb, int, unsigned);
+                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, i, tmp_memb_value)<0)
+                    if(H5T_get_member_value(dtype, u, tmp_memb_value) < 0)
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
                     HDmemcpy(memb_value, tmp_memb_value, H5T_get_size(super_type));
 
-                    if(H5Tconvert(super_type_id, nat_super_type_id, (size_t)1, memb_value, NULL, H5P_DEFAULT)<0)
+                    if(H5Tconvert(super_type_id, nat_super_type_id, (size_t)1, memb_value, NULL, H5P_DEFAULT) < 0)
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value")
 
-                    if(H5T_enum_insert(new_type, memb_name, memb_value)<0)
+                    if(H5T_enum_insert(new_type, memb_name, memb_value) < 0)
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member")
-                    H5MM_xfree(memb_name);
+                    memb_name = (char *)H5MM_xfree(memb_name);
                 }
-                H5MM_xfree(memb_value);
-                H5MM_xfree(tmp_memb_value);
+                memb_value = H5MM_xfree(memb_value);
+                tmp_memb_value = H5MM_xfree(tmp_memb_value);
 
                 /* Close base type */
-                if(H5Tclose(nat_super_type_id)<0)
+                if(H5Tclose(nat_super_type_id) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype")
                  /* Close super type */
-                if(H5Tclose(super_type_id)<0)
+                if(H5Tclose(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     *dims = NULL;       /* Dimension sizes for array */
                 hsize_t     nelems = 1;
-                size_t      super_offset=0;
-                size_t      super_size=0;
-                size_t      super_align=0;
+                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_ASSIGN_OVERFLOW(array_rank, sarray_rank, int, unsigned);
-                if((dims = (hsize_t*)H5MM_malloc(array_rank * sizeof(hsize_t))) == NULL)
+                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((super_type = H5T_get_super(dtype)) == NULL)
+                if(NULL == (super_type = H5T_get_super(dtype)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for array type")
-                if((nat_super_type = H5T_get_native_type(super_type, direction, &super_align,
-                                                         &super_offset, &super_size)) == NULL)
+                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 */
@@ -449,77 +442,98 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
                     HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
 
                 /* Create a new array type based on native type */
-                if((new_type = H5T_array_create(nat_super_type, array_rank, dims)) == NULL)
+                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(nat_super_type) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
 
-                for(i = 0; i < array_rank; i++)
-                    nelems *= dims[i];
+                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")
 
-                H5MM_xfree(dims);
+                dims = (hsize_t *)H5MM_xfree(dims);
+
                 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;
+                size_t      super_size = 0;
 
                 /* Retrieve base type for array type */
-                if((super_type=H5T_get_super(dtype))==NULL)
+                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((nat_super_type = H5T_get_native_type(super_type, direction, NULL, NULL, &super_size))==NULL)
+                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(super_type)<0)
+                if(H5T_close(super_type) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype")
 
                 /* Create a new array type based on native type */
-                if((new_type=H5T_vlen_create(nat_super_type))==NULL)
+                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(nat_super_type)<0)
+                if(H5T_close(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)
+                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;
 
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
         default:
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "data type doesn't match any native type")
-    }
+    } /* end switch */
 
 done:
     /* Error cleanup */
-    if(ret_value==NULL) {
+    if(NULL == ret_value) {
         if(new_type)
-            if(H5T_close(new_type)<0)
+            if(H5T_close(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(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])
+                    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);
+        tmp_memb_value = H5MM_xfree(tmp_memb_value);
+        dims = (hsize_t *)H5MM_xfree(dims);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5T_get_native_type() */
 
 
 /*-------------------------------------------------------------------------
@@ -534,23 +548,16 @@ done:
  * Programmer:  Raymond Lu
  *              Oct 3, 2002
  *
- * Modifications: Pedro Vicente
- *                Sep 4, 2004
- * Choose the type based on the precision; this is to support cases
- * like the Cray SV1, where the size of short is 8 but precision is 32
- * (e.g an INT (size 8, prec 64) would be converted to a SHORT
- * (size 8, prec 32) if the size was the deciding factor)
- *
  *-------------------------------------------------------------------------
  */
-static H5T_t*
+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_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 */
+    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,
@@ -558,46 +565,46 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
         H5T_NATIVE_INT_MATCH_LONG,
         H5T_NATIVE_INT_MATCH_LLONG,
         H5T_NATIVE_INT_MATCH_UNKNOWN
-    } match=H5T_NATIVE_INT_MATCH_UNKNOWN;
+    } match = H5T_NATIVE_INT_MATCH_UNKNOWN;
     H5T_t       *ret_value;     /* Return value */
 
-    FUNC_ENTER_NOAPI(H5T_get_native_integer, NULL);
+    FUNC_ENTER_NOAPI(H5T_get_native_integer, NULL)
 
     if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
-        if(prec<=H5Tget_precision(H5T_NATIVE_SCHAR)) {
-            match=H5T_NATIVE_INT_MATCH_CHAR;
+        if(prec <= H5Tget_precision(H5T_NATIVE_SCHAR)) {
+            match = H5T_NATIVE_INT_MATCH_CHAR;
             native_size = sizeof(char);
         } else if(prec<=H5Tget_precision(H5T_NATIVE_SHORT)) {
-            match=H5T_NATIVE_INT_MATCH_SHORT;
+            match = H5T_NATIVE_INT_MATCH_SHORT;
             native_size = sizeof(short);
         } else if(prec<=H5Tget_precision(H5T_NATIVE_INT)) {
-            match=H5T_NATIVE_INT_MATCH_INT;
+            match = H5T_NATIVE_INT_MATCH_INT;
             native_size = sizeof(int);
-        } else if(prec<=H5Tget_precision(H5T_NATIVE_LONG)) {
-            match=H5T_NATIVE_INT_MATCH_LONG;
+        } else if(prec <= H5Tget_precision(H5T_NATIVE_LONG)) {
+            match = H5T_NATIVE_INT_MATCH_LONG;
             native_size = sizeof(long);
-        } else if(prec<=H5Tget_precision(H5T_NATIVE_LLONG)) {
-            match=H5T_NATIVE_INT_MATCH_LLONG;
+        } else if(prec <= H5Tget_precision(H5T_NATIVE_LLONG)) {
+            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;
+            match = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
         }
     } else if(direction == H5T_DIR_DESCEND) {
-        if(prec>H5Tget_precision(H5T_NATIVE_LONG)) {
-            match=H5T_NATIVE_INT_MATCH_LLONG;
+        if(prec > H5Tget_precision(H5T_NATIVE_LONG)) {
+            match = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
-        } else if(prec>H5Tget_precision(H5T_NATIVE_INT)) {
-            match=H5T_NATIVE_INT_MATCH_LONG;
+        } else if(prec > H5Tget_precision(H5T_NATIVE_INT)) {
+            match = H5T_NATIVE_INT_MATCH_LONG;
             native_size = sizeof(long);
-        } else if(prec>H5Tget_precision(H5T_NATIVE_SHORT)) {
-            match=H5T_NATIVE_INT_MATCH_INT;
+        } else if(prec > H5Tget_precision(H5T_NATIVE_SHORT)) {
+            match = H5T_NATIVE_INT_MATCH_INT;
             native_size = sizeof(int);
-        } else if(prec>H5Tget_precision(H5T_NATIVE_SCHAR)) {
-            match=H5T_NATIVE_INT_MATCH_SHORT;
+        } else if(prec > H5Tget_precision(H5T_NATIVE_SCHAR)) {
+            match = H5T_NATIVE_INT_MATCH_SHORT;
             native_size = sizeof(short);
         } else {
-            match=H5T_NATIVE_INT_MATCH_CHAR;
+            match = H5T_NATIVE_INT_MATCH_CHAR;
             native_size = sizeof(char);
         }
     }
@@ -605,7 +612,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
     /* Set the appropriate native datatype information */
     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;
@@ -614,7 +621,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;
@@ -622,7 +629,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;
@@ -631,7 +638,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;
@@ -640,7 +647,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;
@@ -654,21 +661,20 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
     } /* end switch */
 
     /* Create new native type */
-    assert(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(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)
+    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_integer() */
 
 
 /*-------------------------------------------------------------------------
@@ -683,8 +689,6 @@ done:
  * Programmer:  Raymond Lu
  *              Oct 3, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static H5T_t*
@@ -810,8 +814,6 @@ done:
  * Programmer:  Raymond Lu
  *              1 December 2009
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static H5T_t*
@@ -824,7 +826,7 @@ H5T_get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_a
     size_t      native_size=0;  /* Datatype size of the native type */
     H5T_t       *ret_value;     /* Return value */
 
-    FUNC_ENTER_NOAPI(H5T_get_native_bitfield, NULL);
+    FUNC_ENTER_NOAPI(H5T_get_native_bitfield, NULL)
 
     if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
         if(prec<=H5Tget_precision(H5T_NATIVE_B8)) {
@@ -899,8 +901,6 @@ done:
  * Programmer:	Raymond Lu
  *		December  10, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t