HDFFV-8745 merge h5diff attribute fix

33 files changed, 3805 insertions, 3186 deletions

diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index 406ca12..ea7bb48 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -53,10 +53,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5copy-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5copy ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index d26c742..1ab7e40 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -105,10 +105,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5diff-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake
index 14fc534..14fbee7 100644
--- a/tools/h5diff/CMakeTests.cmake
+++ b/tools/h5diff/CMakeTests.cmake
@@ -26,6 +26,7 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dtypes.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr3.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5
@@ -263,6 +264,8 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt
@@ -978,6 +981,10 @@
           h5diff_800.out.err
           h5diff_801.out
           h5diff_801.out.err
+          h5diff_8625.out
+          h5diff_8625.out.err
+          h5diff_8639.out
+          h5diff_8639.out.err
           h5diff_90.out
           h5diff_90.out.err
           h5diff_vlstr.out
@@ -1551,7 +1558,11 @@ ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5
 # ##############################################################################
 # # diff various multiple vlen and fixed strings in a compound type dataset
 # ##############################################################################
-ADD_H5_TEST (h5diff_530 0 -v  ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
+ADD_H5_TEST (h5diff_530 0 -v ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
+# test to verify HDFFV-8625
+ADD_H5_TEST (h5diff_8625 0 -v --enable-error-stack ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group/Compound_dset1 /group_copy/Compound_dset3)
+# test to verify HDFFV-8639
+ADD_H5_TEST (h5diff_8639 0 -v h5diff_attr3.h5 h5diff_attr2.h5 /g1)
 ADD_H5_TEST (h5diff_vlstr 0 -v tvlstr.h5 tvlstr2.h5)
 
 # ##############################################################################
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 67977e9..f8e02be 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -115,14 +115,17 @@ void parse_command_line(int argc,
         default:
             usage();
             h5diff_exit(EXIT_FAILURE);
+            break;
 
         case 'h':
             usage();
             h5diff_exit(EXIT_SUCCESS);
+            break;
 
         case 'V':
             print_version(h5tools_getprogname());
             h5diff_exit(EXIT_SUCCESS);
+            break;
 
         case 'v':
             opts->m_verbose = 1;
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 7eeb6d3..2955d2c 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,16 +29,16 @@
 size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 
 /*-------------------------------------------------------------------------
-* Program: h5diffgentest
-*
-* Purpose: generate files for h5diff testing
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 12, 2003
-*
-*-------------------------------------------------------------------------
-*/
+ * Program: h5diffgentest
+ *
+ * Purpose: generate files for h5diff testing
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 12, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
 
 #define FILE1    "h5diff_basic1.h5"
 #define FILE2    "h5diff_basic2.h5"
@@ -46,6 +46,7 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 #define FILE4    "h5diff_dtypes.h5"
 #define FILE5    "h5diff_attr1.h5"
 #define FILE6    "h5diff_attr2.h5"
+#define FILE6a   "h5diff_attr3.h5"
 #define FILE7    "h5diff_dset1.h5"
 #define FILE8    "h5diff_dset2.h5"
 #define FILE8A   "h5diff_dset3.h5"
@@ -108,37 +109,36 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 #define SPACE1_DIM2 0
 
 /* A UD link traversal function.  Shouldn't actually be called. */
-static hid_t UD_traverse(H5_ATTR_UNUSED const char * link_name, H5_ATTR_UNUSED hid_t cur_group,
-                         H5_ATTR_UNUSED const void * udata, H5_ATTR_UNUSED size_t udata_size, H5_ATTR_UNUSED hid_t lapl_id)
-{
+static hid_t UD_traverse(H5_ATTR_UNUSED const char * link_name,
+        H5_ATTR_UNUSED hid_t cur_group, H5_ATTR_UNUSED const void * udata,
+        H5_ATTR_UNUSED size_t udata_size, H5_ATTR_UNUSED hid_t lapl_id) {
     return -1;
 }
-const H5L_class_t UD_link_class[1] = {{
-    H5L_LINK_CLASS_T_VERS,    /* H5L_class_t version       */
-        (H5L_type_t)MY_LINKCLASS,             /* Link type id number            */
-        "UD link class",          /* name for debugging             */
-        NULL,                     /* Creation callback              */
-        NULL,                     /* Move/rename callback           */
-        NULL,                     /* Copy callback                  */
-        UD_traverse,              /* The actual traversal function  */
-        NULL,                     /* Deletion callback              */
-        NULL                      /* Query callback                 */
-}};
-
+const H5L_class_t UD_link_class[1] = { {
+        H5L_LINK_CLASS_T_VERS, /* H5L_class_t version       */
+        (H5L_type_t) MY_LINKCLASS, /* Link type id number            */
+        "UD link class", /* name for debugging             */
+        NULL, /* Creation callback              */
+        NULL, /* Move/rename callback           */
+        NULL, /* Copy callback                  */
+        UD_traverse, /* The actual traversal function  */
+        NULL, /* Deletion callback              */
+        NULL /* Query callback                 */
+} };
 
 /*-------------------------------------------------------------------------
-* prototypes
-*-------------------------------------------------------------------------
-*/
+ * prototypes
+ *-------------------------------------------------------------------------
+ */
 
 /* tests called in main() */
 static int test_basic(const char *fname1, const char *fname2, const char *fname3);
 static int test_types(const char *fname);
 static int test_datatypes(const char *fname);
-static int test_attributes(const char *fname,int make_diffs);
-static int test_datasets(const char *fname,int make_diffs);
-static int test_special_datasets(const char *fname,int make_diffs);
-static int test_hyperslab(const char *fname,int make_diffs);
+static int test_attributes(const char *fname, int make_diffs);
+static int test_datasets(const char *fname, int make_diffs);
+static int test_special_datasets(const char *fname, int make_diffs);
+static int test_hyperslab(const char *fname, int make_diffs);
 static int test_link_name(const char *fname1);
 static int test_soft_links(const char *fname1);
 static int test_linked_softlinks(const char *fname1);
@@ -153,53 +153,59 @@ static int test_exclude_obj3(const char *fname1, const char *fname2);
 static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new);
 static int test_attributes_verbose_level(const char *fname1, const char *fname2);
 static int test_enums(const char *fname);
-static void test_comps_array (const char *fname, const char *dset, const char *attr,int diff, int is_file_new);
-static void test_comps_vlen (const char *fname, const char *dset,const char *attr, int diff, int is_file_new);
-static void test_comps_array_vlen (const char *fname, const char *dset, const char *attr, int diff, int is_file_new);
-static void test_comps_vlen_arry (const char *fname, const char *dset,const char *attr, int diff, int is_file_new);
-static void test_data_nocomparables (const char *fname, int diff);
-static void test_objs_nocomparables (const char *fname1, const char *fname2);
-static void test_objs_strings (const char *fname, const char *fname2);
+static void test_comps_array(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_comps_vlen(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_comps_array_vlen(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_comps_vlen_arry(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_data_nocomparables(const char *fname, int diff);
+static void test_objs_nocomparables(const char *fname1, const char *fname2);
+static void test_objs_strings(const char *fname, const char *fname2);
 
 /* called by test_attributes() and test_datasets() */
-static void write_attr_in(hid_t loc_id,const char* dset_name,hid_t fid,int make_diffs);
-static void write_dset_in(hid_t loc_id,const char* dset_name,hid_t fid,int make_diffs);
-static void gen_datareg(hid_t fid,int make_diffs);
+static void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs);
+static void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs);
+static void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs);
+static void gen_datareg(hid_t fid, int make_diffs);
 /* utilities */
-static int write_attr(hid_t loc_id,int rank,hsize_t *dims,const char *name,hid_t tid,void *buf);
-static int write_dset(hid_t loc_id,int rank,hsize_t *dims,const char *name,hid_t tid,void *buf);
-
+static int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf);
+static int write_dset(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf);
 
 /*-------------------------------------------------------------------------
-* Function: main
-*
-* Purpose: main program
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: main
+ *
+ * Purpose: main program
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int main(void)
 {
     test_basic(FILE1, FILE2, FILE11);
 
-    test_types (FILE3);
+    test_types(FILE3);
     test_datatypes(FILE4);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_attributes(FILE5,0);
-    test_attributes(FILE6,1);
+    test_attributes(FILE5, 0);
+    test_attributes(FILE6, 1);
+    /* generate file with string datatypes swapped */
+    test_attributes(FILE6a, 2);
 
     /* test attributes with verbose level */
     test_attributes_verbose_level(ATTR_VERBOSE_LEVEL_FILE1, ATTR_VERBOSE_LEVEL_FILE2);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_datasets(FILE7,0);
-    test_datasets(FILE8,1);
-    test_datasets(FILE8A,2);
+    test_datasets(FILE7, 0);
+    test_datasets(FILE8, 1);
+    test_datasets(FILE8A, 2);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_hyperslab(FILE9,0);
-    test_hyperslab(FILE10,1);
+    test_hyperslab(FILE9, 0);
+    test_hyperslab(FILE10, 1);
 
     test_link_name(FILE12);
 
@@ -212,8 +218,8 @@ int main(void)
     test_ext2soft_links(FILE17, FILE18);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_special_datasets(FILE19,0);
-    test_special_datasets(FILE20,1);
+    test_special_datasets(FILE19, 0);
+    test_special_datasets(FILE20, 1);
 
     test_dangle_links(DANGLE_LINK_FILE1, DANGLE_LINK_FILE2);
 
@@ -229,34 +235,34 @@ int main(void)
     test_comp_vlen_strings(COMP_VL_STRS_FILE, "group_copy", 0);
 
     /* diff when invalid enum values are present.
-     * This will probably grow to involve more extensive testing of
-     * enums so it has been given its own test file and test (apart
-     * from the basic type testing).
-     */
+    * This will probably grow to involve more extensive testing of
+    * enums so it has been given its own test file and test (apart
+    * from the basic type testing).
+    */
     test_enums(ENUM_INVALID_VALUES);
 
     /* -------------------------------------------------
-     * Create test files with dataset and attribute with container types
-     * (array, vlen) with multiple nested compound types.
-     */
+    * Create test files with dataset and attribute with container types
+    * (array, vlen) with multiple nested compound types.
+    */
     /* file1 */
-    test_comps_array(COMPS_COMPLEX1,"dset1", "attr1", 0, 1);
-    test_comps_vlen(COMPS_COMPLEX1,"dset2", "attr2", 0, 0);
-    test_comps_array_vlen(COMPS_COMPLEX1,"dset3", "attr3", 0, 0);
-    test_comps_vlen_arry(COMPS_COMPLEX1,"dset4", "attr4", 0, 0);
+    test_comps_array(COMPS_COMPLEX1, "dset1", "attr1", 0, 1);
+    test_comps_vlen(COMPS_COMPLEX1, "dset2", "attr2", 0, 0);
+    test_comps_array_vlen(COMPS_COMPLEX1, "dset3", "attr3", 0, 0);
+    test_comps_vlen_arry(COMPS_COMPLEX1, "dset4", "attr4", 0, 0);
     /* file2 */
-    test_comps_array(COMPS_COMPLEX2,"dset1", "attr1", 5, 1);
-    test_comps_vlen(COMPS_COMPLEX2,"dset2", "attr2",5, 0);
-    test_comps_array_vlen(COMPS_COMPLEX2,"dset3", "attr3", 5, 0);
-    test_comps_vlen_arry(COMPS_COMPLEX2,"dset4", "attr4", 5, 0);
+    test_comps_array(COMPS_COMPLEX2, "dset1", "attr1", 5, 1);
+    test_comps_vlen(COMPS_COMPLEX2, "dset2", "attr2", 5, 0);
+    test_comps_array_vlen(COMPS_COMPLEX2, "dset3", "attr3", 5, 0);
+    test_comps_vlen_arry(COMPS_COMPLEX2, "dset4", "attr4", 5, 0);
 
     /*-------------------------------------------------
-     * Create test files with non-comparable dataset and attributes with
-     * comparable datasets and attributes.  All the comparables should display
-     * differences.
-     */
-    test_data_nocomparables(NON_COMPARBLES1,0);
-    test_data_nocomparables(NON_COMPARBLES2,5);
+    * Create test files with non-comparable dataset and attributes with
+    * comparable datasets and attributes.  All the comparables should display
+    * differences.
+    */
+    test_data_nocomparables(NON_COMPARBLES1, 0);
+    test_data_nocomparables(NON_COMPARBLES2, 5);
 
     /* common objects (same name) with different object types. HDFFV-7644 */
     test_objs_nocomparables(NON_COMPARBLES1, NON_COMPARBLES2);
@@ -268,28 +274,28 @@ int main(void)
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_basic
-*
-* Purpose: Create basic test files, first two contains different data, the
-* third one is just an empty file.
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_basic
+ *
+ * Purpose: Create basic test files, first two contains different data, the
+ * third one is just an empty file.
+ *
+ *-------------------------------------------------------------------------
+ */
 
 static
 int test_basic(const char *fname1, const char *fname2, const char *fname3)
 {
-    hid_t   fid1, fid2;
-    hid_t   gid1, gid2, gid3;
+    hid_t fid1 = -1, fid2 = -1;
+    hid_t gid1 = -1, gid2 = -1, gid3 = -1;
     hsize_t dims1[1] = { 6 };
-    hsize_t dims2[2] = { 3,2 };
+    hsize_t dims2[2] = { 3, 2 };
 
     /* create the empty file */
-    if ((fid1=H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0){
+    if ((fid1 = H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "empty file (%s) creation failed.\n", fname3);
         goto out;
     }
-    if (H5Fclose(fid1) < 0){
+    if (H5Fclose(fid1) < 0) {
         fprintf(stderr, "empty file (%s) close failed.\n", fname3);
         goto out;
     }
@@ -299,9 +305,9 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
 
-    if (( fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 )
+    if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if (( fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 )
+    if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -324,16 +330,20 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     */
 
     {
-        double data1[3][2] = {{  1.0F,   1.0F}, {  1.00F,   1.000F}, {  0.0F,   0.0F}};
-        double data2[3][2] = {{  0.0F,   1.1F}, {  1.01F,   1.001F}, {  0.0F,   1.0F}};
-        double data3[3][2] = {{100.0F, 100.0F}, {100.00F, 100.000F}, {100.0F, 100.0F}};
-        double data4[3][2] = {{105.0F, 120.0F}, {160.00F,  95.000F}, { 80.0F,  40.0F}};
+        double data1[3][2] =
+        { { 1.0F, 1.0F }, { 1.00F, 1.000F }, { 0.0F, 0.0F } };
+        double data2[3][2] =
+        { { 0.0F, 1.1F }, { 1.01F, 1.001F }, { 0.0F, 1.0F } };
+        double data3[3][2] = { { 100.0F, 100.0F }, { 100.00F, 100.000F }, {
+                100.0F, 100.0F } };
+        double data4[3][2] = { { 105.0F, 120.0F }, { 160.00F, 95.000F }, {
+                80.0F, 40.0F } };
 
-        write_dset(gid1,2,dims2,"dset1",H5T_NATIVE_DOUBLE,data1);
-        write_dset(gid2,2,dims2,"dset2",H5T_NATIVE_DOUBLE,data2);
-        write_dset(gid1,2,dims2,"dset3",H5T_NATIVE_DOUBLE,data3);
-        write_dset(gid2,2,dims2,"dset4",H5T_NATIVE_DOUBLE,data4);
-        write_dset(gid2,2,dims2,"dset1",H5T_NATIVE_DOUBLE,data2);
+        write_dset(gid1, 2, dims2, "dset1", H5T_NATIVE_DOUBLE, data1);
+        write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_DOUBLE, data2);
+        write_dset(gid1, 2, dims2, "dset3", H5T_NATIVE_DOUBLE, data3);
+        write_dset(gid2, 2, dims2, "dset4", H5T_NATIVE_DOUBLE, data4);
+        write_dset(gid2, 2, dims2, "dset1", H5T_NATIVE_DOUBLE, data2);
 
     }
     /*-------------------------------------------------------------------------
@@ -342,11 +352,11 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        int data5[3][2] = {{100,100},{100,0},{0,100}};
-        int data6[3][2] = {{120,80}, {0,100},{0,50}};
+        int data5[3][2] = { { 100, 100 }, { 100, 0 }, { 0, 100 } };
+        int data6[3][2] = { { 120, 80 }, { 0, 100 }, { 0, 50 } };
 
-        write_dset(gid1,2,dims2,"dset5",H5T_NATIVE_INT,data5);
-        write_dset(gid1,2,dims2,"dset6",H5T_NATIVE_INT,data6);
+        write_dset(gid1, 2, dims2, "dset5", H5T_NATIVE_INT, data5);
+        write_dset(gid1, 2, dims2, "dset6", H5T_NATIVE_INT, data6);
 
     }
 
@@ -356,11 +366,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        unsigned long long data7[3][2] = {{100,100},{100,0},{0,100}};
-        unsigned long long data8[3][2] = {{120,80}, {0,100},{0,50}};
+        unsigned long long data7[3][2] =
+        { { 100, 100 }, { 100, 0 }, { 0, 100 } };
+        unsigned long long data8[3][2] = { { 120, 80 }, { 0, 100 }, { 0, 50 } };
 
-        write_dset(gid1,2,dims2,"dset7",H5T_NATIVE_ULLONG,data7);
-        write_dset(gid1,2,dims2,"dset8",H5T_NATIVE_ULLONG,data8);
+        write_dset(gid1, 2, dims2, "dset7", H5T_NATIVE_ULLONG, data7);
+        write_dset(gid1, 2, dims2, "dset8", H5T_NATIVE_ULLONG, data8);
 
     }
 
@@ -378,45 +389,47 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        double data9[3][2] = {{100.0F, 100.0F}, {100.0F,   0.0F}, {0.0F, 100.0F}};
-        double data10[3][2] ={{120.0F,  80.0F}, {  0.0F, 100.0F}, {0.0F,  50.0F}};
+        double data9[3][2] = { { 100.0F, 100.0F }, { 100.0F, 0.0F }, { 0.0F,
+                100.0F } };
+        double data10[3][2] = { { 120.0F, 80.0F }, { 0.0F, 100.0F }, { 0.0F,
+                50.0F } };
 
-        write_dset(gid1,2,dims2,"dset9",H5T_NATIVE_DOUBLE,data9);
-        write_dset(gid1,2,dims2,"dset10",H5T_NATIVE_DOUBLE,data10);
+        write_dset(gid1, 2, dims2, "dset9", H5T_NATIVE_DOUBLE, data9);
+        write_dset(gid1, 2, dims2, "dset10", H5T_NATIVE_DOUBLE, data10);
 
     }
 
-
     /*-------------------------------------------------------------------------
     * test floating point comparison
     *-------------------------------------------------------------------------
     */
     {
         /* epsilon = 0.0000001 = 1e-7
-         * system epsilon for float : FLT_EPSILON = 1.19209E-07
-         */
-        float  data11[3][2] ={{0.000000f,0.0000001f},{0.0000001f, 0.00000022f},{0.0000001f,0.0000001f}};
-        float  data12[3][2] ={{0.000000f,0.0000002f},{0.0000003f,0.0000001f},{0.000000f,0.0000001f}};
+        * system epsilon for float : FLT_EPSILON = 1.19209E-07
+        */
+        float data11[3][2] = { { 0.000000f, 0.0000001f }, { 0.0000001f,
+                0.00000022f }, { 0.0000001f, 0.0000001f } };
+        float data12[3][2] = { { 0.000000f, 0.0000002f }, { 0.0000003f,
+                0.0000001f }, { 0.000000f, 0.0000001f } };
         /* epsilon = 0.0000000000000001 = 1e-16
-         * system epsilon for double : DBL_EPSILON = 2.22045E-16
-         */
-        double data13[3][2] ={
-            {H5_DOUBLE(0.0000000000000000),  H5_DOUBLE(0.0000000000000001)},
-            {H5_DOUBLE(0.0000000000000001),  H5_DOUBLE(0.0000000000000000)},
-            {H5_DOUBLE(0.00000000000000033), H5_DOUBLE(0.0000000000000001)}};
-        double data14[3][2] ={
-            {H5_DOUBLE(0.0000000000000000), H5_DOUBLE(0.0000000000000004)},
-            {H5_DOUBLE(0.0000000000000002), H5_DOUBLE(0.0000000000000001)},
-            {H5_DOUBLE(0.0000000000000001), H5_DOUBLE(0.00000000000000000)}};
+        * system epsilon for double : DBL_EPSILON = 2.22045E-16
+        */
+        double data13[3][2] = { { H5_DOUBLE(0.0000000000000000), H5_DOUBLE(
+                0.0000000000000001) }, { H5_DOUBLE(0.0000000000000001),
+                        H5_DOUBLE(0.0000000000000000) }, { H5_DOUBLE(
+                                0.00000000000000033), H5_DOUBLE(0.0000000000000001) } };
+        double data14[3][2] = { { H5_DOUBLE(0.0000000000000000), H5_DOUBLE(
+                0.0000000000000004) }, { H5_DOUBLE(0.0000000000000002),
+                        H5_DOUBLE(0.0000000000000001) }, { H5_DOUBLE(
+                                0.0000000000000001), H5_DOUBLE(0.00000000000000000) } };
 
-        write_dset(gid1,2,dims2,"fp1",H5T_NATIVE_FLOAT,data11);
-        write_dset(gid1,2,dims2,"fp2",H5T_NATIVE_FLOAT,data12);
-        write_dset(gid1,2,dims2,"d1",H5T_NATIVE_DOUBLE,data13);
-        write_dset(gid1,2,dims2,"d2",H5T_NATIVE_DOUBLE,data14);
+        write_dset(gid1, 2, dims2, "fp1", H5T_NATIVE_FLOAT, data11);
+        write_dset(gid1, 2, dims2, "fp2", H5T_NATIVE_FLOAT, data12);
+        write_dset(gid1, 2, dims2, "d1", H5T_NATIVE_DOUBLE, data13);
+        write_dset(gid1, 2, dims2, "d2", H5T_NATIVE_DOUBLE, data14);
 
     }
 
-
 #if H5_SIZEOF_LONG_DOUBLE !=0
     {
 
@@ -425,15 +438,13 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         *-------------------------------------------------------------------------
         */
 
-        long double data15[3][2] ={{1.0L,1.0L},{1.0L,1.0L},{1.0L,1.0L}};
+        long double data15[3][2] = { {1.0L,1.0L}, {1.0L,1.0L}, {1.0L,1.0L}};
 
         write_dset(gid1,2,dims2,"ld",H5T_NATIVE_LDOUBLE,data15);
 
     }
 #endif
 
-
-
     /*-------------------------------------------------------------------------
     * NaNs in H5T_NATIVE_FLOAT
     *-------------------------------------------------------------------------
@@ -443,22 +454,22 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         float data15[6];
         float data16[6];
 
-        data15[0] = (float)HDsqrt(-1.0F);
+        data15[0] = (float) HDsqrt(-1.0F);
         data15[1] = 1.0F;
-        data15[2] = (float)HDsqrt(-1.0F);
+        data15[2] = (float) HDsqrt(-1.0F);
         data15[3] = 1.0F;
         data15[4] = 1.0F;
         data15[5] = 1.0F;
 
-        data16[0] = (float)HDsqrt(-1.0F);
-        data16[1] = (float)HDsqrt(-1.0F);
+        data16[0] = (float) HDsqrt(-1.0F);
+        data16[1] = (float) HDsqrt(-1.0F);
         data16[2] = 1.0F;
         data16[3] = 1.0F;
         data16[4] = 1.0F;
         data16[5] = 1.0F;
 
-        write_dset(gid1,1,dims1,"fp15",H5T_NATIVE_FLOAT,data15);
-        write_dset(gid1,1,dims1,"fp16",H5T_NATIVE_FLOAT,data16);
+        write_dset(gid1, 1, dims1, "fp15", H5T_NATIVE_FLOAT, data15);
+        write_dset(gid1, 1, dims1, "fp16", H5T_NATIVE_FLOAT, data16);
 
     }
 
@@ -485,29 +496,29 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         data18[4] = 1.0F;
         data18[5] = 1.0F;
 
-        write_dset(gid1,1,dims1,"fp17",H5T_NATIVE_DOUBLE,data17);
-        write_dset(gid1,1,dims1,"fp18",H5T_NATIVE_DOUBLE,data18);
-        write_dset(gid1,1,dims1,"fp18_COPY",H5T_NATIVE_DOUBLE,data18);
+        write_dset(gid1, 1, dims1, "fp17", H5T_NATIVE_DOUBLE, data17);
+        write_dset(gid1, 1, dims1, "fp18", H5T_NATIVE_DOUBLE, data18);
+        write_dset(gid1, 1, dims1, "fp18_COPY", H5T_NATIVE_DOUBLE, data18);
     }
 
     /*------------------------------------------------------------------------
-     *            INFINITY values
-     *------------------------------------------------------------------------
-     */
+    *            INFINITY values
+    *------------------------------------------------------------------------
+    */
     {
-        float  data19[6];
+        float data19[6];
         double data20[6];
 
-        data19[0] = data19[1] = data19[2] = (float)HDlog(0.0F);
-        data19[3] = data19[4] = data19[5] = (float)-HDlog(0.0F);
+        data19[0] = data19[1] = data19[2] = (float) HDlog(0.0F);
+        data19[3] = data19[4] = data19[5] = (float) -HDlog(0.0F);
 
         data20[0] = data20[1] = data20[2] = HDlog(0.0F);
         data20[3] = data20[4] = data20[5] = -HDlog(0.0F);
 
-        write_dset(gid1,1,dims1,"fp19",H5T_NATIVE_FLOAT,data19);
-        write_dset(gid1,1,dims1,"fp19_COPY",H5T_NATIVE_FLOAT,data19);
-        write_dset(gid1,1,dims1,"fp20",H5T_NATIVE_DOUBLE,data20);
-        write_dset(gid1,1,dims1,"fp20_COPY",H5T_NATIVE_DOUBLE,data20);
+        write_dset(gid1, 1, dims1, "fp19", H5T_NATIVE_FLOAT, data19);
+        write_dset(gid1, 1, dims1, "fp19_COPY", H5T_NATIVE_FLOAT, data19);
+        write_dset(gid1, 1, dims1, "fp20", H5T_NATIVE_DOUBLE, data20);
+        write_dset(gid1, 1, dims1, "fp20_COPY", H5T_NATIVE_DOUBLE, data20);
     }
 
     /*-------------------------------------------------------------------------
@@ -515,105 +526,97 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        typedef struct cmp1_t
-        {
+        typedef struct cmp1_t {
             double d;
-            float  f;
+            float f;
         } cmp1_t;
 
-        cmp1_t   buf1[2];
-        cmp1_t   buf2[2];
-        hsize_t  dims[1] = {2};
-        size_t   type_size;
-        hid_t    tid;
+        cmp1_t buf1[2];
+        cmp1_t buf2[2];
+        hsize_t dims[1] = { 2 };
+        size_t type_size;
+        hid_t tid;
 
         buf1[0].d = HDsqrt(-1.0F);
-        buf1[0].f = (float)HDsqrt(-1.0F);
+        buf1[0].f = (float) HDsqrt(-1.0F);
         buf2[0].d = HDsqrt(-1.0F);
-        buf2[0].f = (float)HDsqrt(-1.0F);
+        buf2[0].f = (float) HDsqrt(-1.0F);
 
         buf1[1].d = HDsqrt(-1.0F);
-        buf1[1].f = (float)HDsqrt(-1.0F);
+        buf1[1].f = (float) HDsqrt(-1.0F);
         buf2[1].d = 0.0F;
         buf2[1].f = 0.0F;
 
-        type_size = sizeof( cmp1_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "d", HOFFSET( cmp1_t, d ), H5T_NATIVE_DOUBLE );
-        H5Tinsert(tid, "f", HOFFSET( cmp1_t, f ), H5T_NATIVE_FLOAT );
-        write_dset(gid1,1,dims,"dset11",tid,buf1);
-        write_dset(gid1,1,dims,"dset12",tid,buf2);
+        type_size = sizeof(cmp1_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "d", HOFFSET(cmp1_t, d), H5T_NATIVE_DOUBLE);
+        H5Tinsert(tid, "f", HOFFSET(cmp1_t, f), H5T_NATIVE_FLOAT);
+        write_dset(gid1, 1, dims, "dset11", tid, buf1);
+        write_dset(gid1, 1, dims, "dset12", tid, buf2);
         H5Tclose(tid);
 
-
     }
 
     /* not comparable objects */
     {
 
-        typedef struct cmp1_t
-        {
+        typedef struct cmp1_t {
             double d;
-            int    i;
+            int i;
         } cmp1_t;
 
-        typedef struct cmp2_t
-        {
-            int    i;
+        typedef struct cmp2_t {
+            int i;
             double d;
         } cmp2_t;
 
-        typedef struct cmp3_t
-        {
+        typedef struct cmp3_t {
             int i;
         } cmp3_t;
 
-        double       data2[6] = {0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F};
-        int          data3[6] = {0,0,0,0,0,0};
-        int          data4[3][2] = {{0,0},{0,0},{0,0}};
-        int          data5[2][2] = {{0,0},{0,0}};
-        unsigned int data6[3][2] = {{0,0},{0,0},{0,0}};
-        cmp1_t       data7[1] = {{1.0f, 2}};
-        cmp2_t       data8[1] = {{1, 2.0f}};
-        hsize_t      dims3[2] = {2, 2};
-        hsize_t      dims4[1] = {1};
-        size_t       type_size;
-        hid_t        tid;
-
-
-
-        write_dset(gid3,1,dims1,"dset1",H5T_NATIVE_DOUBLE,NULL);
-        write_dset(gid3,1,dims1,"dset2",H5T_NATIVE_DOUBLE,data2);
-        write_dset(gid3,1,dims1,"dset3",H5T_NATIVE_INT,data3);
-        write_dset(gid3,2,dims2,"dset4",H5T_NATIVE_INT,data4);
-        write_dset(gid3,2,dims3,"dset5",H5T_NATIVE_INT,data5);
-        write_dset(gid3,2,dims2,"dset6",H5T_NATIVE_UINT,data6);
+        double data2[6] = { 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F };
+        int data3[6] = { 0, 0, 0, 0, 0, 0 };
+        int data4[3][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 } };
+        int data5[2][2] = { { 0, 0 }, { 0, 0 } };
+        unsigned int data6[3][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 } };
+        cmp1_t data7[1] = { { 1.0f, 2 } };
+        cmp2_t data8[1] = { { 1, 2.0f } };
+        hsize_t dims3[2] = { 2, 2 };
+        hsize_t dims4[1] = { 1 };
+        size_t type_size;
+        hid_t tid;
+
+        write_dset(gid3, 1, dims1, "dset1", H5T_NATIVE_DOUBLE, NULL);
+        write_dset(gid3, 1, dims1, "dset2", H5T_NATIVE_DOUBLE, data2);
+        write_dset(gid3, 1, dims1, "dset3", H5T_NATIVE_INT, data3);
+        write_dset(gid3, 2, dims2, "dset4", H5T_NATIVE_INT, data4);
+        write_dset(gid3, 2, dims3, "dset5", H5T_NATIVE_INT, data5);
+        write_dset(gid3, 2, dims2, "dset6", H5T_NATIVE_UINT, data6);
 
         /* case of compound with different type members */
-        type_size = sizeof( cmp1_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "d", HOFFSET( cmp1_t, d ), H5T_NATIVE_DOUBLE );
-        H5Tinsert(tid, "i", HOFFSET( cmp1_t, i ), H5T_NATIVE_INT );
-        write_dset(gid3,1,dims4,"dset7",tid,data7);
+        type_size = sizeof(cmp1_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "d", HOFFSET(cmp1_t, d), H5T_NATIVE_DOUBLE);
+        H5Tinsert(tid, "i", HOFFSET(cmp1_t, i), H5T_NATIVE_INT);
+        write_dset(gid3, 1, dims4, "dset7", tid, data7);
         H5Tclose(tid);
 
-        type_size = sizeof( cmp2_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "i", HOFFSET( cmp2_t, i ), H5T_NATIVE_INT  );
-        H5Tinsert(tid, "d", HOFFSET( cmp2_t, d ), H5T_NATIVE_DOUBLE );
-        write_dset(gid3,1,dims4,"dset8",tid,data8);
+        type_size = sizeof(cmp2_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "i", HOFFSET(cmp2_t, i), H5T_NATIVE_INT);
+        H5Tinsert(tid, "d", HOFFSET(cmp2_t, d), H5T_NATIVE_DOUBLE);
+        write_dset(gid3, 1, dims4, "dset8", tid, data8);
         H5Tclose(tid);
 
         /* case of compound with different number of members */
-        type_size = sizeof( cmp3_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "i", HOFFSET( cmp2_t, i ), H5T_NATIVE_INT  );
-        write_dset(gid3,1,dims4,"dset9",tid,NULL);
+        type_size = sizeof(cmp3_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "i", HOFFSET(cmp2_t, i), H5T_NATIVE_INT);
+        write_dset(gid3, 1, dims4, "dset9", tid, NULL);
         H5Tclose(tid);
 
     }
 
-
     /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
@@ -630,46 +633,43 @@ out:
     return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_types
-*
-* Purpose: Compare different HDF5 object & link types:
-* H5G_DATASET, H5G_TYPE, H5G_GROUP, H5G_LINK, H5G_UDLINK
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_types
+ *
+ * Purpose: Compare different HDF5 object & link types:
+ * H5G_DATASET, H5G_TYPE, H5G_GROUP, H5G_LINK, H5G_UDLINK
+ *
+ *-------------------------------------------------------------------------
+ */
 static
 int test_types(const char *fname)
 {
-    hid_t   fid1;
-    hid_t   gid1;
-    hid_t   gid2;
-    hid_t   tid1;
-    hid_t   tid2;
-    herr_t  status;
-    hsize_t dims[1]={1};
-    typedef struct s1_t
-    {
-        int    a;
-        float  b;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t tid1 = -1;
+    hid_t tid2 = -1;
+    herr_t status;
+    hsize_t dims[1] = { 1 };
+    typedef struct s1_t {
+        int a;
+        float b;
     } s1_t;
-    typedef struct s2_t
-    {
-        int    a;
+    typedef struct s2_t {
+        int a;
     } s2_t;
 
     /*-------------------------------------------------------------------------
     * Create one file
     *-------------------------------------------------------------------------
     */
-    fid1 = H5Fcreate (fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    fid1 = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * H5G_DATASET
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,1,dims,"dset",H5T_NATIVE_INT,0);
+    write_dset(fid1, 1, dims, "dset", H5T_NATIVE_INT, 0);
 
     /*-------------------------------------------------------------------------
     * H5G_GROUP
@@ -711,7 +711,7 @@ int test_types(const char *fname)
     */
     H5Lcreate_external("filename", "objname", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
     H5Lregister(UD_link_class);
-    H5Lcreate_ud(fid1, "ud_link", (H5L_type_t)MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT);
+    H5Lcreate_ud(fid1, "ud_link", (H5L_type_t) MY_LINKCLASS, NULL, (size_t) 0, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * Close
@@ -721,195 +721,192 @@ int test_types(const char *fname)
     return status;
 }
 
-
 /*
 
-# ##############################################################################
-# # not comparable types
-# ##############################################################################
+ # ##############################################################################
+ # # not comparable types
+ # ##############################################################################
 
-# 2.0
-TOOLTEST h5diff_20.txt file3.h5 file3.h5 -v dset g1
+ # 2.0
+ TOOLTEST h5diff_20.txt file3.h5 file3.h5 -v dset g1
 
-# 2.1
-TOOLTEST h5diff_21.txt file3.h5 file3.h5 -v dset l1
+ # 2.1
+ TOOLTEST h5diff_21.txt file3.h5 file3.h5 -v dset l1
 
-# 2.2
-TOOLTEST h5diff_22.txt file3.h5 file3.h5 -v dset t1
+ # 2.2
+ TOOLTEST h5diff_22.txt file3.h5 file3.h5 -v dset t1
 
-# ##############################################################################
-# # compare groups, types, links (no differences and differences)
-# ##############################################################################
+ # ##############################################################################
+ # # compare groups, types, links (no differences and differences)
+ # ##############################################################################
 
-# 2.3
-TOOLTEST h5diff_23.txt file3.h5 file3.h5 -v g1 g1
+ # 2.3
+ TOOLTEST h5diff_23.txt file3.h5 file3.h5 -v g1 g1
 
-# 2.4
-TOOLTEST h5diff_24.txt file3.h5 file3.h5 -v t1 t1
+ # 2.4
+ TOOLTEST h5diff_24.txt file3.h5 file3.h5 -v t1 t1
 
-# 2.5
-TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v l1 l1
+ # 2.5
+ TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v l1 l1
 
-# 2.6
-TOOLTEST h5diff_26.txt file3.h5 file3.h5 -v g1 g2
+ # 2.6
+ TOOLTEST h5diff_26.txt file3.h5 file3.h5 -v g1 g2
 
-# 2.7
-TOOLTEST h5diff_27.txt file3.h5 file3.h5 -v t1 t2
+ # 2.7
+ TOOLTEST h5diff_27.txt file3.h5 file3.h5 -v t1 t2
 
-# 2.8
-TOOLTEST h5diff_28.txt file3.h5 file3.h5 -v l1 l2
-*/
+ # 2.8
+ TOOLTEST h5diff_28.txt file3.h5 file3.h5 -v l1 l2
+ */
 
 /*-------------------------------------------------------------------------
-* Function: test_datatypes
-*
-* Purpose: test dataset datatypes
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_datatypes
+ *
+ * Purpose: test dataset datatypes
+ *
+ *-------------------------------------------------------------------------
+ */
 static
 int test_datatypes(const char *fname)
 {
-
-    hid_t   fid1;
-    hid_t   dset;
-    hsize_t dims[2]={3,2};
-    herr_t  status;
-    char    buf1a[3][2] = {{1,1},{1,1},{1,1}};
-    char    buf1b[3][2] = {{1,1},{3,4},{5,6}};
-    short   buf2a[3][2] = {{1,1},{1,1},{1,1}};
-    short   buf2b[3][2] = {{1,1},{3,4},{5,6}};
-    int     buf3a[3][2] = {{1,1},{1,1},{1,1}};
-    int     buf3b[3][2] = {{1,1},{3,4},{5,6}};
-    long    buf4a[3][2] = {{1,1},{1,1},{1,1}};
-    long    buf4b[3][2] = {{1,1},{3,4},{5,6}};
-    float   buf5a[3][2] = {{1.0F, 1.0F}, {1.0F, 1.0F}, {1.0F, 1.0F}};
-    float   buf5b[3][2] = {{1.0F, 1.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}};
-    double  buf6a[3][2] = {{1.0F, 1.0F}, {1.0F, 1.0F}, {1.0F, 1.0F}};
-    double  buf6b[3][2] = {{1.0F, 1.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}};
+    hid_t fid1 = -1;
+    hid_t dset = -1;
+    hsize_t dims[2] = { 3, 2 };
+    herr_t status;
+    char buf1a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    char buf1b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    short buf2a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    short buf2b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    int buf3a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    int buf3b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    long buf4a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    long buf4b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    float buf5a[3][2] = { { 1.0F, 1.0F }, { 1.0F, 1.0F }, { 1.0F, 1.0F } };
+    float buf5b[3][2] = { { 1.0F, 1.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } };
+    double buf6a[3][2] = { { 1.0F, 1.0F }, { 1.0F, 1.0F }, { 1.0F, 1.0F } };
+    double buf6b[3][2] = { { 1.0F, 1.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } };
 
     /*unsigned/signed test
     signed char -128 to 127
     unsigned char 0 to 255
     */
-    char          buf7a[3][2] = {{-1,-128},{-1,-1},{-1,-1}};
-    unsigned char buf7b[3][2] = {{1,128},{1,1},{1,1}};
+    char buf7a[3][2] = { { -1, -128 }, { -1, -1 }, { -1, -1 } };
+    unsigned char buf7b[3][2] = { { 1, 128 }, { 1, 1 }, { 1, 1 } };
 
     /* long long test */
-    long long            buf8a[3][2] = {{1,1},{1,1},{1,1}};
-    long long            buf8b[3][2] = {{1,1},{3,4},{5,6}};
-    unsigned long long   buf9a[3][2] = {{1,1},{1,1},{1,1}};
-    unsigned long long   buf9b[3][2] = {{1,1},{3,4},{5,6}};
+    long long buf8a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    long long buf8b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    unsigned long long buf9a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    unsigned long long buf9b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
 
-    unsigned int    buf10a[3][2] = {{UIMAX,1},{1,1},{1,1}};
-    unsigned int    buf10b[3][2] = {{UIMAX-1,1},{3,4},{5,6}};
-
-    unsigned short     buf11a[3][2] = {{204,205},{2,3},{1,1}};
-    unsigned int     buf11b[3][2] = {{204,205},{2,3},{1,1}};
+    unsigned int buf10a[3][2] = { { UIMAX, 1 }, { 1, 1 }, { 1, 1 } };
+    unsigned int buf10b[3][2] = { { UIMAX - 1, 1 }, { 3, 4 }, { 5, 6 } };
 
+    unsigned short buf11a[3][2] = { { 204, 205 }, { 2, 3 }, { 1, 1 } };
+    unsigned int buf11b[3][2] = { { 204, 205 }, { 2, 3 }, { 1, 1 } };
 
     /*-------------------------------------------------------------------------
     * Create a file
     *-------------------------------------------------------------------------
     */
-    fid1 = H5Fcreate (fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    fid1 = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * Check for different storage order. Give a warning if they are different
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset0a",H5T_STD_I16LE,buf2a);
-    write_dset(fid1,2,dims,"dset0b",H5T_STD_I32LE,buf3b);
+    write_dset(fid1, 2, dims, "dset0a", H5T_STD_I16LE, buf2a);
+    write_dset(fid1, 2, dims, "dset0b", H5T_STD_I32LE, buf3b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_CHAR
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset1a",H5T_NATIVE_CHAR,buf1a);
-    write_dset(fid1,2,dims,"dset1b",H5T_NATIVE_CHAR,buf1b);
+    write_dset(fid1, 2, dims, "dset1a", H5T_NATIVE_CHAR, buf1a);
+    write_dset(fid1, 2, dims, "dset1b", H5T_NATIVE_CHAR, buf1b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_SHORT
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset2a",H5T_NATIVE_SHORT,buf2a);
-    write_dset(fid1,2,dims,"dset2b",H5T_NATIVE_SHORT,buf2b);
+    write_dset(fid1, 2, dims, "dset2a", H5T_NATIVE_SHORT, buf2a);
+    write_dset(fid1, 2, dims, "dset2b", H5T_NATIVE_SHORT, buf2b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_INT
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset3a",H5T_NATIVE_INT,buf3a);
-    write_dset(fid1,2,dims,"dset3b",H5T_NATIVE_INT,buf3b);
+    write_dset(fid1, 2, dims, "dset3a", H5T_NATIVE_INT, buf3a);
+    write_dset(fid1, 2, dims, "dset3b", H5T_NATIVE_INT, buf3b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_LONG
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset4a",H5T_NATIVE_LONG,buf4a);
-    write_dset(fid1,2,dims,"dset4b",H5T_NATIVE_LONG,buf4b);
+    write_dset(fid1, 2, dims, "dset4a", H5T_NATIVE_LONG, buf4a);
+    write_dset(fid1, 2, dims, "dset4b", H5T_NATIVE_LONG, buf4b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_FLOAT
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset5a",H5T_NATIVE_FLOAT,buf5a);
-    write_dset(fid1,2,dims,"dset5b",H5T_NATIVE_FLOAT,buf5b);
+    write_dset(fid1, 2, dims, "dset5a", H5T_NATIVE_FLOAT, buf5a);
+    write_dset(fid1, 2, dims, "dset5b", H5T_NATIVE_FLOAT, buf5b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_DOUBLE
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset6a",H5T_NATIVE_DOUBLE,buf6a);
-    write_dset(fid1,2,dims,"dset6b",H5T_NATIVE_DOUBLE,buf6b);
+    write_dset(fid1, 2, dims, "dset6a", H5T_NATIVE_DOUBLE, buf6a);
+    write_dset(fid1, 2, dims, "dset6b", H5T_NATIVE_DOUBLE, buf6b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_CHAR and H5T_NATIVE_UCHAR
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset7a",H5T_NATIVE_CHAR,buf7a);
-    write_dset(fid1,2,dims,"dset7b",H5T_NATIVE_UCHAR,buf7b);
+    write_dset(fid1, 2, dims, "dset7a", H5T_NATIVE_CHAR, buf7a);
+    write_dset(fid1, 2, dims, "dset7b", H5T_NATIVE_UCHAR, buf7b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_LLONG
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset8a",H5T_NATIVE_LLONG,buf8a);
-    write_dset(fid1,2,dims,"dset8b",H5T_NATIVE_LLONG,buf8b);
+    write_dset(fid1, 2, dims, "dset8a", H5T_NATIVE_LLONG, buf8a);
+    write_dset(fid1, 2, dims, "dset8b", H5T_NATIVE_LLONG, buf8b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_ULLONG
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset9a",H5T_NATIVE_ULLONG,buf9a);
-    write_dset(fid1,2,dims,"dset9b",H5T_NATIVE_ULLONG,buf9b);
+    write_dset(fid1, 2, dims, "dset9a", H5T_NATIVE_ULLONG, buf9a);
+    write_dset(fid1, 2, dims, "dset9b", H5T_NATIVE_ULLONG, buf9b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_INT
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset10a",H5T_NATIVE_UINT,buf10a);
-    write_dset(fid1,2,dims,"dset10b",H5T_NATIVE_UINT,buf10b);
+    write_dset(fid1, 2, dims, "dset10a", H5T_NATIVE_UINT, buf10a);
+    write_dset(fid1, 2, dims, "dset10b", H5T_NATIVE_UINT, buf10b);
 
     /*-------------------------------------------------------------------------
     * Same type class, different size
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset11a",H5T_STD_U16LE,buf11a);
-    dset=H5Dopen2 (fid1, "dset11a", H5P_DEFAULT);
-    write_attr(dset,2,dims,"attr",H5T_STD_U16LE,buf11a);
-    H5Dclose (dset);
+    write_dset(fid1, 2, dims, "dset11a", H5T_STD_U16LE, buf11a);
+    dset = H5Dopen2(fid1, "dset11a", H5P_DEFAULT);
+    write_attr(dset, 2, dims, "attr", H5T_STD_U16LE, buf11a);
+    H5Dclose(dset);
 
-    write_dset(fid1,2,dims,"dset11b",H5T_STD_U32LE,buf11b);
-    dset=H5Dopen2 (fid1, "dset11b", H5P_DEFAULT);
-    write_attr(dset,2,dims,"attr",H5T_STD_U32LE,buf11b);
-    H5Dclose (dset);
+    write_dset(fid1, 2, dims, "dset11b", H5T_STD_U32LE, buf11b);
+    dset = H5Dopen2(fid1, "dset11b", H5P_DEFAULT);
+    write_attr(dset, 2, dims, "attr", H5T_STD_U32LE, buf11b);
+    H5Dclose(dset);
 
     /*-------------------------------------------------------------------------
     * Close
@@ -920,59 +917,58 @@ int test_datatypes(const char *fname)
 }
 
 /*
-# ##############################################################################
-# # Dataset datatypes
-# ##############################################################################
+ # ##############################################################################
+ # # Dataset datatypes
+ # ##############################################################################
 
-# 5.0
-TOOLTEST h5diff_50.txt file4.h5 file4.h5 -v dset0a dset0b
+ # 5.0
+ TOOLTEST h5diff_50.txt file4.h5 file4.h5 -v dset0a dset0b
 
-# 5.1
-TOOLTEST h5diff_51.txt file4.h5 file4.h5 -v dset1a dset1b
+ # 5.1
+ TOOLTEST h5diff_51.txt file4.h5 file4.h5 -v dset1a dset1b
 
-# 5.2
-TOOLTEST h5diff_52.txt file4.h5 file4.h5 -v dset2a dset2b
+ # 5.2
+ TOOLTEST h5diff_52.txt file4.h5 file4.h5 -v dset2a dset2b
 
-# 5.3
-TOOLTEST h5diff_53.txt file4.h5 file4.h5 -v dset3a dset4b
+ # 5.3
+ TOOLTEST h5diff_53.txt file4.h5 file4.h5 -v dset3a dset4b
 
-# 5.4
-TOOLTEST h5diff_54.txt file4.h5 file4.h5 -v dset4a dset4b
+ # 5.4
+ TOOLTEST h5diff_54.txt file4.h5 file4.h5 -v dset4a dset4b
 
-# 5.5
-TOOLTEST h5diff_55.txt file4.h5 file4.h5 -v dset5a dset5b
+ # 5.5
+ TOOLTEST h5diff_55.txt file4.h5 file4.h5 -v dset5a dset5b
 
-# 5.6
-TOOLTEST h5diff_56.txt file4.h5 file4.h5 -v dset6a dset6b
+ # 5.6
+ TOOLTEST h5diff_56.txt file4.h5 file4.h5 -v dset6a dset6b
 
-# 5.7
-TOOLTEST h5diff_57.txt file4.h5 file4.h5 -v dset7a dset7b
+ # 5.7
+ TOOLTEST h5diff_57.txt file4.h5 file4.h5 -v dset7a dset7b
 
-# 5.8 (region reference)
-TOOLTEST h5diff_58.txt file7.h5 file8.h5 -v refreg
-*/
+ # 5.8 (region reference)
+ TOOLTEST h5diff_58.txt file7.h5 file8.h5 -v refreg
+ */
 
 /*-------------------------------------------------------------------------
-* Function: test_attributes
-*
-* Purpose: test attributes
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_attributes
+ *
+ * Purpose: test attributes
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int test_attributes(const char *file,
-                    int make_diffs /* flag to modify data buffers */)
+int test_attributes(const char *file, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   fid;
-    hid_t   did;
-    hid_t   gid;
-    hid_t   root_id;
-    hid_t   sid;
-    hsize_t dims[1]={2};
-    herr_t  status;
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t gid = -1;
+    hid_t root_id = -1;
+    hid_t sid = -1;
+    hsize_t dims[1] = { 2 };
+    herr_t status;
 
     /* Create a file  */
-    if((fid  = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create a 1D dataset */
@@ -982,18 +978,23 @@ int test_attributes(const char *file,
     assert(status >= 0);
 
     /* Create groups */
-    gid  = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    root_id   = H5Gopen2(fid, "/", H5P_DEFAULT);
+    gid = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    root_id = H5Gopen2(fid, "/", H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * write a series of attributes on the dataset, group, and root group
     *-------------------------------------------------------------------------
     */
-
-    write_attr_in(did,"dset",fid,make_diffs);
-    write_attr_in(gid,NULL,(hid_t)0,make_diffs);
-    write_attr_in(root_id,NULL,(hid_t)0,make_diffs);
-
+    if (make_diffs > 1) {
+        write_attr_strings(did, "dset", fid, make_diffs);
+        write_attr_strings(gid, NULL, (hid_t) 0, make_diffs);
+        write_attr_strings(root_id, NULL, (hid_t) 0, make_diffs);
+    }
+    else {
+        write_attr_in(did, "dset", fid, make_diffs);
+        write_attr_in(gid, NULL, (hid_t) 0, make_diffs);
+        write_attr_in(root_id, NULL, (hid_t) 0, make_diffs);
+    }
 
     /* Close */
     status = H5Dclose(did);
@@ -1009,338 +1010,313 @@ int test_attributes(const char *file,
     return status;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_attributes_verbose_level
-*
-* Purpose: Cresting test files for testing attributes along with
-* levels of verbos option
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_attributes_verbose_level
+ *
+ * Purpose: Cresting test files for testing attributes along with
+ * levels of verbos option
+ *
+ *-------------------------------------------------------------------------
+ */
 static int test_attributes_verbose_level(const char *fname1, const char *fname2)
 {
-    herr_t  status = SUCCEED;
-    hid_t   fid1    = -1,   fid2 = -1;
-    hid_t   f1_gid  = -1,   f2_gid = -1;
-    hid_t   f1_gid2 = -1,   f2_gid2 = -1;
-    hid_t   f1_gid3 = -1,   f2_gid3 = -1;
-    hid_t   f1_gid4 = -1,   f2_gid4 = -1;
-    hid_t   f1_did  = -1,   f2_did = -1;
-    hid_t   f1_sid  = -1,   f2_sid = -1;
-    hid_t   f1_tid  = -1,   f2_tid = -1;
+    herr_t status = SUCCEED;
+    hid_t fid1 = -1, fid2 = -1;
+    hid_t f1_gid = -1, f2_gid = -1;
+    hid_t f1_gid2 = -1, f2_gid2 = -1;
+    hid_t f1_gid3 = -1, f2_gid3 = -1;
+    hid_t f1_gid4 = -1, f2_gid4 = -1;
+    hid_t f1_did = -1, f2_did = -1;
+    hid_t f1_sid = -1, f2_sid = -1;
+    hid_t f1_tid = -1, f2_tid = -1;
     /* dset */
-    hsize_t dset_dims[1]={3};
-    int dset_data[3] = {0,1,2};
+    hsize_t dset_dims[1] = { 3 };
+    int dset_data[3] = { 0, 1, 2 };
 
     /* common attrs dim */
-    hsize_t attr_dims[1]={2};
+    hsize_t attr_dims[1] = { 2 };
 
     /* file1 attr */
-    int    f1_attr_idata[2]= {1,2};        /* integer */
-    float  f1_attr_fdata[2]= {1.1F,2.2F};    /* float */
+    int f1_attr_idata[2] = { 1, 2 }; /* integer */
+    float f1_attr_fdata[2] = { 1.1F, 2.2F }; /* float */
     /* file2 attr */
-    int    f2_attr_idata[2]= {2,3};        /* integer */
-    float  f2_attr_fdata[2]= {2.1F,3.2F};    /* float */
-
+    int f2_attr_idata[2] = { 2, 3 }; /* integer */
+    float f2_attr_fdata[2] = { 2.1F, 3.2F }; /* float */
 
     /*----------------------------------------------------------------------
     * Create file1
     *-----------------------------------------------------------------------*/
-    if((fid1  = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Groups
     */
     f1_gid = H5Gcreate2(fid1, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid < 0)
-    {
+    if (f1_gid < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid2 = H5Gcreate2(fid1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid2 < 0)
-    {
+    if (f1_gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid3 = H5Gcreate2(fid1, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid3 < 0)
-    {
+    if (f1_gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid4 = H5Gcreate2(fid1, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid4 < 0)
-    {
+    if (f1_gid4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Datasets
     */
     f1_sid = H5Screate_simple(1, dset_dims, NULL);
     f1_did = H5Dcreate2(fid1, "dset", H5T_NATIVE_INT, f1_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_did == FAIL)
-    {
+    if (f1_did == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f1_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Named Datatype
     */
     f1_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid1, "ntype", f1_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
-
-
     /*----------------------------------------------------------------------
     * Create file2
     *-----------------------------------------------------------------------*/
-    if((fid2  = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Groups
     */
     f2_gid = H5Gcreate2(fid2, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid < 0)
-    {
+    if (f2_gid < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid2 = H5Gcreate2(fid2, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid2 < 0)
-    {
+    if (f2_gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid3 = H5Gcreate2(fid2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid3 < 0)
-    {
+    if (f2_gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid4 = H5Gcreate2(fid2, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid4 < 0)
-    {
+    if (f2_gid4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Datasets
     */
     f2_sid = H5Screate_simple(1, dset_dims, NULL);
     f2_did = H5Dcreate2(fid2, "dset", H5T_NATIVE_INT, f2_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_did == FAIL)
-    {
+    if (f2_did == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f2_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Named Datatype
     */
     f2_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid2, "ntype", f2_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE1 - Same attr number, all Same attr name
     * add attr to group
     */
-    write_attr(f1_gid,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_gid,1,attr_dims,"float1",H5T_NATIVE_FLOAT,f1_attr_fdata);
+    write_attr(f1_gid, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_gid, 1, attr_dims, "float1", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
-    write_attr(f2_gid,1,attr_dims,"integer1",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_gid,1,attr_dims,"float1",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f2_gid, 1, attr_dims, "integer1", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_gid, 1, attr_dims, "float1", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE2 - Same attr number, some Same attr name
     * add attr to dset
     */
-    write_attr(f1_did,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_did,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f1_attr_fdata);
+    write_attr(f1_did, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_did, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
-    write_attr(f2_did,1,attr_dims,"integer1",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_did,1,attr_dims,"float3",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f2_did, 1, attr_dims, "integer1", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_did, 1, attr_dims, "float3", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE3 - Same attr number, all different attr name
     * add attr to ntype
     */
-    write_attr(f1_tid,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_tid,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f1_attr_fdata);
-    write_attr(f1_tid,1,attr_dims,"float3",H5T_NATIVE_FLOAT,f1_attr_fdata);
+    write_attr(f1_tid, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_tid, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f1_attr_fdata);
+    write_attr(f1_tid, 1, attr_dims, "float3", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
-    write_attr(f2_tid,1,attr_dims,"integer4",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_tid,1,attr_dims,"float5",H5T_NATIVE_FLOAT,f2_attr_fdata);
-    write_attr(f2_tid,1,attr_dims,"float6",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f2_tid, 1, attr_dims, "integer4", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_tid, 1, attr_dims, "float5", H5T_NATIVE_FLOAT, f2_attr_fdata);
+    write_attr(f2_tid, 1, attr_dims, "float6", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE4 - Different attr number, some same attr name (vs file2-g2)
     * add attr to g2
     */
-    write_attr(f1_gid2,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_gid2,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f1_attr_fdata);
-    write_attr(f1_gid2,1,attr_dims,"float3",H5T_NATIVE_FLOAT,f1_attr_fdata);
-
-    write_attr(f2_gid2,1,attr_dims,"integer1",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_gid2,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f1_gid2, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_gid2, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f1_attr_fdata);
+    write_attr(f1_gid2, 1, attr_dims, "float3", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
+    write_attr(f2_gid2, 1, attr_dims, "integer1", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_gid2, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE5 - Different attr number, all different attr name
     * add attr to g3
     */
-    write_attr(f1_gid3,1,attr_dims,"integer10",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_gid3,1,attr_dims,"float11",H5T_NATIVE_FLOAT,f1_attr_fdata);
-    write_attr(f1_gid3,1,attr_dims,"float12",H5T_NATIVE_FLOAT,f1_attr_fdata);
-
-    write_attr(f2_gid3,1,attr_dims,"integer3",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_gid3,1,attr_dims,"float4",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f1_gid3, 1, attr_dims, "integer10", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_gid3, 1, attr_dims, "float11", H5T_NATIVE_FLOAT, f1_attr_fdata);
+    write_attr(f1_gid3, 1, attr_dims, "float12", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
+    write_attr(f2_gid3, 1, attr_dims, "integer3", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_gid3, 1, attr_dims, "float4", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1 > 0)
+    if (fid1 > 0)
         H5Fclose(fid1);
-    if(fid2 > 0)
+    if (fid2 > 0)
         H5Fclose(fid2);
-    if(f1_gid > 0)
+    if (f1_gid > 0)
         H5Gclose(f1_gid);
-    if(f2_gid > 0)
+    if (f2_gid > 0)
         H5Gclose(f2_gid);
-    if(f1_gid2 > 0)
+    if (f1_gid2 > 0)
         H5Gclose(f1_gid2);
-    if(f2_gid2 > 0)
+    if (f2_gid2 > 0)
         H5Gclose(f2_gid2);
-    if(f1_gid3 > 0)
+    if (f1_gid3 > 0)
         H5Gclose(f1_gid3);
-    if(f2_gid3 > 0)
+    if (f2_gid3 > 0)
         H5Gclose(f2_gid3);
-    if(f1_gid4 > 0)
+    if (f1_gid4 > 0)
         H5Gclose(f1_gid4);
-    if(f2_gid4 > 0)
+    if (f2_gid4 > 0)
         H5Gclose(f2_gid4);
-    if(f1_did > 0)
+    if (f1_did > 0)
         H5Dclose(f1_did);
-    if(f2_did > 0)
+    if (f2_did > 0)
         H5Dclose(f2_did);
-    if(f1_sid > 0)
+    if (f1_sid > 0)
         H5Sclose(f1_sid);
-    if(f2_sid > 0)
+    if (f2_sid > 0)
         H5Sclose(f2_sid);
-    if(f1_tid > 0)
+    if (f1_tid > 0)
         H5Tclose(f1_tid);
-    if(f2_tid > 0)
+    if (f2_tid > 0)
         H5Tclose(f2_tid);
 
     return status;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_datasets
-*
-* Purpose: Check all HDF5 classes
-* H5T_INTEGER, H5T_FLOAT
-* H5T_TIME, H5T_STRING, H5T_BITFIELD, H5T_OPAQUE, H5T_COMPOUND, H5T_REFERENCE,
-* H5T_ENUM, H5T_VLEN, H5T_ARRAY
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_datasets
+ *
+ * Purpose: Check all HDF5 classes
+ * H5T_INTEGER, H5T_FLOAT
+ * H5T_TIME, H5T_STRING, H5T_BITFIELD, H5T_OPAQUE, H5T_COMPOUND, H5T_REFERENCE,
+ * H5T_ENUM, H5T_VLEN, H5T_ARRAY
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int test_datasets(const char *file,
-                  int make_diffs /* flag to modify data buffers */)
+int test_datasets(const char *file, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   fid;
-    hid_t   did;
-    hid_t   gid;
-    hid_t   sid;
-    hsize_t dims[1]={2};
-    herr_t  status;
-    int     buf[2]={1,2};
-
-    if(make_diffs > 0)
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t gid = -1;
+    hid_t sid = -1;
+    hsize_t dims[1] = { 2 };
+    herr_t status;
+    int buf[2] = { 1, 2 };
+
+    if (make_diffs > 0)
         memset(buf, 0, sizeof buf);
 
     /* Create a file  */
-    if((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create a 1D dataset */
     sid = H5Screate_simple(1, dims, NULL);
-    did  = H5Dcreate2(fid, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(fid, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
     status = H5Sclose(sid);
     assert(status >= 0);
 
     /* Create a group */
-    gid  = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    gid = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * write a series of datasets on the group
     *-------------------------------------------------------------------------
     */
 
-    write_dset_in(gid,"/dset",fid,make_diffs);
+    write_dset_in(gid, "/dset", fid, make_diffs);
 
     /* close */
     status = H5Dclose(did);
@@ -1355,29 +1331,29 @@ int test_datasets(const char *file,
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_special_datasets
-*
-* Purpose: Check datasets with datasapce of zero dimension size.
-*-------------------------------------------------------------------------
-*/
+ * Function: test_special_datasets
+ *
+ * Purpose: Check datasets with datasapce of zero dimension size.
+ *-------------------------------------------------------------------------
+ */
 static
-int test_special_datasets(const char *file,
-                  int make_diffs /* flag to modify data buffers */)
+int test_special_datasets(const char *file, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   fid;
-    hid_t   did;
-    hid_t   sid0, sid;
-    hsize_t dims0[SPACE1_RANK]={SPACE1_DIM1, SPACE1_DIM2};
-    hsize_t dims[SPACE1_RANK]={SPACE1_DIM1, SPACE1_DIM2};
-    herr_t  status;
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid0 = -1;
+    hid_t sid = -1;
+    hsize_t dims0[SPACE1_RANK] = { SPACE1_DIM1, SPACE1_DIM2 };
+    hsize_t dims[SPACE1_RANK] = { SPACE1_DIM1, SPACE1_DIM2 };
+    herr_t status;
 
     /* Create a file  */
-    if((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create a dataset with zero dimension size */
     sid0 = H5Screate_simple(SPACE1_RANK, dims0, NULL);
-    did  = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid0, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid0, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* close dataset */
     status = H5Dclose(did);
@@ -1388,12 +1364,12 @@ int test_special_datasets(const char *file,
     assert(status >= 0);
 
     /* Create a dataset with zero dimension size in one file but the other one
-     * has a dataset with a non-zero dimension size */
-    if(make_diffs)
+    * has a dataset with a non-zero dimension size */
+    if (make_diffs)
         dims[1] = SPACE1_DIM2 + 4;
 
     sid = H5Screate_simple(SPACE1_RANK, dims, NULL);
-    did  = H5Dcreate2(fid, "dset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(fid, "dset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* close dataspace */
     status = H5Sclose(sid);
@@ -1410,26 +1386,25 @@ int test_special_datasets(const char *file,
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare links, one has longer name than
-*          the other and short name is subset of long name.
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare links, one has longer name than
+ *          the other and short name is subset of long name.
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_link_name(const char *fname1)
 {
-    hid_t   fid1=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1439,16 +1414,15 @@ static int test_link_name(const char *fname1)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
-    gid2 = H5Gcreate2(fid1, "group_longname", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    gid2 = H5Gcreate2(fid1, "group_longname", H5P_DEFAULT, H5P_DEFAULT,
+            H5P_DEFAULT);
 
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1458,16 +1432,14 @@ static int test_link_name(const char *fname1)
     * Soft Links
     *------------------------------------------------------------------------*/
     status = H5Lcreate_soft("group", fid1, "link_g1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("group_longname", fid1, "link_g2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1477,38 +1449,37 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *------------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare soft links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare soft links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_soft_links(const char *fname1)
 {
-    hid_t   fid1=0;
-    hid_t   gid1=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1518,8 +1489,7 @@ static int test_soft_links(const char *fname1)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1529,25 +1499,22 @@ static int test_soft_links(const char *fname1)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"target_dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"target_dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
@@ -1558,48 +1525,42 @@ static int test_soft_links(const char *fname1)
     *------------------------------------------------------------------------*/
     /* file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/no_obj", fid1, "softlink_noexist", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1609,38 +1570,37 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare linked soft links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare linked soft links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_linked_softlinks(const char *fname1)
 {
-    hid_t   fid1=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hid_t   gid3=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t gid3 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1650,24 +1610,21 @@ static int test_linked_softlinks(const char *fname1)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid1, "target_group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3 = H5Gcreate2(fid1, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid3 < 0)
-    {
+    if (gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1677,24 +1634,21 @@ static int test_linked_softlinks(const char *fname1)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"target_dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"target_dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid1,2,dims2,"dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
@@ -1704,98 +1658,86 @@ static int test_linked_softlinks(const char *fname1)
     * Soft Links (Linked)
     *------------------------------------------------------------------------*/
     /*---------
-     * file 1 */
+    * file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink1_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_dset1", fid1, "softlink1_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_slink1", fid1, "softlink1_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink2_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_dset2", fid1, "softlink2_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_slink1", fid1, "softlink2_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group1", fid1, "softlink3_to_group1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_group1", fid1, "softlink3_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_slink1", fid1, "softlink3_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group2", fid1, "softlink4_to_group2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_group2", fid1, "softlink4_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_slink1", fid1, "softlink4_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1805,52 +1747,50 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(gid3)
+    if (gid3)
         H5Gclose(gid3);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare external links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare external links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_external_links(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
     /* source file */
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* target file */
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -1860,18 +1800,16 @@ static int test_external_links(const char *fname1, const char *fname2)
     * Groups
     *------------------------------------------------------------------------*/
     /*--------------
-     * target file */
+    * target file */
     gid1 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid2, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -1880,26 +1818,23 @@ static int test_external_links(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /*--------------
-     * target file */
-    status = write_dset(fid2,2,dims2,"target_dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    * target file */
+    status = write_dset(fid2, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"x_dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "x_dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"x_dset",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "x_dset", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -1911,48 +1846,42 @@ static int test_external_links(const char *fname1, const char *fname2)
     /*--------------*/
     /* source file */
     status = H5Lcreate_external(fname2, "/target_group/x_dset", fid1, "ext_link_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group2/x_dset", fid1, "ext_link_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group", fid1, "/ext_link_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group2", fid1, "/ext_link_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link_noexist1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link_noexist2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1962,52 +1891,50 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare external links which point to
-*          soft link in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare external links which point to
+ *          soft link in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_ext2soft_links(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
     /* source file */
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* target file */
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2018,8 +1945,7 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* target file */
     gid2 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2029,18 +1955,16 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /*--------------
-     * target file */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    * target file */
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -2050,18 +1974,16 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * Soft Links (Linked)
     *------------------------------------------------------------------------*/
     /*---------------
-     * target file */
+    * target file */
     status = H5Lcreate_soft("/dset1", fid2, "softlink_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "softlink_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2071,26 +1993,23 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * External Links
     *------------------------------------------------------------------------*/
     /*---------------
-     * source file */
+    * source file */
     status = H5Lcreate_external(fname2, "/target_group", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/softlink_to_dset1", fid1, "ext_link_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/softlink_to_dset2", fid1, "ext_link_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2100,46 +2019,44 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare dangling links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare dangling links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_dangle_links(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2149,34 +2066,30 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -2187,32 +2100,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file 1 */
     status = H5Lcreate_soft("no_obj", fid1, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset1", fid1, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid1, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj1", fid1, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2220,32 +2129,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
 
     /* file 2 */
     status = H5Lcreate_soft("no_obj", fid2, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid2, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj2", fid2, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2256,32 +2161,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file1 */
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/dset1", fid1, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2289,32 +2190,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
 
     /* file2 */
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/dset2", fid2, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid2, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2324,47 +2221,45 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: For testing comparing group member objects recursively
-*
-* Programmer: Jonathan Kim (Aug 19, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: For testing comparing group member objects recursively
+ *
+ * Programmer: Jonathan Kim (Aug 19, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_group_recurse(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1_f1=0, gid2_f1=0, gid3_f1=0, gid10_f1=0;
-    hid_t   gid1_f2=0, gid2_f2=0, gid3_f2=0, gid11_f2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{0,1},{1,0},{1,0}};
-    int data2[4][2] = {{0,2},{0,2},{2,0},{2,0}};
-    int data3[4][2] = {{0,3},{0,3},{3,0},{3,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1_f1 = -1, gid2_f1 = -1, gid3_f1 = -1, gid10_f1 = -1;
+    hid_t gid1_f2 = -1, gid2_f2 = -1, gid3_f2 = -1, gid11_f2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 0, 1 }, { 1, 0 }, { 1, 0 } };
+    int data2[4][2] = { { 0, 2 }, { 0, 2 }, { 2, 0 }, { 2, 0 } };
+    int data3[4][2] = { { 0, 3 }, { 0, 3 }, { 3, 0 }, { 3, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2375,32 +2270,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1_f1 = H5Gcreate2(fid1, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1_f1 < 0)
-    {
+    if (gid1_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2_f1 = H5Gcreate2(fid1, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2_f1 < 0)
-    {
+    if (gid2_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3_f1 = H5Gcreate2(fid1, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid3_f1 < 0)
-    {
+    if (gid3_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid10_f1 = H5Gcreate2(fid1, "/grp10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid10_f1 < 0)
-    {
+    if (gid10_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2408,32 +2299,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
 
     /* file2 */
     gid1_f2 = H5Gcreate2(fid2, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1_f2 < 0)
-    {
+    if (gid1_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2_f2 = H5Gcreate2(fid2, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2_f2 < 0)
-    {
+    if (gid2_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid3_f2 = H5Gcreate2(fid2, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid3_f2 < 0)
-    {
+    if (gid3_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid11_f2 = H5Gcreate2(fid2, "/grp11", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid11_f2 < 0)
-    {
+    if (gid11_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2443,50 +2330,44 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     * Datasets under root
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -2496,163 +2377,142 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     * Datasets under group
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(gid1_f1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2_f1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid2_f1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid3_f1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f1,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid10_f1,2,dims2,"dset4",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid10_f1, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid10_f1,2,dims2,"dset5",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(gid10_f1, 2, dims2, "dset5", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(gid1_f2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2_f2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid2_f2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid3_f2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f2,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid11_f2,2,dims2,"dset4",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid11_f2, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid11_f2,2,dims2,"dset5",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid11_f2, 2, dims2, "dset5", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
     /*-----------------------------------------------------------------------
     * Soft Links
     *------------------------------------------------------------------------*/
     /* file 1 */
     status = H5Lcreate_soft("/grp1", fid1, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid1, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid1, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp10", fid1, "slink_grp10", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2660,32 +2520,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
 
     /* file 2 */
     status = H5Lcreate_soft("/grp1", fid2, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid2, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid2, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp11", fid2, "slink_grp11", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2696,24 +2552,21 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp1", fid1, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2", fid1, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2/grp3", fid1, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2721,225 +2574,210 @@ static int test_group_recurse(const char *fname1, const char *fname2)
 
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp1", fid2, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2", fid2, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2/grp3", fid2, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     /*------------------------------
-     * external circle route test
-     * file1/grp11 <-> file2/grp10  via elink_grp_circle link
-     */
+    * external circle route test
+    * file1/grp11 <-> file2/grp10  via elink_grp_circle link
+    */
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp11", gid10_f1, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp10", gid11_f2, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1_f1)
+    if (gid1_f1)
         H5Gclose(gid1_f1);
-    if(gid2_f1)
+    if (gid2_f1)
         H5Gclose(gid2_f1);
-    if(gid3_f1)
+    if (gid3_f1)
         H5Gclose(gid3_f1);
-    if(gid1_f2)
+    if (gid1_f2)
         H5Gclose(gid1_f2);
-    if(gid2_f2)
+    if (gid2_f2)
         H5Gclose(gid2_f2);
-    if(gid3_f2)
+    if (gid3_f2)
         H5Gclose(gid3_f2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose:
-*   For testing comparing group member objects recursively via multiple
-*   linked external links
-*
-* Programmer: Jonathan Kim (Sep 16, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose:
+ *   For testing comparing group member objects recursively via multiple
+ *   linked external links
+ *
+ * Programmer: Jonathan Kim (Sep 16, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 #define GRP_R_DSETNAME1 "dset1"
 #define GRP_R_DSETNAME2 "dset2"
 static int test_group_recurse2(void)
 {
-    hid_t       fileid1     = -1;
-    hid_t       grp1        = -1;
-    hid_t       grp2        = -1;
-    hid_t       grp3        = -1;
-    hid_t       grp4        = -1;
-    hid_t       dset1       = -1;
-    hid_t       dset2       = -1;
-    hid_t       datatype    = -1;
-    hid_t       dataspace   = -1;
-    hid_t       fileid2     = -1;
-    hid_t       fileid3     = -1;
-    hid_t       fileid4     = -1;
-    hsize_t     dimsf[2];              /* dataset dimensions */
-    herr_t      status=0;
-    int data1[4][2] = {{0,0},{1,1},{2,2},{3,3}};
-    int data2[4][2] = {{0,0},{0,1},{0,2},{3,3}};
-
-   /*-----------------------------------------------------------------------
+    hid_t fileid1 = -1;
+    hid_t grp1 = -1;
+    hid_t grp2 = -1;
+    hid_t grp3 = -1;
+    hid_t grp4 = -1;
+    hid_t dset1 = -1;
+    hid_t dset2 = -1;
+    hid_t datatype = -1;
+    hid_t dataspace = -1;
+    hid_t fileid2 = -1;
+    hid_t fileid3 = -1;
+    hid_t fileid4 = -1;
+    hsize_t dimsf[2]; /* dataset dimensions */
+    herr_t status = 0;
+    int data1[4][2] = { { 0, 0 }, { 1, 1 }, { 2, 2 }, { 3, 3 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 1 }, { 0, 2 }, { 3, 3 } };
+
+    /*-----------------------------------------------------------------------
     * FILE 1
     *------------------------------------------------------------------------*/
     /*
-     * Create a new file using H5F_ACC_TRUNC access,
-     * default file creation properties, and default file
-     * access properties.
-     */
+    * Create a new file using H5F_ACC_TRUNC access,
+    * default file creation properties, and default file
+    * access properties.
+    */
     fileid1 = H5Fcreate(GRP_RECURSE1_EXT, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Groups
     *------------------------------------------------------------------------*/
     grp1 = H5Gcreate2(fileid1, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp1 < 0)
-    {
+    if (grp1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp2 = H5Gcreate2(grp1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp2 < 0)
-    {
+    if (grp2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp3 < 0)
-    {
+    if (grp3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp4 = H5Gcreate2(grp3, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp4 < 0)
-    {
+    if (grp4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Datasets
     *------------------------------------------------------------------------*/
     /*
-     * Describe the size of the array and create the data space for fixed
-     * size dataset.
-     */
+    * Describe the size of the array and create the data space for fixed
+    * size dataset.
+    */
     dimsf[0] = 4;
     dimsf[1] = 2;
     dataspace = H5Screate_simple(2, dimsf, NULL);
 
     /*
-     * Define datatype for the data in the file.
-     * We will store little endian INT numbers.
-     */
+    * Define datatype for the data in the file.
+    * We will store little endian INT numbers.
+    */
     datatype = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tset_order(datatype, H5T_ORDER_LE);
 
     /*---------------
-     * dset1
-     */
+    * dset1
+    */
     /*
-     * Create a new dataset within the file using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset1 = H5Dcreate2(fileid1, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the file using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset1 = H5Dcreate2(fileid1, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
     H5Dclose(dset1);
 
     /*---------------
-     * dset1
-     */
+    * dset1
+    */
     /*
-     * Create a new dataset within the file using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the file using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
 
     /*---------------
-     * dset2
-     */
+    * dset2
+    */
     /*
-     * Create a new dataset within the fileid1 using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the fileid1 using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Soft links
     *------------------------------------------------------------------------*/
     /*
-     * under  '/' root
-     */
+    * under  '/' root
+    */
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
@@ -2952,90 +2790,83 @@ static int test_group_recurse2(void)
     H5Gclose(grp3);
     H5Gclose(grp4);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * FILE 2-3
     *------------------------------------------------------------------------*/
 
     /* crate target file */
     fileid4 = H5Fcreate(GRP_RECURSE2_EXT3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * Groups
     */
     grp4 = H5Gcreate2(fileid4, "/g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp4 < 0)
-    {
+    if (grp4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3);
         status = FAIL;
         goto out;
     }
 
     /*---------------
-     * dset2
-     */
+    * dset2
+    */
     /*
-     * Create a new dataset within the fileid1 using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the fileid1 using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
 
     H5Gclose(grp4);
     H5Dclose(dset2);
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * FILE 2-2
     *------------------------------------------------------------------------*/
 
     /* crate target file */
     fileid3 = H5Fcreate(GRP_RECURSE2_EXT2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * Groups
     */
     grp2 = H5Gcreate2(fileid3, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp2 < 0)
-    {
+    if (grp2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp3 < 0)
-    {
+    if (grp3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
 
     /*---------------
-     * dset1
-     */
+    * dset1
+    */
     /*
-     * Create a new dataset within the fileid1 using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the fileid1 using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * extlink to  $GRP_RECURSE2_EXT3/g4
     */
     status = H5Lcreate_external(GRP_RECURSE2_EXT3, "/g4", fileid3, "/g2/g3/g4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
@@ -3045,56 +2876,52 @@ static int test_group_recurse2(void)
     H5Gclose(grp2);
     H5Gclose(grp3);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * FILE 2-1
     *------------------------------------------------------------------------*/
 
     /* crate target file */
     fileid2 = H5Fcreate(GRP_RECURSE2_EXT1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * Groups
     */
     grp1 = H5Gcreate2(fileid2, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp1 < 0)
-    {
+    if (grp1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     /*---------------
-     * dset1
-     */
-    dset1 = H5Dcreate2(fileid2, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * dset1
+    */
+    dset1 = H5Dcreate2(fileid2, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Soft links
     *------------------------------------------------------------------------*/
     /*
-     * under  '/' root
-     */
+    * under  '/' root
+    */
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid2, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
     }
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * extlink to  $GRP_RECURSE2_EXT2/g2
     */
     status = H5Lcreate_external(GRP_RECURSE2_EXT2, "/g2", fileid2, "/g1/g2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
@@ -3105,72 +2932,67 @@ static int test_group_recurse2(void)
 
 out:
     /*
-     * Close/release resources.
-     */
-    if(dataspace > 0)
+    * Close/release resources.
+    */
+    if (dataspace > 0)
         H5Sclose(dataspace);
-    if(datatype > 0)
+    if (datatype > 0)
         H5Tclose(datatype);
-    if(fileid1 > 0)
+    if (fileid1 > 0)
         H5Fclose(fileid1);
-    if(fileid2 > 0)
+    if (fileid2 > 0)
         H5Fclose(fileid2);
-    if(fileid3 > 0)
+    if (fileid3 > 0)
         H5Fclose(fileid3);
-    if(fileid4 > 0)
+    if (fileid4 > 0)
         H5Fclose(fileid4);
 
     return status;
 }
 
-
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for excluding obj.
-*          Same structure, same obj names
-* Test : exclude obj with different value to verify the rest are same
-*
-* Programmer: Jonathan Kim (July, 21, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for excluding obj.
+ *          Same structure, same obj names
+ * Test : exclude obj with different value to verify the rest are same
+ *
+ * Programmer: Jonathan Kim (July, 21, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_exclude_obj1(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    int data2[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    int data2[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Group
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3179,133 +3001,119 @@ static int test_exclude_obj1(const char *fname1, const char *fname2)
     /* file2 */
     gid2 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
     /*-----------------------------------------------------------------------
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset3",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset3", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"dset3",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for excluding obj.
-*          different structure and name
-* Test : exclude different objs to verify the rest are same
-*
-* Programmer: Jonathan Kim (July, 21, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for excluding obj.
+ *          different structure and name
+ * Test : exclude different objs to verify the rest are same
+ *
+ * Programmer: Jonathan Kim (July, 21, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_exclude_obj2(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hid_t   gid3=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    int data2[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t gid3 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    int data2[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Group
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3313,9 +3121,7 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
 
     /* file2 */
     gid2 = H5Gcreate2(fid2, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -3324,133 +3130,118 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     /* subset name from group10 */
     gid3 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-    if (gid3 < 0)
-    {
+    if (gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
     /*-----------------------------------------------------------------------
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset10",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset10",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3,2,dims2,"dset3",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(gid3)
+    if (gid3)
         H5Gclose(gid3);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for excluding obj.
-*          Only one file contains unique objs. Common objs are same.
-* Test : exclude unique objs to verify the rest are same
-*  - HDFFV-7837
-*
-* Programmer: Jonathan Kim (Mar, 19, 2012)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for excluding obj.
+ *          Only one file contains unique objs. Common objs are same.
+ * Test : exclude unique objs to verify the rest are same - HDFFV-7837
+ *
+ * Programmer: Jonathan Kim (Mar, 19, 2012)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_exclude_obj3(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Group
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3460,26 +3251,23 @@ static int test_exclude_obj3(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -3489,25 +3277,25 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for multiple variable length string/string array
-*          along with fixed length string/string array types in
-*          a compound type dataset.
-*
-* Programmer: Jonathan Kim (Oct, 26, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for multiple variable length string/string array
+ *          along with fixed length string/string array types in
+ *          a compound type dataset.
+ *
+ * Programmer: Jonathan Kim (Oct, 26, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 #define STR_RANK 1
 #define VLEN_STR_DIM 1
 #define FIXLEN_STR_SIZE 21
@@ -3520,187 +3308,170 @@ out:
 static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new)
 {
     int i;
-
-    hid_t    fid1   = -1;      /* file id */
-    hid_t    gid    = -1;
+    hid_t fid1 = -1; /* file id */
+    hid_t gid = -1;
 
     /* compound1 datatype */
-    typedef struct comp1_t
-    {
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
+    typedef struct comp1_t {
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
     } comp1_t;
 
     /* compound2 datatype */
-    typedef struct comp2_t
-    {
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
+    typedef struct comp2_t {
+        char *str_vlen; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
     } comp2_t;
 
     /* compound3 datatype */
-    typedef struct comp3_t
-    {
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
+    typedef struct comp3_t {
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
     } comp3_t;
 
     /* compound4 datatype */
-    typedef struct comp4_t
-    {
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
+    typedef struct comp4_t {
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
     } comp4_t;
 
     /* compound5 datatype */
-    typedef struct comp5_t
-    {
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
+    typedef struct comp5_t {
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
     } comp5_t;
 
     /* compound6 datatype */
-    typedef struct comp6_t
-    {
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
+    typedef struct comp6_t {
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char *str_vlen; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
     } comp6_t;
 
     /* compound7 datatype */
-    typedef struct comp7_t
-    {
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
+    typedef struct comp7_t {
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
     } comp7_t;
 
     /* compound8 datatype */
-    typedef struct comp8_t
-    {
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
+    typedef struct comp8_t {
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
     } comp8_t;
 
     /* compound9 datatype */
-    typedef struct comp9_t
-    {
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        int    int_data1;
-        hobj_ref_t objref1;                  /* reference */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        hobj_ref_t objref2;                  /* reference */
-        char   *str_vlen;  /* vlen string */
-        int    int_data2;
-        char   *str_vlen_repeat;  /* vlen string */
-        hobj_ref_t objref3;                  /* reference */
-        int    int_data3;
+    typedef struct comp9_t {
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        int int_data1;
+        hobj_ref_t objref1; /* reference */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        hobj_ref_t objref2; /* reference */
+        char *str_vlen; /* vlen string */
+        int int_data2;
+        char *str_vlen_repeat; /* vlen string */
+        hobj_ref_t objref3; /* reference */
+        int int_data3;
     } comp9_t;
 
     /* vlen string */
-    hid_t    sid_vlen_str=0;      /* dataspace ID */
-    hid_t    tid_vlen_str=0;      /* datatype ID */
-    char vlen_str_buf[]= {
-        "Variable length string"
-        };
-    hsize_t dims_vlen_str[]  = {VLEN_STR_DIM};
+    hid_t sid_vlen_str = -1; /* dataspace ID */
+    hid_t tid_vlen_str = -1; /* datatype ID */
+    char vlen_str_buf[] = { "Variable length string" };
+    hsize_t dims_vlen_str[] = { VLEN_STR_DIM };
 
     /* fixlen string */
-    hid_t    sid_fixlen_str=0;      /* dataspace ID */
-    hid_t    tid_fixlen_str=0;      /* datatype ID */
-    const char fixlen_str_buf[FIXLEN_STR_SIZE]= {
-        "Fixed length string"
-        };
-    hsize_t dims_fixlen_str[]  = {FIXLEN_STR_DIM};
+    hid_t sid_fixlen_str = -1; /* dataspace ID */
+    hid_t tid_fixlen_str = -1; /* datatype ID */
+    const char fixlen_str_buf[FIXLEN_STR_SIZE] = { "Fixed length string" };
+    hsize_t dims_fixlen_str[] = { FIXLEN_STR_DIM };
 
     /* vlen string array */
-    hid_t    sid_vlen_str_array=0;      /* dataspace ID */
-    hid_t    tid_vlen_str_array_pre=0;      /* datatype ID */
-    hid_t    tid_vlen_str_array=0; /* datatype ID */
-    char *vlen_str_array_buf[VLEN_STR_ARRY_DIM]= {
-        "1 - Variable length string Array",
-        "2 - Testing variable length string array in compound type",
-        "3 - Four score and seven\n years ago our forefathers brought forth on this continent a new nation,"
-        };
-    hsize_t dims_vlen_str_array[]  = {VLEN_STR_ARRY_DIM};
+    hid_t sid_vlen_str_array = -1; /* dataspace ID */
+    hid_t tid_vlen_str_array_pre = -1; /* datatype ID */
+    hid_t tid_vlen_str_array = -1; /* datatype ID */
+    const char *vlen_str_array_buf[VLEN_STR_ARRY_DIM] =
+    { "1 - Variable length string Array",
+            "2 - Testing variable length string array in compound type",
+            "3 - Four score and seven\n years ago our forefathers brought forth on this continent a new nation," };
+    hsize_t dims_vlen_str_array[] = { VLEN_STR_ARRY_DIM };
 
     /* fixlen string array  */
-    hid_t    sid_fixlen_str_array=0;      /* dataspace ID */
-    hid_t    tid_fixlen_str_array_pre=0;      /* datatype ID */
-    hid_t    tid_fixlen_str_array=0; /* datatype ID */
-    const char *fixlen_str_array_buf[FIXLEN_STR_ARRY_DIM]= {
-        "1 - Fixed length string Array",
-        "2 - Fixed length string Array",
-        "3 - Fixed length string Array"
-        };
-    hsize_t dims_fixlen_str_array[]  = {FIXLEN_STR_ARRY_DIM};
+    hid_t sid_fixlen_str_array = -1; /* dataspace ID */
+    hid_t tid_fixlen_str_array_pre = -1; /* datatype ID */
+    hid_t tid_fixlen_str_array = -1; /* datatype ID */
+    const char *fixlen_str_array_buf[FIXLEN_STR_ARRY_DIM] = {
+            "1 - Fixed length string Array", "2 - Fixed length string Array",
+            "3 - Fixed length string Array" };
+    hsize_t dims_fixlen_str_array[] = { FIXLEN_STR_ARRY_DIM };
 
     /*------------------------------------------
-     * compound dataset
-     *------------------------------------------*/
-    hid_t    sid_comp=0;      /* dataspace ID */
-    hid_t    tid1_comp=0;      /* datatype ID */
-    hid_t    tid2_comp=0;      /* datatype ID */
-    hid_t    tid3_comp=0;      /* datatype ID */
-    hid_t    tid4_comp=0;      /* datatype ID */
-    hid_t    tid5_comp=0;      /* datatype ID */
-    hid_t    tid6_comp=0;      /* datatype ID */
-    hid_t    tid7_comp=0;      /* datatype ID */
-    hid_t    tid8_comp=0;      /* datatype ID */
-    hid_t    tid9_comp=0;      /* datatype ID */
-    hid_t    did_comp=0;      /* dataset ID */
-    hsize_t dims_comp[]  = {COMP_DIM};
-    herr_t  status = SUCCEED;
+    * compound dataset
+    *------------------------------------------*/
+    hid_t sid_comp = -1; /* dataspace ID */
+    hid_t tid1_comp = -1; /* datatype ID */
+    hid_t tid2_comp = -1; /* datatype ID */
+    hid_t tid3_comp = -1; /* datatype ID */
+    hid_t tid4_comp = -1; /* datatype ID */
+    hid_t tid5_comp = -1; /* datatype ID */
+    hid_t tid6_comp = -1; /* datatype ID */
+    hid_t tid7_comp = -1; /* datatype ID */
+    hid_t tid8_comp = -1; /* datatype ID */
+    hid_t tid9_comp = -1; /* datatype ID */
+    hid_t did_comp = -1; /* dataset ID */
+    hsize_t dims_comp[] = { COMP_DIM };
+    herr_t status = SUCCEED;
 
     /* make compound strings data */
     comp1_t comp1_buf;
@@ -3756,23 +3527,30 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     HDstrcpy(comp9_buf.str_fixlen_repeat, fixlen_str_buf);
 
     /* copy vlen string array data to compound buffers */
-    for (i=0; i < VLEN_STR_ARRY_DIM; i++)
-    {
-        comp1_buf.str_array_vlen[i] = comp1_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp2_buf.str_array_vlen[i] = comp2_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp3_buf.str_array_vlen[i] = comp3_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp4_buf.str_array_vlen[i] = comp4_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp5_buf.str_array_vlen[i] = comp5_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp6_buf.str_array_vlen[i] = comp6_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp7_buf.str_array_vlen[i] = comp7_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp8_buf.str_array_vlen[i] = comp8_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp9_buf.str_array_vlen[i] = comp9_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
+    for (i = 0; i < VLEN_STR_ARRY_DIM; i++) {
+        comp1_buf.str_array_vlen[i] = comp1_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp2_buf.str_array_vlen[i] = comp2_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp3_buf.str_array_vlen[i] = comp3_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp4_buf.str_array_vlen[i] = comp4_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp5_buf.str_array_vlen[i] = comp5_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp6_buf.str_array_vlen[i] = comp6_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp7_buf.str_array_vlen[i] = comp7_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp8_buf.str_array_vlen[i] = comp8_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp9_buf.str_array_vlen[i] = comp9_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
 
     }
 
     /* copy fixlen string attay data to compound buffers */
-    for (i=0; i < FIXLEN_STR_ARRY_DIM; i++)
-    {
+    for (i = 0; i < FIXLEN_STR_ARRY_DIM; i++) {
         HDstrcpy(comp1_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
         HDstrcpy(comp1_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
@@ -3806,25 +3584,20 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     comp9_buf.int_data2 = 20;
     comp9_buf.int_data3 = 30;
 
-
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    if (is_file_new == 1)
-    {
-        fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-        if (fid1 < 0)
-        {
+    if (is_file_new == 1) {
+        fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        if (fid1 < 0) {
             fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
             status = FAIL;
             goto out;
         }
     }
-    else
-    {
-        fid1 = H5Fopen (fname1, H5F_ACC_RDWR, H5P_DEFAULT);
-        if (fid1 < 0)
-        {
+    else {
+        fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT);
+        if (fid1 < 0) {
             fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
             status = FAIL;
             goto out;
@@ -3835,8 +3608,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Create group
     *------------------------------------------------------------------------*/
     gid = H5Gcreate2(fid1, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid < 0)
-    {
+    if (gid < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3846,8 +3618,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Variable length String1 - Create space and type
     *------------------------------------------------------------------------*/
     sid_vlen_str = H5Screate_simple(STR_RANK, dims_vlen_str, NULL);
-    if (sid_vlen_str < 0)
-    {
+    if (sid_vlen_str < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3855,8 +3626,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_vlen_str = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_vlen_str, H5T_VARIABLE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3866,8 +3636,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Fixed length String2 - Create space and type
     *------------------------------------------------------------------------*/
     sid_fixlen_str = H5Screate_simple(STR_RANK, dims_fixlen_str, NULL);
-    if (sid_fixlen_str < 0)
-    {
+    if (sid_fixlen_str < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3875,8 +3644,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_fixlen_str = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_fixlen_str, FIXLEN_STR_SIZE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3886,8 +3654,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Fixed length String3 array - Create space and type
     *------------------------------------------------------------------------*/
     sid_vlen_str_array = H5Screate_simple(STR_RANK, dims_vlen_str_array, NULL);
-    if (sid_vlen_str_array < 0)
-    {
+    if (sid_vlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3895,17 +3662,15 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_vlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_vlen_str_array_pre, H5T_VARIABLE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-     /* Create the array data type for the string array                */
+    /* Create the array data type for the string array                */
     tid_vlen_str_array = H5Tarray_create2(tid_vlen_str_array_pre, COMP_RANK, dims_vlen_str_array);
-    if (tid_vlen_str_array < 0)
-    {
+    if (tid_vlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3915,8 +3680,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Variable length String4 array - Create space and type
     *------------------------------------------------------------------------*/
     sid_fixlen_str_array = H5Screate_simple(STR_RANK, dims_fixlen_str_array, NULL);
-    if (sid_fixlen_str_array < 0)
-    {
+    if (sid_fixlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3924,126 +3688,123 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_fixlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_fixlen_str_array_pre, FIXLEN_STR_ARRY_SIZE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
-     /* Create the array data type for the string array                */
+    /* Create the array data type for the string array                */
     tid_fixlen_str_array = H5Tarray_create2(tid_fixlen_str_array_pre, COMP_RANK, dims_fixlen_str_array);
-    if (tid_fixlen_str_array < 0)
-    {
+    if (tid_fixlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-   /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * Compound dataset
     *------------------------------------------------------------------------*/
     sid_comp = H5Screate_simple(COMP_RANK, dims_comp, NULL);
-    if (sid_comp < 0)
-    {
+    if (sid_comp < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
-    tid1_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp1_t));
-    tid2_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp2_t));
-    tid3_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp3_t));
-    tid4_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp4_t));
-    tid5_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp5_t));
-    tid6_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp6_t));
-    tid7_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp7_t));
-    tid8_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp8_t));
-    tid9_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp9_t));
+    tid1_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp1_t));
+    tid2_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp2_t));
+    tid3_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp3_t));
+    tid4_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp4_t));
+    tid5_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp5_t));
+    tid6_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp6_t));
+    tid7_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp7_t));
+    tid8_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp8_t));
+    tid9_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp9_t));
 
     /* compound 1 */
-    H5Tinsert(tid1_comp, "VLEN_STR1", HOFFSET(comp1_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid1_comp, "VLEN_STR2", HOFFSET(comp1_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid1_comp, "FIXLEN_STR1", HOFFSET(comp1_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid1_comp, "FIXLEN_STR2", HOFFSET(comp1_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid1_comp, "VLEN_STR1", HOFFSET(comp1_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid1_comp, "VLEN_STR2", HOFFSET(comp1_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid1_comp, "FIXLEN_STR1", HOFFSET(comp1_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid1_comp, "FIXLEN_STR2", HOFFSET(comp1_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid1_comp, "VLEN_STR_ARRAY1", HOFFSET(comp1_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid1_comp, "VLEN_STR_ARRAY2", HOFFSET(comp1_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid1_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp1_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid1_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp1_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 2 */
-    H5Tinsert(tid2_comp, "VLEN_STR1", HOFFSET(comp2_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid2_comp, "VLEN_STR2", HOFFSET(comp2_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid2_comp, "FIXLEN_STR1", HOFFSET(comp2_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid2_comp, "FIXLEN_STR2", HOFFSET(comp2_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid2_comp, "VLEN_STR1", HOFFSET(comp2_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid2_comp, "VLEN_STR2", HOFFSET(comp2_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid2_comp, "FIXLEN_STR1", HOFFSET(comp2_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid2_comp, "FIXLEN_STR2", HOFFSET(comp2_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid2_comp, "VLEN_STR_ARRAY1", HOFFSET(comp2_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid2_comp, "VLEN_STR_ARRAY2", HOFFSET(comp2_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid2_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp2_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid2_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp2_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 3 */
-    H5Tinsert(tid3_comp, "VLEN_STR1", HOFFSET(comp3_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid3_comp, "VLEN_STR2", HOFFSET(comp3_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid3_comp, "FIXLEN_STR1", HOFFSET(comp3_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid3_comp, "FIXLEN_STR2", HOFFSET(comp3_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid3_comp, "VLEN_STR1", HOFFSET(comp3_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid3_comp, "VLEN_STR2", HOFFSET(comp3_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid3_comp, "FIXLEN_STR1", HOFFSET(comp3_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid3_comp, "FIXLEN_STR2", HOFFSET(comp3_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid3_comp, "VLEN_STR_ARRAY1", HOFFSET(comp3_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid3_comp, "VLEN_STR_ARRAY2", HOFFSET(comp3_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid3_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp3_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid3_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp3_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 4 */
-    H5Tinsert(tid4_comp, "VLEN_STR1", HOFFSET(comp4_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid4_comp, "VLEN_STR2", HOFFSET(comp4_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid4_comp, "FIXLEN_STR1", HOFFSET(comp4_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid4_comp, "FIXLEN_STR2", HOFFSET(comp4_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid4_comp, "VLEN_STR1", HOFFSET(comp4_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid4_comp, "VLEN_STR2", HOFFSET(comp4_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid4_comp, "FIXLEN_STR1", HOFFSET(comp4_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid4_comp, "FIXLEN_STR2", HOFFSET(comp4_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid4_comp, "VLEN_STR_ARRAY1", HOFFSET(comp4_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid4_comp, "VLEN_STR_ARRAY2", HOFFSET(comp4_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid4_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp4_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid4_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp4_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 5 */
-    H5Tinsert(tid5_comp, "VLEN_STR1", HOFFSET(comp5_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid5_comp, "VLEN_STR2", HOFFSET(comp5_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid5_comp, "FIXLEN_STR1", HOFFSET(comp5_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid5_comp, "FIXLEN_STR2", HOFFSET(comp5_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid5_comp, "VLEN_STR1", HOFFSET(comp5_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid5_comp, "VLEN_STR2", HOFFSET(comp5_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid5_comp, "FIXLEN_STR1", HOFFSET(comp5_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid5_comp, "FIXLEN_STR2", HOFFSET(comp5_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid5_comp, "VLEN_STR_ARRAY1", HOFFSET(comp5_t, str_array_vlen), tid_vlen_str_array);
-    H5Tinsert(tid5_comp, "VLEN_STR_ARRAY2", HOFFSET(comp5_t, str_vlen_array_again), tid_vlen_str_array);
+    H5Tinsert(tid5_comp, "VLEN_STR_ARRAY2",  HOFFSET(comp5_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid5_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp5_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid5_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp5_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 6 */
-    H5Tinsert(tid6_comp, "VLEN_STR1", HOFFSET(comp6_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid6_comp, "VLEN_STR2", HOFFSET(comp6_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid6_comp, "FIXLEN_STR1", HOFFSET(comp6_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid6_comp, "FIXLEN_STR2", HOFFSET(comp6_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid6_comp, "VLEN_STR1", HOFFSET(comp6_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid6_comp, "VLEN_STR2", HOFFSET(comp6_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid6_comp, "FIXLEN_STR1", HOFFSET(comp6_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid6_comp, "FIXLEN_STR2", HOFFSET(comp6_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid6_comp, "VLEN_STR_ARRAY1", HOFFSET(comp6_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid6_comp, "VLEN_STR_ARRAY2", HOFFSET(comp6_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid6_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp6_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid6_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp6_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 7 */
-    H5Tinsert(tid7_comp, "VLEN_STR1", HOFFSET(comp7_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid7_comp, "VLEN_STR2", HOFFSET(comp7_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid7_comp, "FIXLEN_STR1", HOFFSET(comp7_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid7_comp, "FIXLEN_STR2", HOFFSET(comp7_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid7_comp, "VLEN_STR1", HOFFSET(comp7_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid7_comp, "VLEN_STR2", HOFFSET(comp7_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid7_comp, "FIXLEN_STR1", HOFFSET(comp7_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid7_comp, "FIXLEN_STR2", HOFFSET(comp7_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid7_comp, "VLEN_STR_ARRAY1", HOFFSET(comp7_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid7_comp, "VLEN_STR_ARRAY2", HOFFSET(comp7_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid7_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp7_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid7_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp7_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 8 */
-    H5Tinsert(tid8_comp, "VLEN_STR1", HOFFSET(comp8_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid8_comp, "VLEN_STR2", HOFFSET(comp8_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid8_comp, "FIXLEN_STR1", HOFFSET(comp8_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid8_comp, "FIXLEN_STR2", HOFFSET(comp8_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid8_comp, "VLEN_STR1", HOFFSET(comp8_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid8_comp, "VLEN_STR2", HOFFSET(comp8_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid8_comp, "FIXLEN_STR1", HOFFSET(comp8_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid8_comp, "FIXLEN_STR2", HOFFSET(comp8_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid8_comp, "VLEN_STR_ARRAY1", HOFFSET(comp8_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid8_comp, "VLEN_STR_ARRAY2", HOFFSET(comp8_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid8_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp8_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid8_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp8_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 9 */
-    H5Tinsert(tid9_comp, "VLEN_STR1", HOFFSET(comp9_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid9_comp, "VLEN_STR2", HOFFSET(comp9_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid9_comp, "FIXLEN_STR1", HOFFSET(comp9_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid9_comp, "FIXLEN_STR2", HOFFSET(comp9_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid9_comp, "VLEN_STR1", HOFFSET(comp9_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid9_comp, "VLEN_STR2", HOFFSET(comp9_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid9_comp, "FIXLEN_STR1", HOFFSET(comp9_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid9_comp, "FIXLEN_STR2", HOFFSET(comp9_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid9_comp, "VLEN_STR_ARRAY1", HOFFSET(comp9_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid9_comp, "VLEN_STR_ARRAY2", HOFFSET(comp9_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid9_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp9_t, str_array_fixlen), tid_fixlen_str_array);
@@ -4055,12 +3816,10 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     H5Tinsert(tid9_comp, "OBJREF2", HOFFSET(comp9_t, objref2), H5T_STD_REF_OBJ);
     H5Tinsert(tid9_comp, "OBJREF3", HOFFSET(comp9_t, objref3), H5T_STD_REF_OBJ);
 
-
     /* Write data to compound 1 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset1", tid1_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid1_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp1_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4070,8 +3829,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 2 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset2", tid2_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid2_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp2_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4081,8 +3839,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 3 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset3", tid3_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid3_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp3_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4092,8 +3849,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 4 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset4", tid4_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid4_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp4_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4103,8 +3859,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 5 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset5", tid5_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid5_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp5_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4114,8 +3869,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 6 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset6", tid6_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid6_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp6_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4125,8 +3879,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 7 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset7", tid7_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid7_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp7_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4136,8 +3889,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 8 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset8", tid8_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid8_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp8_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4148,166 +3900,158 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset9", tid9_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* obj references */
-    status=H5Rcreate(&(comp9_buf.objref1),gid,"Compound_dset2",H5R_OBJECT,(hid_t)-1);
-    status=H5Rcreate(&(comp9_buf.objref2),gid,"Compound_dset3",H5R_OBJECT,(hid_t)-1);
-    status=H5Rcreate(&(comp9_buf.objref3),gid,"Compound_dset4",H5R_OBJECT,(hid_t)-1);
+    status = H5Rcreate(&(comp9_buf.objref1), gid, "Compound_dset2", H5R_OBJECT, (hid_t) -1);
+    status = H5Rcreate(&(comp9_buf.objref2), gid, "Compound_dset3", H5R_OBJECT, (hid_t) -1);
+    status = H5Rcreate(&(comp9_buf.objref3), gid, "Compound_dset4", H5R_OBJECT, (hid_t) -1);
 
     status = H5Dwrite(did_comp, tid9_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp9_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
     H5Dclose(did_comp);
+    did_comp = -1;
 
-    did_comp=0;
 out:
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1 > 0)
+    if (fid1 > 0)
         H5Fclose(fid1);
-    if(gid > 0)
+    if (gid > 0)
         H5Gclose(gid);
     /* vlen string */
-    if(tid_vlen_str > 0)
+    if (tid_vlen_str > 0)
         H5Tclose(tid_vlen_str);
-    if(sid_vlen_str > 0)
+    if (sid_vlen_str > 0)
         H5Sclose(sid_vlen_str);
     /* fixed len string */
-    if(tid_fixlen_str > 0)
+    if (tid_fixlen_str > 0)
         H5Tclose(tid_fixlen_str);
-    if(sid_fixlen_str > 0)
+    if (sid_fixlen_str > 0)
         H5Sclose(sid_fixlen_str);
     /* vlen string array */
-    if(tid_vlen_str_array_pre > 0)
+    if (tid_vlen_str_array_pre > 0)
         H5Tclose(tid_vlen_str_array_pre);
-    if(tid_vlen_str_array > 0)
+    if (tid_vlen_str_array > 0)
         H5Tclose(tid_vlen_str_array);
-    if(sid_vlen_str_array > 0)
+    if (sid_vlen_str_array > 0)
         H5Sclose(sid_vlen_str_array);
     /* fixed len string array */
-    if(tid_fixlen_str_array_pre > 0)
+    if (tid_fixlen_str_array_pre > 0)
         H5Tclose(tid_fixlen_str_array_pre);
-    if(tid_fixlen_str_array > 0)
+    if (tid_fixlen_str_array > 0)
         H5Tclose(tid_fixlen_str_array);
-    if(sid_fixlen_str_array > 0)
+    if (sid_fixlen_str_array > 0)
         H5Sclose(sid_fixlen_str_array);
     /* compound */
-    if(tid1_comp > 0)
+    if (tid1_comp > 0)
         H5Tclose(tid1_comp);
-    if(tid2_comp > 0)
+    if (tid2_comp > 0)
         H5Tclose(tid2_comp);
-    if(tid3_comp > 0)
+    if (tid3_comp > 0)
         H5Tclose(tid3_comp);
-    if(tid4_comp > 0)
+    if (tid4_comp > 0)
         H5Tclose(tid4_comp);
-    if(tid5_comp > 0)
+    if (tid5_comp > 0)
         H5Tclose(tid5_comp);
-    if(tid6_comp > 0)
+    if (tid6_comp > 0)
         H5Tclose(tid6_comp);
-    if(tid7_comp > 0)
+    if (tid7_comp > 0)
         H5Tclose(tid7_comp);
-    if(tid8_comp > 0)
+    if (tid8_comp > 0)
         H5Tclose(tid8_comp);
-    if(tid9_comp > 0)
+    if (tid9_comp > 0)
         H5Tclose(tid9_comp);
-    if(did_comp > 0)
+    if (did_comp > 0)
         H5Dclose(did_comp);
-    if(sid_comp > 0)
+    if (sid_comp > 0)
         H5Sclose(sid_comp);
 
     return status;
 } /* end test_comp_vlen_strings() */
 
-
 /*-------------------------------------------------------------------------
-*
-* Purpose: Test diffs of enum values which may include invalid values.
-*
-* Programmer: Dana Robinson
-*
-*-------------------------------------------------------------------------*/
-
-static int
-test_enums(const char *fname)
+ *
+ * Purpose: Test diffs of enum values which may include invalid values.
+ *
+ * Programmer: Dana Robinson
+ *
+ *-------------------------------------------------------------------------*/
+
+static int test_enums(const char *fname)
 {
-    hid_t       fid  = -1;
+    hid_t fid = -1;
 
-    hid_t       tid       = -1;
-    int         enum_val  = -1;
+    hid_t tid = -1;
+    int enum_val = -1;
 
     /* The data in the two arrays cover the following cases:
-     *
-     *   V = valid enum value, I = invalid enum value
-     *
-     *   0:  I-I (same value)
-     *   1:  V-I
-     *   2:  I-V
-     *   3:  V-V (same value)
-     *   4:  I-I (different values) SKIPPED FOR NOW
-     *   5:  V-V (different values)
-     */
+    *
+    *   V = valid enum value, I = invalid enum value
+    *
+    *   0:  I-I (same value)
+    *   1:  V-I
+    *   2:  I-V
+    *   3:  V-V (same value)
+    *   4:  I-I (different values) SKIPPED FOR NOW
+    *   5:  V-V (different values)
+    */
     /* *** NOTE ***
-     *
-     * There is a bug in H5Dread() where invalid enum values are always
-     * returned as -1 so two different invalid enum values cannot be
-     * properly compared.  Test 4 has been adjusted to pass here
-     * while we fix the issue.
-     */
-    int         data1[6] = {9, 0, 9, 0, 9, 0};
+    *
+    * There is a bug in H5Dread() where invalid enum values are always
+    * returned as -1 so two different invalid enum values cannot be
+    * properly compared.  Test 4 has been adjusted to pass here
+    * while we fix the issue.
+    */
+    int data1[6] = { 9, 0, 9, 0, 9, 0 };
     /*int         data1[6] = {9, 0, 9, 0, 8, 0};  */
-    int         data2[6] = {9, 9, 0, 0, 9, 1};
+    int data2[6] = { 9, 9, 0, 0, 9, 1 };
 
-    hsize_t     dims = 6;
+    hsize_t dims = 6;
 
-    herr_t      status = SUCCEED;
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
-     * Create the file
-     *---------------------------------------------------------------------*/
+    * Create the file
+    *---------------------------------------------------------------------*/
 
     fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-----------------------------------------------------------------------
-     * Create enum types
-     *---------------------------------------------------------------------*/
+    * Create enum types
+    *---------------------------------------------------------------------*/
 
     tid = H5Tenum_create(H5T_NATIVE_INT);
     enum_val = 0;
     status = H5Tenum_insert(tid, "YIN", &enum_val);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
     enum_val = 1;
     status = H5Tenum_insert(tid, "YANG", &enum_val);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
 
     /*-----------------------------------------------------------------------
-     * Create datasets containing enum data.
-     *---------------------------------------------------------------------*/
+    * Create datasets containing enum data.
+    *---------------------------------------------------------------------*/
 
     status = write_dset(fid, 1, &dims, "dset1", tid, data1);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
     }
     status = write_dset(fid, 1, &dims, "dset2", tid, data2);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
@@ -4315,41 +4059,41 @@ test_enums(const char *fname)
 
 out:
     /*-----------------------------------------------------------------------
-     * Close
-     *---------------------------------------------------------------------*/
-    if(fid)
+    * Close
+    *---------------------------------------------------------------------*/
+    if (fid)
         H5Fclose(fid);
-    if(tid)
+    if (tid)
         H5Tclose(tid);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose:
-*   Create test files with dataset and attribute with container types
-*   (array, vlen) with multiple nested compound types.
-*
-* Function: test_comps_array()
-*  - type: compound->array->compound
-*
-* Function: test_comps_vlen()
-*  - type: compound->vlen->compound
-*
-* Function: test_comps_array_vlen()
-*  - type: compound->array->compound->vlen->compound
-*
-* Function: test_comps_vlen_arry()
-*  - type: compound->vlen->compound->array->compound
-*
-* Programmer: Jonathan Kim (Sep, 1, 2011)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose:
+ *   Create test files with dataset and attribute with container types
+ *   (array, vlen) with multiple nested compound types.
+ *
+ * Function: test_comps_array()
+ *  - type: compound->array->compound
+ *
+ * Function: test_comps_vlen()
+ *  - type: compound->vlen->compound
+ *
+ * Function: test_comps_array_vlen()
+ *  - type: compound->array->compound->vlen->compound
+ *
+ * Function: test_comps_vlen_arry()
+ *  - type: compound->vlen->compound->array->compound
+ *
+ * Programmer: Jonathan Kim (Sep, 1, 2011)
+ *
+ *-------------------------------------------------------------------------*/
 #define SDIM_DSET 2
 #define SDIM_CMPD_ARRAY 2
 
-static void test_comps_array (const char *fname, const char *dset, const char *attr,int diff, int is_file_new)
+static void test_comps_array(const char *fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 2 */
     typedef struct {
@@ -4363,42 +4107,39 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
         cmpd2_t cmpd2[SDIM_CMPD_ARRAY];
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* dataset with compound1 */
+    cmpd1_t wdata[SDIM_DSET]; /* dataset with compound1 */
 
-    hid_t  fid;  /* HDF5 File IDs  */
-    hid_t  did_dset; /* Dataset ID   */
-    hid_t  sid_dset;       /* Dataset space ID   */
-    hid_t  tid_cmpd1;       /* Compound1 type ID   */
-    hid_t  tid_arry1;       /* Array type ID in compound1   */
-    hid_t  tid_cmpd2;       /* Compound2 type ID   */
-    hid_t  tid_attr;
-    hsize_t  sdims_dset[] = {SDIM_DSET};
-    hsize_t  sdims_cmpd_arry[] = {SDIM_CMPD_ARRAY};
-    int     i,j;
-    herr_t  ret;  /* Generic return value  */
+    hid_t fid = -1; /* HDF5 File IDs  */
+    hid_t did_dset = -1; /* Dataset ID   */
+    hid_t sid_dset = -1; /* Dataset space ID   */
+    hid_t tid_cmpd1 = -1; /* Compound1 type ID   */
+    hid_t tid_arry1 = -1; /* Array type ID in compound1   */
+    hid_t tid_cmpd2 = -1; /* Compound2 type ID   */
+    hid_t tid_attr = -1;
+    hsize_t sdims_dset[] = { SDIM_DSET };
+    hsize_t sdims_cmpd_arry[] = { SDIM_CMPD_ARRAY };
+    int i, j;
+    herr_t ret; /* Generic return value  */
 
     /* Initialize array data to write */
-    for(i=0; i < SDIM_DSET; i++)
-    {
+    for (i = 0; i < SDIM_DSET; i++) {
         wdata[i].i1 = i;
-        for(j=0; j < SDIM_CMPD_ARRAY; j++)
-        {
+        for (j = 0; j < SDIM_CMPD_ARRAY; j++) {
             wdata[i].cmpd2[j].i2 = i * 10 + diff;
-            wdata[i].cmpd2[j].f2 = (float)i * 10.5F + (float)diff;
+            wdata[i].cmpd2[j].f2 = (float) i * 10.5F + (float) diff;
         } /* end for */
     }
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
-
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* -------------------------------
-     * Create a sub compound2 datatype  */
+    * Create a sub compound2 datatype  */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     /* Insert integer field */
@@ -4410,9 +4151,9 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create a top compound1.
-     */
-    tid_cmpd1 = H5Tcreate (H5T_COMPOUND, sizeof(cmpd1_t));
+    * Create a top compound1.
+    */
+    tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
 
     ret = H5Tinsert(tid_cmpd1, "int1", HOFFSET(cmpd1_t, i1), H5T_NATIVE_INT);
     assert(ret >= 0);
@@ -4423,10 +4164,9 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     ret = H5Tinsert(tid_cmpd1, "array_cmpd1", HOFFSET(cmpd1_t, cmpd2), tid_arry1);
     assert(ret >= 0);
 
-
     /* -------------------
-     * Create a dataset
-     */
+    * Create a dataset
+    */
     /* Create dataspace for datasets */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
@@ -4437,15 +4177,15 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
     assert(ret >= 0);
 
     /* ----------------
-     * Close Dataset */
+    * Close Dataset */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Tclose(tid_arry1);
@@ -4462,9 +4202,7 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     assert(ret >= 0);
 }
 
-
-
-static void test_comps_vlen (const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
+static void test_comps_vlen(const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 2 */
     typedef struct {
@@ -4475,44 +4213,46 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     /* top compound 1 */
     typedef struct {
         int i1;
-        hvl_t vl;   /* VL information for compound2 */
+        hvl_t vl; /* VL information for compound2 */
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* Dataset for compound1 */
+    cmpd1_t wdata[SDIM_DSET]; /* Dataset for compound1 */
 
-    hid_t  fid;  /* HDF5 File ID */
-    hid_t  did_dset; /* dataset ID   */
-    hid_t  sid_dset;  /* dataset space ID */
-    hid_t  tid_attr;
-    hid_t  tid_cmpd2; /* compound2 type ID */
-    hid_t  tid_cmpd1; /* compound1 type ID */
-    hid_t  tid_cmpd1_vlen;
-    hsize_t  sdims_dset[] = {SDIM_DSET};
+    hid_t fid = -1; /* HDF5 File ID */
+    hid_t did_dset = -1; /* dataset ID   */
+    hid_t sid_dset = -1; /* dataset space ID */
+    hid_t tid_attr = -1;
+    hid_t tid_cmpd2 = -1; /* compound2 type ID */
+    hid_t tid_cmpd1 = -1; /* compound1 type ID */
+    hid_t tid_cmpd1_vlen = -1;
+    hsize_t sdims_dset[] = { SDIM_DSET };
 
-    unsigned       i,j;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    unsigned i, j; /* counting variables */
+    herr_t ret; /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
-    for(i = 0; i < SDIM_DSET; i++) {
-        wdata[i].i1 = (int)i;
+    for (i = 0; i < SDIM_DSET; i++) {
+        wdata[i].i1 = (int) i;
         wdata[i].vl.p = HDmalloc((i + 1) * sizeof(cmpd2_t));
         wdata[i].vl.len = i + 1;
-        for(j = 0; j < (i + 1); j++) {
-            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = (int)(i * 10 + (unsigned)diff);
-            ((cmpd2_t *)wdata[i].vl.p)[j].f2 = (float)i * 10.5F + (float)diff;
+        for (j = 0; j < (i + 1); j++) {
+            ((cmpd2_t *) wdata[i].vl.p)[j].i2 =
+                    (int) (i * 10 + (unsigned) diff);
+            ((cmpd2_t *) wdata[i].vl.p)[j].f2 = (float) i * 10.5F
+                    + (float) diff;
         } /* end for */
     } /* end for */
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
+    * Create file(s)
+    *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* -----------------------------
-     * Create sub compound2 type */
+    * Create sub compound2 type */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     /* Insert fields */
@@ -4522,7 +4262,7 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /* ---------------------------
-     * Create top compound1 type */
+    * Create top compound1 type */
     tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
     /* Insert fields */
     ret = H5Tinsert(tid_cmpd1, "int1", HOFFSET(cmpd1_t, i1), H5T_NATIVE_INT);
@@ -4534,8 +4274,8 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /* -------------------------------
-     * Create dataset with compound1
-     */
+    * Create dataset with compound1
+    */
     /* Create dataspace for dataset */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
@@ -4547,8 +4287,8 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
@@ -4559,7 +4299,7 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /* ----------------
-     * Close IDs */
+    * Close IDs */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Dclose(did_dset);
@@ -4576,17 +4316,16 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 }
 
-
-static void test_comps_array_vlen (const char * fname, const char *dset,const char *attr, int diff, int is_file_new)
+static void test_comps_array_vlen(const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     typedef struct {
         int i3;
         float f3;
     } cmpd3_t;
 
-    typedef struct {        /* Typedef for compound datatype */
+    typedef struct { /* Typedef for compound datatype */
         int i2;
-        hvl_t vl;   /* VL information to write */
+        hvl_t vl; /* VL information to write */
     } cmpd2_t;
 
     typedef struct {
@@ -4594,53 +4333,53 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
         cmpd2_t cmpd2[SDIM_CMPD_ARRAY];
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* Information to write */
-    hid_t  fid;  /* HDF5 File IDs  */
-    hid_t  did_dset; /* Dataset ID   */
-    hid_t  sid_dset;       /* Dataspace ID   */
-    hid_t  tid_attr;
-    hid_t  tid_cmpd1;       /* Compound1 Datatype ID   */
-    hid_t  tid_arry1;       /* Array Datatype ID   */
-    hid_t  tid_cmpd2;       /* Compound2 Datatype ID   */
-    hid_t  tid_cmpd2_vlen;
-    hid_t  tid_cmpd3;       /* Compound3 Datatype ID   */
-    hsize_t  sdims_dset[] = {SDIM_DSET};
-    hsize_t  sdims_arry[] = {SDIM_CMPD_ARRAY};
-    unsigned i, j, k;   /* counting variables */
-    herr_t  ret;        /* Generic return value  */
-
-
+    cmpd1_t wdata[SDIM_DSET]; /* Information to write */
+    hid_t fid = -1; /* HDF5 File IDs  */
+    hid_t did_dset = -1; /* Dataset ID   */
+    hid_t sid_dset = -1; /* Dataspace ID   */
+    hid_t tid_attr = -1;
+    hid_t tid_cmpd1 = -1; /* Compound1 Datatype ID   */
+    hid_t tid_arry1 = -1; /* Array Datatype ID   */
+    hid_t tid_cmpd2 = -1; /* Compound2 Datatype ID   */
+    hid_t tid_cmpd2_vlen = -1;
+    hid_t tid_cmpd3 = -1; /* Compound3 Datatype ID   */
+    hsize_t sdims_dset[] = { SDIM_DSET };
+    hsize_t sdims_arry[] = { SDIM_CMPD_ARRAY };
+    unsigned i, j, k; /* counting variables */
+    herr_t ret; /* Generic return value  */
 
     /* Initialize array data to write in compound1 */
-    for(i = 0; i < SDIM_DSET; i++) {
-        wdata[i].i1 = (int)i;
+    for (i = 0; i < SDIM_DSET; i++) {
+        wdata[i].i1 = (int) i;
 
         /* Allocate and initialize VL data to write in compound2 */
-        for(j = 0; j < SDIM_CMPD_ARRAY; j++) {
-            wdata[i].cmpd2[j].i2 = (int)(j * 10);
+        for (j = 0; j < SDIM_CMPD_ARRAY; j++) {
+            wdata[i].cmpd2[j].i2 = (int) (j * 10);
             wdata[i].cmpd2[j].vl.p = HDmalloc((j + 1) * sizeof(cmpd3_t));
             wdata[i].cmpd2[j].vl.len = j + 1;
-            for(k = 0; k < (j + 1); k++) {
+            for (k = 0; k < (j + 1); k++) {
                 /* Initialize data of compound3 */
-                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].i3 = (int)j * 10 + diff;
-                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].f3 = (float)j * 10.5F + (float)diff;
+                ((cmpd3_t *) wdata[i].cmpd2[j].vl.p)[k].i3 = (int) j * 10
+                        + diff;
+                ((cmpd3_t *) wdata[i].cmpd2[j].vl.p)[k].f3 = (float) j * 10.5F
+                        + (float) diff;
             } /* end for */
         } /* end for */
     }
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
+    * Create file(s)
+    *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* Create dataspace for datasets */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
     /*-------------------------------------
-     * Create a sub compound3 datatype  */
+    * Create a sub compound3 datatype  */
     tid_cmpd3 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd3_t));
 
     /* Insert integer field */
@@ -4651,9 +4390,8 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     ret = H5Tinsert(tid_cmpd3, "float", HOFFSET(cmpd3_t, f3), H5T_NATIVE_FLOAT);
     assert(ret >= 0);
 
-
     /*-------------------------------------
-     * Create a sub compound2 datatype  */
+    * Create a sub compound2 datatype  */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     /* Insert integer field */
@@ -4664,20 +4402,18 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     ret = H5Tinsert(tid_cmpd2, "vlen", HOFFSET(cmpd2_t, vl), tid_cmpd2_vlen);
     assert(ret >= 0);
 
-
     /*-----------------------------------
-     * Create a top compound1 datatype for dataset.
-     */
-    tid_cmpd1 = H5Tcreate (H5T_COMPOUND, sizeof(cmpd1_t));
+    * Create a top compound1 datatype for dataset.
+    */
+    tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
 
     /* Create an array datatype */
     tid_arry1 = H5Tarray_create2(tid_cmpd2, 1, sdims_arry);
     /* insert the array */
     H5Tinsert(tid_cmpd1, "array_comp", HOFFSET(cmpd1_t, cmpd2), tid_arry1);
 
-
     /* ----------------------
-     * Create a dataset */
+    * Create a dataset */
     did_dset = H5Dcreate2(fid, dset, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
@@ -4685,8 +4421,8 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
@@ -4697,7 +4433,7 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     assert(ret >= 0);
 
     /*-------------------
-     * Close IDs */
+    * Close IDs */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Tclose(tid_arry1);
@@ -4718,8 +4454,7 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     assert(ret >= 0);
 }
 
-
-static void test_comps_vlen_arry (const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
+static void test_comps_vlen_arry(const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 3 */
     typedef struct {
@@ -4736,53 +4471,53 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     /* top compound 1 */
     typedef struct {
         int i1;
-        hvl_t vl;   /* VL information for compound2 */
+        hvl_t vl; /* VL information for compound2 */
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* Dataset for compound1 */
+    cmpd1_t wdata[SDIM_DSET]; /* Dataset for compound1 */
 
-    hid_t  fid;  /* HDF5 File ID */
-    hid_t  did_dset; /* dataset ID   */
-    hid_t  sid_dset;  /* dataset space ID */
-    hid_t  tid_attr;
-    hid_t  tid_cmpd3; /* compound3 type ID */
-    hid_t  tid_cmpd2; /* compound2 type ID */
-    hid_t  tid_cmpd2_arry;
-    hid_t  tid_cmpd1; /* compound1 type ID */
-    hid_t  tid_cmpd1_vlen;
-    hsize_t  sdims_dset[] = {SDIM_DSET};
-    hsize_t  sdims_cmpd_arry[] = {SDIM_CMPD_ARRAY};
+    hid_t fid = -1; /* HDF5 File ID */
+    hid_t did_dset = -1; /* dataset ID   */
+    hid_t sid_dset = -1; /* dataset space ID */
+    hid_t tid_attr = -1;
+    hid_t tid_cmpd3 = -1; /* compound3 type ID */
+    hid_t tid_cmpd2 = -1; /* compound2 type ID */
+    hid_t tid_cmpd2_arry = -1;
+    hid_t tid_cmpd1 = -1; /* compound1 type ID */
+    hid_t tid_cmpd1_vlen = -1;
+    hsize_t sdims_dset[] = { SDIM_DSET };
+    hsize_t sdims_cmpd_arry[] = { SDIM_CMPD_ARRAY };
 
-    unsigned       i,j,k;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    unsigned i, j, k; /* counting variables */
+    herr_t ret; /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
-    for(i = 0; i < SDIM_DSET; i++) {
+    for (i = 0; i < SDIM_DSET; i++) {
         /* compound 1 data */
-        wdata[i].i1 = (int)i;
+        wdata[i].i1 = (int) i;
         wdata[i].vl.p = HDmalloc((i + 1) * sizeof(cmpd2_t));
         wdata[i].vl.len = i + 1;
-        for(j = 0; j < (i + 1); j++) {
+        for (j = 0; j < (i + 1); j++) {
             /* compound2 data */
-            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = (int)i * 10 + diff;
-            for(k = 0; k < SDIM_CMPD_ARRAY; k++) {
+            ((cmpd2_t *) wdata[i].vl.p)[j].i2 = (int) i * 10 + diff;
+            for (k = 0; k < SDIM_CMPD_ARRAY; k++) {
                 /* compound 3 data */
-                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].i3 = (int)((float)k * 10.5F) + diff;
-                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].f3 = (float)k * 10.5F + (float)diff;
+                ((cmpd2_t *) (wdata[i].vl.p))[j].cmpd3[k].i3 = (int) ((float) k * 10.5F) + diff;
+                ((cmpd2_t *) (wdata[i].vl.p))[j].cmpd3[k].f3 = (float) k * 10.5F + (float) diff;
             } /* end for */
         } /* end for */
     } /* end for */
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
+    * Create file(s)
+    *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* -----------------------------
-     * Create sub compound3 type */
+    * Create sub compound3 type */
     tid_cmpd3 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd3_t));
 
     /* Insert fields */
@@ -4792,7 +4527,7 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* -----------------------------
-     * Create sub compound2 type */
+    * Create sub compound2 type */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     ret = H5Tinsert(tid_cmpd2, "int2", HOFFSET(cmpd2_t, i2), H5T_NATIVE_INT);
@@ -4803,8 +4538,8 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* ---------------------------
-     * Create top compound1 type
-     */
+    * Create top compound1 type
+    */
     /* Create a VL datatype */
     tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
     /* Insert fields */
@@ -4815,21 +4550,22 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* -------------------------------
-     * Create dataset with compound1
-     */
+    * Create dataset with compound1
+    */
     /* Create dataspace for dataset */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
     /* Create a dataset */
-    did_dset = H5Dcreate2(fid, dset, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did_dset = H5Dcreate2(fid, dset, tid_cmpd1, sid_dset, H5P_DEFAULT,
+            H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
     ret = H5Dwrite(did_dset, tid_cmpd1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
@@ -4840,7 +4576,7 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* ----------------
-     * Close IDs */
+    * Close IDs */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Dclose(did_dset);
@@ -4861,99 +4597,95 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_data_nocomparables
-*
-* Purpose:
-*   Create test files with non-comparable dataset and attributes with
-*   comparable datasets and attributes.  All the comparables should display
-*   differences.
-*
-*-------------------------------------------------------------------------*/
+ * Function: test_data_nocomparables
+ *
+ * Purpose:
+ *   Create test files with non-comparable dataset and attributes with
+ *   comparable datasets and attributes.  All the comparables should display
+ *   differences.
+ *
+ *-------------------------------------------------------------------------*/
 #define DIM_ARRY 3
-static void test_data_nocomparables (const char * fname, int make_diffs)
+static void test_data_nocomparables(const char * fname, int make_diffs)
 {
-    hid_t   fid=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hid_t   did1=0;
-    hid_t   did2=0;
-    hid_t   sid1=0;
-    hid_t   tid_dset1=0;
-    hid_t   tid_attr1=0;
-    hsize_t dims1_1[1] = {DIM_ARRY};
-    hsize_t dims1_2[1] = {DIM_ARRY+1};
-    hsize_t dims2[2] = {DIM_ARRY, 1};
-    int data1[DIM_ARRY] = {0,0,0};
-    int data2[DIM_ARRY] = {1,1,1};
-    int data3[DIM_ARRY+1] = {1,1,1,1};
-    int data1_dim2[DIM_ARRY][1] = {{0},{0},{0}};
+    hid_t fid = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t did1 = -1;
+    hid_t did2 = -1;
+    hid_t sid1 = -1;
+    hid_t tid_dset1 = -1;
+    hid_t tid_attr1 = -1;
+    hsize_t dims1_1[1] = { DIM_ARRY };
+    hsize_t dims1_2[1] = { DIM_ARRY + 1 };
+    hsize_t dims2[2] = { DIM_ARRY, 1 };
+    int data1[DIM_ARRY] = { 0, 0, 0 };
+    int data2[DIM_ARRY] = { 1, 1, 1 };
+    int data3[DIM_ARRY + 1] = { 1, 1, 1, 1 };
+    int data1_dim2[DIM_ARRY][1] = { { 0 }, { 0 }, { 0 } };
     int rank_attr;
-    char data1_str[DIM_ARRY][STR_SIZE]= {"ab","cd","ef"};
-    herr_t  status = SUCCEED;
-    void *dset_data_ptr1=NULL;
-    void *dset_data_ptr2=NULL;
-    void *dset_data_ptr3=NULL;
-    void *attr_data_ptr1=NULL;
-    void *attr_data_ptr2=NULL;
-    void *attr_data_ptr3=NULL;
-    void *attr_data_ptr4=NULL;
-    void *attr2_dim_ptr=NULL;
-    void *attr3_dim_ptr=NULL;
+    char data1_str[DIM_ARRY][STR_SIZE] = { "ab", "cd", "ef" };
+    herr_t status = SUCCEED;
+    void *dset_data_ptr1 = NULL;
+    void *dset_data_ptr2 = NULL;
+    void *dset_data_ptr3 = NULL;
+    void *attr_data_ptr1 = NULL;
+    void *attr_data_ptr2 = NULL;
+    void *attr_data_ptr3 = NULL;
+    void *attr_data_ptr4 = NULL;
+    void *attr2_dim_ptr = NULL;
+    void *attr3_dim_ptr = NULL;
 
     /* init */
-    tid_dset1=H5Tcopy(H5T_NATIVE_INT);
-    dset_data_ptr1=(int*)&data1;
-    dset_data_ptr2=(int*)&data1;
-    dset_data_ptr3=(int*)&data1;
-    tid_attr1=H5Tcopy(H5T_NATIVE_INT);
-    attr_data_ptr1=(int*)&data1;
-    attr_data_ptr3=(int*)&data1;
-    attr_data_ptr4=(int*)&data1;
-    attr2_dim_ptr=(hsize_t*)&dims1_1;
-    attr3_dim_ptr=(hsize_t*)&dims1_1;
-    rank_attr=1;
-
-    if (make_diffs)
-    {
+    tid_dset1 = H5Tcopy(H5T_NATIVE_INT);
+    dset_data_ptr1 = (int*) &data1;
+    dset_data_ptr2 = (int*) &data1;
+    dset_data_ptr3 = (int*) &data1;
+    tid_attr1 = H5Tcopy(H5T_NATIVE_INT);
+    attr_data_ptr1 = (int*) &data1;
+    attr_data_ptr3 = (int*) &data1;
+    attr_data_ptr4 = (int*) &data1;
+    attr2_dim_ptr = (hsize_t*) &dims1_1;
+    attr3_dim_ptr = (hsize_t*) &dims1_1;
+    rank_attr = 1;
+
+    if (make_diffs) {
         /* ------------
-         * group1 */
-        tid_dset1=H5Tcopy(H5T_C_S1);
-        H5Tset_size(tid_dset1, (size_t)STR_SIZE);
-        dset_data_ptr1=(char*)&data1_str;
-        dset_data_ptr2=(int*)&data2;
-        attr_data_ptr1=(int*)&data2;
+        * group1 */
+        tid_dset1 = H5Tcopy(H5T_C_S1);
+        H5Tset_size(tid_dset1, (size_t) STR_SIZE);
+        dset_data_ptr1 = (char*) &data1_str;
+        dset_data_ptr2 = (int*) &data2;
+        attr_data_ptr1 = (int*) &data2;
 
         /* -----------
-         * group2
-         */
-        dset_data_ptr3=(int*)&data2;
+        * group2
+        */
+        dset_data_ptr3 = (int*) &data2;
         /* dset1/attr1 */
-        tid_attr1=H5Tcopy(H5T_C_S1);
-        H5Tset_size(tid_attr1, (size_t)STR_SIZE);
-        attr_data_ptr2=(char*)&data1_str;
+        tid_attr1 = H5Tcopy(H5T_C_S1);
+        H5Tset_size(tid_attr1, (size_t) STR_SIZE);
+        attr_data_ptr2 = (char*) &data1_str;
 
         /* dset1/attr2 */
-        attr2_dim_ptr=(hsize_t*)&dims1_2;
+        attr2_dim_ptr = (hsize_t*) &dims1_2;
 
         /* dset1/attr3 */
-        attr_data_ptr3=(int*)&data1_dim2;
-        attr3_dim_ptr=(hsize_t*)&dims2;
-        rank_attr=2;
+        attr_data_ptr3 = (int*) &data1_dim2;
+        attr3_dim_ptr = (hsize_t*) &dims2;
+        rank_attr = 2;
 
         /* dset1/attr4 */
-        attr_data_ptr4=(int*)&data2;
+        attr_data_ptr4 = (int*) &data2;
 
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid = H5Fcreate (fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid < 0)
-    {
+    fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname);
         status = FAIL;
         goto out;
@@ -4963,16 +4695,14 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
@@ -4981,29 +4711,26 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
     /*-----------------------------------------------------------------------
     * Datasets in /g1
     *------------------------------------------------------------------------*/
-    if((sid1 = H5Screate_simple(1, dims1_1, NULL)) < 0)
-         goto out;
+    if ((sid1 = H5Screate_simple(1, dims1_1, NULL)) < 0)
+        goto out;
 
     /*  dset1 */
-    if((did1 = H5Dcreate2(gid1, "dset1", tid_dset1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    if ((did1 = H5Dcreate2(gid1, "dset1", tid_dset1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
-    if(H5Dwrite(did1, tid_dset1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr1) < 0)
-    {
+    if (H5Dwrite(did1, tid_dset1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr1) < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
-    write_attr(did1,1,dims1_1,"attr", H5T_NATIVE_INT, attr_data_ptr1);
+    write_attr(did1, 1, dims1_1, "attr", H5T_NATIVE_INT, attr_data_ptr1);
 
     /*  dset2 */
-    status = write_dset(gid1, 1, dims1_1,"dset2", H5T_NATIVE_INT, dset_data_ptr2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
@@ -5012,108 +4739,100 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
     * Datasets in /g2
     *------------------------------------------------------------------------*/
     /* ---------
-     *  dset1 */
-    if((did2 = H5Dcreate2(gid2, "dset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    *  dset1 */
+    if ((did2 = H5Dcreate2(gid2, "dset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
-    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr3) < 0)
-    {
+    if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr3) < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
     /* attr1 - non-compatible : different type */
-    write_attr(did2,1,dims1_1,"attr1", tid_attr1, attr_data_ptr2);
-
+    write_attr(did2, 1, dims1_1, "attr1", tid_attr1, attr_data_ptr2);
 
     /* attr2 - non-compatible : same rank, different dimention */
-    write_attr(did2,1, attr2_dim_ptr,"attr2", H5T_NATIVE_INT, data3);
+    write_attr(did2, 1, (hsize_t *) attr2_dim_ptr, "attr2", H5T_NATIVE_INT, data3);
 
     /* attr3 - non-compatible : different rank */
-    write_attr(did2, rank_attr,attr3_dim_ptr,"attr3", H5T_NATIVE_INT, attr_data_ptr3);
+    write_attr(did2, rank_attr, (hsize_t *) attr3_dim_ptr, "attr3", H5T_NATIVE_INT, attr_data_ptr3);
 
     /* attr4 - compatible : different data values */
-    write_attr(did2,1,dims1_1,"attr4", H5T_NATIVE_INT, attr_data_ptr4);
+    write_attr(did2, 1, dims1_1, "attr4", H5T_NATIVE_INT, attr_data_ptr4);
 
     /*----------
-     * dset2 */
-    status = write_dset(gid2, 1, dims1_1,"dset2", H5T_NATIVE_INT, dset_data_ptr3);
-    if (status == FAIL)
-    {
+    * dset2 */
+    status = write_dset(gid2, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
 
-
-
 out:
 
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
-    if(fid)
+    if (fid)
         H5Fclose(fid);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(did1)
+    if (did1)
         H5Dclose(did1);
-    if(did2)
+    if (did2)
         H5Dclose(did2);
-    if(sid1)
+    if (sid1)
         H5Sclose(sid1);
-    if(tid_dset1)
+    if (tid_dset1)
         H5Tclose(tid_dset1);
-    if(tid_attr1)
+    if (tid_attr1)
         H5Tclose(tid_attr1);
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_objs_nocomparables
-*
-* Purpose:
-*   Create test files with common objects (same name) but different object
-*   types.
-*   h5diff should show non-comparable output from these common objects.
-*-------------------------------------------------------------------------*/
+ * Function: test_objs_nocomparables
+ *
+ * Purpose:
+ *   Create test files with common objects (same name) but different object
+ *   types.
+ *   h5diff should show non-comparable output from these common objects.
+ *-------------------------------------------------------------------------*/
 static void test_objs_nocomparables(const char *fname1, const char *fname2)
 {
-    herr_t  status = SUCCEED;
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   topgid1=0;
-    hid_t   topgid2=0;
-    hid_t   gid1=0;
-    hid_t   did1=0;
-    hid_t   tid1=0;
-    hid_t   gid2=0;
-    hid_t   did2=0;
-    hid_t   tid2=0;
-    hsize_t dims[1] = {DIM_ARRY};
-    int data1[DIM_ARRY] = {1,1,1};
-    int data2[DIM_ARRY] = {2,2,2};
-
-   /*-----------------------------------------------------------------------
+    herr_t status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t topgid1 = -1;
+    hid_t topgid2 = -1;
+    hid_t gid1 = -1;
+    hid_t did1 = -1;
+    hid_t tid1 = -1;
+    hid_t gid2 = -1;
+    hid_t did2 = -1;
+    hid_t tid2 = -1;
+    hsize_t dims[1] = { DIM_ARRY };
+    int data1[DIM_ARRY] = { 1, 1, 1 };
+    int data2[DIM_ARRY] = { 2, 2, 2 };
+
+    /*-----------------------------------------------------------------------
     * Open file(s) to add objects
     *------------------------------------------------------------------------*/
     /* file1 */
-    fid1 = H5Fopen (fname1, H5F_ACC_RDWR, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    fid2 = H5Fopen (fname2, H5F_ACC_RDWR, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fopen(fname2, H5F_ACC_RDWR, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -5124,25 +4843,22 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* parent group */
     topgid1 = H5Gcreate2(fid1, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (topgid1 < 0)
-    {
+    if (topgid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* dataset */
-    status = write_dset(topgid1, 1, dims,"obj1", H5T_NATIVE_INT, data1);
-    if (status == FAIL)
-    {
+    status = write_dset(topgid1, 1, dims, "obj1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         goto out;
     }
 
     /* group */
     gid1 = H5Gcreate2(topgid1, "obj2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -5151,8 +4867,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* committed type */
     tid1 = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(topgid1, "obj3", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
         goto out;
     }
@@ -5162,8 +4877,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* parent group */
     topgid2 = H5Gcreate2(fid2, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (topgid2 < 0)
-    {
+    if (topgid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -5171,8 +4885,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
 
     /* group */
     gid2 = H5Gcreate2(topgid2, "obj1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -5181,16 +4894,14 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* committed type */
     tid2 = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(topgid2, "obj2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
         goto out;
     }
 
     /* dataset */
-    status = write_dset(topgid2, 1, dims,"obj3", H5T_NATIVE_INT, data2);
-    if (status == FAIL)
-    {
+    status = write_dset(topgid2, 1, dims, "obj3", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         goto out;
     }
@@ -5199,116 +4910,109 @@ out:
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(topgid1)
+    if (topgid1)
         H5Gclose(topgid1);
-    if(topgid2)
+    if (topgid2)
         H5Gclose(topgid2);
-    if(did1)
+    if (did1)
         H5Dclose(did1);
-    if(did2)
+    if (did2)
         H5Dclose(did2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(tid1)
+    if (tid1)
         H5Tclose(tid1);
-    if(tid2)
+    if (tid2)
         H5Tclose(tid2);
 
 }
 
-static hid_t mkstr(int size, H5T_str_t pad) {
+static hid_t mkstr(int size, H5T_str_t pad)
+{
     hid_t type;
 
-    if((type=H5Tcopy(H5T_C_S1)) < 0) return -1;
-    if(H5Tset_size(type, (size_t)size) < 0) return -1;
-    if(H5Tset_strpad(type, pad) < 0) return -1;
+    if ((type = H5Tcopy(H5T_C_S1)) < 0)
+        return -1;
+    if (H5Tset_size(type, (size_t) size) < 0)
+        return -1;
+    if (H5Tset_strpad(type, pad) < 0)
+        return -1;
 
     return type;
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_objs_strings
-*
-* Purpose:
-*   Create test files with common objects (same name) but different string
-*   types.
-*   h5diff should show differences output from these common objects.
-*-------------------------------------------------------------------------*/
+ * Function: test_objs_strings
+ *
+ * Purpose:
+ *   Create test files with common objects (same name) but different string
+ *   types.
+ *   h5diff should show differences output from these common objects.
+ *-------------------------------------------------------------------------*/
 static void test_objs_strings(const char *fname1, const char *fname2)
 {
-    herr_t  status = SUCCEED;
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   dataset=0;
-    hid_t   space=0;
-    hid_t   f_type=0;
-    hid_t   m_type=0;
-    hsize_t dims1[] = {3, 4};
-    char string1A[12][3] = {"s1","s2","s3","s4","s5","s6","s","s","s9",
-            "s0","s1","s2"};
-    char string1B[12][3] = {"s1","s2","s3","s4","s","s","s7","s8","s9",
-            "s0","s1","s2"};
-
-    hsize_t dims2[]={20};
-    char string2A[20][10] = {"ab cd ef1", "ab cd ef2", "ab cd ef3", "ab cd ef4",
-            "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
-            "ab cd 9", "ab cd 0", "ab cd 1", "ab cd 2",
-            "ab cd ef3", "ab cd ef4", "ab cd ef5", "ab cd ef6",
-            "ab cd ef7", "ab cd ef8", "ab cd ef9", "ab cd ef0"};
-    char string2B[20][10] = {"ab cd ef1", "ab cd ef2", "ab cd ef3", "ab cd ef4",
-            "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
-            "ab cd ef9", "ab cd ef0", "ab cd ef1", "ab cd ef2",
-            "ab cd 3", "ab cd 4", "ab cd 5", "ab cd 6",
-            "ab cd ef7", "ab cd ef8", "ab cd ef9", "ab cd ef0"};
-
-    hsize_t dims3[] = {27};
-    char string3A[27][6] = {"abcd0", "abcd1", "abcd2", "abcd3",
-            "abcd4", "abcd5", "abcd6", "abcd7",
-            "abcd8", "abcd9", "abcd0", "abcd1",
-            "abd2", "abc3", "bcd4", "acd5",
-            "abcd6", "abcd7", "abcd8", "abcd9",
-            "abcd0", "abcd1", "abcd2", "abcd3",
-            "abc4", "abc5", "abc6"};
-    char string3B[27][6] = {"abcd0", "abcd1", "abcd2", "abcd3",
-            "abcd4", "abcd5", "abcd6", "abcd7",
-            "abcd8", "abcd9", "abcd0", "abcd1",
-            "abcd2", "abcd3", "abcd4", "abcd5",
-            "abd6", "abc7", "bcd8", "acd9",
-            "abcd0", "abcd1", "abcd2", "abcd3",
-            "abd4", "abd5", "abd6"};
-
-    hsize_t dims4[] = {3};
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t dataset = -1;
+    hid_t space = -1;
+    hid_t f_type = -1;
+    hid_t m_type = -1;
+    hsize_t dims1[] = { 3, 4 };
+    char string1A[12][3] = { "s1", "s2", "s3", "s4", "s5", "s6", "s", "s", "s9",
+            "s0", "s1", "s2" };
+    char string1B[12][3] = { "s1", "s2", "s3", "s4", "s", "s", "s7", "s8", "s9",
+            "s0", "s1", "s2" };
+
+    hsize_t dims2[] = { 20 };
+    char string2A[20][10] = { "ab cd ef1", "ab cd ef2", "ab cd ef3",
+            "ab cd ef4", "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
+            "ab cd 9", "ab cd 0", "ab cd 1", "ab cd 2", "ab cd ef3",
+            "ab cd ef4", "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
+            "ab cd ef9", "ab cd ef0" };
+    char string2B[20][10] = { "ab cd ef1", "ab cd ef2", "ab cd ef3",
+            "ab cd ef4", "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
+            "ab cd ef9", "ab cd ef0", "ab cd ef1", "ab cd ef2", "ab cd 3",
+            "ab cd 4", "ab cd 5", "ab cd 6", "ab cd ef7", "ab cd ef8",
+            "ab cd ef9", "ab cd ef0" };
+
+    hsize_t dims3[] = { 27 };
+    char string3A[27][6] = { "abcd0", "abcd1", "abcd2", "abcd3", "abcd4",
+            "abcd5", "abcd6", "abcd7", "abcd8", "abcd9", "abcd0", "abcd1",
+            "abd2", "abc3", "bcd4", "acd5", "abcd6", "abcd7", "abcd8", "abcd9",
+            "abcd0", "abcd1", "abcd2", "abcd3", "abc4", "abc5", "abc6" };
+    char string3B[27][6] = { "abcd0", "abcd1", "abcd2", "abcd3", "abcd4",
+            "abcd5", "abcd6", "abcd7", "abcd8", "abcd9", "abcd0", "abcd1",
+            "abcd2", "abcd3", "abcd4", "abcd5", "abd6", "abc7", "bcd8", "acd9",
+            "abcd0", "abcd1", "abcd2", "abcd3", "abd4", "abd5", "abd6" };
+
+    hsize_t dims4[] = { 3 };
     char string4A[3][21] = { "s1234567890123456789", "s1234567890123456789",
-            "s12345678901234567"};
+            "s12345678901234567" };
     char string4B[3][21] = { "s1234567890123456789", "s12345678901234567",
-            "s1234567890123456789"};
+            "s1234567890123456789" };
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
-     /* file1 */
-     fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-     if (fid1 < 0)
-     {
-         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
-         status = FAIL;
-         goto out;
-     }
-
-     /* file2 */
-     fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-     if (fid2 < 0)
-     {
-         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
-         status = FAIL;
-         goto out;
-     }
+    * Create file(s)
+    *------------------------------------------------------------------------*/
+    /* file1 */
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        goto out;
+    }
+
+    /* file2 */
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        goto out;
+    }
 
     /* string 1 : nullterm string */
     space = H5Screate_simple(2, dims1, NULL);
@@ -5398,88 +5102,82 @@ out:
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
 }
 
 /*-------------------------------------------------------------------------
-* Function: write_attr_in
-*
-* Purpose: write attributes in LOC_ID (dataset, group, named datatype)
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_attr_strings
+ *
+ * Purpose: write attributes in LOC_ID (dataset, group, named datatype)
+ *          swap VL strings
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-void write_attr_in(hid_t loc_id,
-                   const char* dset_name, /* for saving reference to dataset*/
-                   hid_t fid,
-                   int make_diffs /* flag to modify data buffers */)
+void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs /* flag to modify data buffers */)
 {
     /* Compound datatype */
-    typedef struct s_t
-    {
-        char   a;
+    typedef struct s_t {
+        char a;
         double b;
     } s_t;
 
-    typedef enum
-    {
-        RED,
-        GREEN
+    typedef enum {
+        RED, GREEN
     } e_t;
 
-    hid_t   aid;
-    hid_t   sid;
-    hid_t   tid;
-    herr_t  status;
-    int     val, i, j, k, l, n;
-    float   f;
+    hid_t aid = -1;
+    hid_t sid = -1;
+    hid_t tid = -1;
+    herr_t status;
+    int val, i, j, k, l, n;
+    float f;
 
     /* create 1D attributes with dimension [2], 2 elements */
-    hsize_t    dims[1]={2};
-    char       buf1[2][STR_SIZE]= {"ab","de"};        /* string */
-    char       *buf1a[2];                             /* VL string */
-    char       buf2[2]= {1,2};                 /* bitfield, opaque */
-    s_t        buf3[2]= {{1,2.0F},{3,4.0F}};         /* compound */
-    hobj_ref_t buf4[2];                        /* reference */
-    e_t        buf45[2]= {RED,RED};            /* enum */
-    hvl_t      buf5[2];                        /* vlen */
-    hsize_t    dimarray[1]={3};                /* array dimension */
-    int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
-    int        buf7[2]= {1,2};                 /* integer */
-    float      buf8[2]= {1.0F, 2.0F};                 /* float */
+    hsize_t    dims[1] = { 2 };
+    char       buf1[2][STR_SIZE] = { "ab", "de" }; /* string */
+    char      *buf1a[2]; /* VL string */
+    char       buf2[2] = { 1, 2 }; /* bitfield, opaque */
+    s_t        buf3[2] = { { 1, 2.0F }, { 3, 4.0F } }; /* compound */
+    hobj_ref_t buf4[2]; /* reference */
+    e_t        buf45[2] = { RED, RED }; /* enum */
+    hvl_t      buf5[2]; /* vlen */
+    hsize_t    dimarray[1] = { 3 }; /* array dimension */
+    int        buf6[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } }; /* array */
+    int        buf7[2] = { 1, 2 }; /* integer */
+    float      buf8[2] = { 1.0F, 2.0F }; /* float */
 
     /* create 2D attributes with dimension [3][2], 6 elements */
-    hsize_t    dims2[2]={3,2};
-    char       buf12[3][2][STR_SIZE]= {{"ab","cd"},{"ef","gh"},{"ij","kl"}};            /* string */
-    char       *buf12a[3][2];                                                           /* VL string */
-    char       buf22[3][2]= {{1,2},{3,4},{5,6}};                                        /* bitfield, opaque */
-    s_t        buf32[6]= {{1,2.0F},{3,4.0F},{5,6.0F},{7,8.0F},{9,10.0F},{11,12.0F}};    /* compound */
-    hobj_ref_t buf42[3][2];                                                             /* reference */
-    e_t        buf452[3][2];                                                            /* enum */
-    hvl_t      buf52[3][2];                                                             /* vlen */
-    int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}}; /* array */
-    int        buf72[3][2]= {{1,2},{3,4},{5,6}};                                        /* integer */
-    float      buf82[3][2]= {{1.0F,2.0F},{3.0F,4.0F},{5.0F,6.0F}};                      /* float */
+    hsize_t    dims2[2] = { 3, 2 };
+    char       buf12[3][2][STR_SIZE] = { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } }; /* string */
+    char      *buf12a[3][2]; /* VL string */
+    char       buf22[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* bitfield, opaque */
+    s_t        buf32[6] = { { 1, 2.0F }, { 3, 4.0F }, { 5, 6.0F }, { 7, 8.0F }, { 9, 10.0F }, { 11, 12.0F } }; /* compound */
+    hobj_ref_t buf42[3][2]; /* reference */
+    e_t        buf452[3][2]; /* enum */
+    hvl_t      buf52[3][2]; /* vlen */
+    int        buf62[6][3] = { { 1, 2, 3 }, { 4, 5, 6 }, { 7, 8, 9 }, { 10, 11, 12 }, { 13, 14, 15 }, { 16, 17, 18 } }; /* array */
+    int        buf72[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* integer */
+    float      buf82[3][2] = { { 1.0F, 2.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } }; /* float */
 
     /* create 3D attributes with dimension [4][3][2], 24 elements */
-    hsize_t    dims3[3]={4,3,2};
-    char       buf13[4][3][2][STR_SIZE]= {{{"ab","cd"},{"ef","gh"},{"ij","kl"}},
-    {{"mn","pq"},{"rs","tu"},{"vw","xz"}},
-    {{"AB","CD"},{"EF","GH"},{"IJ","KL"}},
-    {{"MN","PQ"},{"RS","TU"},{"VW","XZ"}}};  /* string */
-    char       *buf13a[4][3][2];   /* VL string */
-    char       buf23[4][3][2];    /* bitfield, opaque */
-    s_t        buf33[4][3][2];    /* compound */
-    hobj_ref_t buf43[4][3][2];    /* reference */
-    e_t        buf453[4][3][2];   /* enum */
-    hvl_t      buf53[4][3][2];    /* vlen */
-    int        buf63[24][3];      /* array */
-    int        buf73[4][3][2];    /* integer */
-    float      buf83[4][3][2];    /* float */
-
+    hsize_t dims3[3] = { 4, 3, 2 };
+    char buf13[4][3][2][STR_SIZE] = { { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } },
+                                    { { "mn", "pq" }, { "rs", "tu" }, { "vw", "xz" } },
+                                    { { "AB", "CD" }, { "EF", "GH" }, { "IJ", "KL" } },
+                                    { { "MN", "PQ" }, { "RS", "TU" }, { "VW", "XZ" } } }; /* string */
+    char      *buf13a[4][3][2]; /* VL string */
+    char       buf23[4][3][2]; /* bitfield, opaque */
+    s_t        buf33[4][3][2]; /* compound */
+    hobj_ref_t buf43[4][3][2]; /* reference */
+    e_t        buf453[4][3][2]; /* enum */
+    hvl_t      buf53[4][3][2]; /* vlen */
+    int        buf63[24][3]; /* array */
+    int        buf73[4][3][2]; /* integer */
+    float      buf83[4][3][2]; /* float */
 
     /*-------------------------------------------------------------------------
     * 1D attributes
@@ -5492,15 +5190,10 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            for (j=0; j<2; j++)
-            {
-                buf1[i][j]='z';
-            }
-        }
-    }
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
+
     /*
     buf1[2][2]= {"ab","de"};
     $h5diff file7.h5 file6.h5 g1 g1 -v
@@ -5513,16 +5206,17 @@ void write_attr_in(hid_t loc_id,
     [ 1 ]          d                z
     [ 1 ]          e                z
     */
+    for (i = 0; i < 2; i++)
+        buf1a[i] = buf1[i];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, (size_t)STR_SIZE);
-    write_attr(loc_id,1,dims,"string",tid,buf1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 1, dims, "string", tid, buf1a);
     status = H5Tclose(tid);
 
-    for (i=0; i<2; i++)
-        buf1a[i]=buf1[i];
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_attr(loc_id,1,dims,"VLstring",tid,buf1a);
+    status = H5Tset_size(tid, (size_t)STR_SIZE);
+    write_attr(loc_id, 1, dims, "VLstring", tid, buf1);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5531,10 +5225,8 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            buf2[i]=buf2[1]=0;
-    }
+        for (i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
     /*
     buf2[2]= {1,2};
     $h5diff file7.h5 file6.h5 g1 g1 -v
@@ -5548,7 +5240,7 @@ void write_attr_in(hid_t loc_id,
     */
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_attr(loc_id,1,dims,"bitfield",tid,buf2);
+    write_attr(loc_id, 1, dims, "bitfield", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5568,9 +5260,9 @@ void write_attr_in(hid_t loc_id,
     [ 1 ]          2               0               2
     */
 
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_attr(loc_id,1,dims,"opaque",tid,buf2);
+    write_attr(loc_id, 1, dims, "opaque", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5579,12 +5271,10 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf3[i].a=0; buf3[i].b=0;
+        for (i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
         }
-    }
 
     /*
     buf3[2]= {{1,2},{3,4}};
@@ -5599,10 +5289,10 @@ void write_attr_in(hid_t loc_id,
     [ 1 ]          4               5               1
     */
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_attr(loc_id,1,dims,"compound",tid,buf3);
+    write_attr(loc_id, 1, dims, "compound", tid, buf3);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5610,38 +5300,1021 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        status=H5Rcreate(&buf4[0],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        status=H5Rcreate(&buf4[1],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        write_attr(loc_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4);
+    if (dset_name) {
+        status = H5Rcreate(&buf4[0], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        status = H5Rcreate(&buf4[1], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 1, dims, "reference", H5T_STD_REF_OBJ, buf4);
     }
 
     /*-------------------------------------------------------------------------
-    * H5T_ENUM
+     * H5T_ENUM
+     *-------------------------------------------------------------------------
+     */
+    if (make_diffs)
+        for (i = 0; i < 2; i++)
+            buf45[i] = GREEN;
+    /*
+        buf45[2]= {RED,RED};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <enum> and <enum>
+        position     enum of </g1>   enum of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          RED              GREEN
+        [ 1 ]          RED              GREEN
+     */
+    tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
+    H5Tenum_insert(tid, "GREEN", (val = 1, &val));
+    write_attr(loc_id, 1, dims, "enum", tid, buf45);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_VLEN
+     *-------------------------------------------------------------------------
+     */
+
+    /* Allocate and initialize VL dataset to write */
+
+    buf5[0].len = 1;
+    buf5[0].p = HDmalloc(1 * sizeof(int));
+    ((int *) buf5[0].p)[0] = 1;
+    buf5[1].len = 2;
+    buf5[1].p = HDmalloc(2 * sizeof(int));
+    ((int *) buf5[1].p)[0] = 2;
+    ((int *) buf5[1].p)[1] = 3;
+
+    if (make_diffs) {
+        ((int *) buf5[0].p)[0] = 0;
+        ((int *) buf5[1].p)[0] = 0;
+        ((int *) buf5[1].p)[1] = 0;
+    }
+    /*
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        vlen of </g1>   vlen of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        [ 1 ]          3               0               3
+     */
+
+    sid = H5Screate_simple(1, dims, NULL);
+    tid = H5Tvlen_create(H5T_NATIVE_INT);
+    aid = H5Acreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite(aid, tid, buf5);
+    assert(status >= 0);
+    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
+    assert(status >= 0);
+    status = H5Aclose(aid);
+    status = H5Tclose(tid);
+    status = H5Sclose(sid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_ARRAY
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 3; j++)
+                buf6[i][j] = 0;
+    /*
+        buf6[2][3]= {{1,2,3},{4,5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array> and <array>
+        position        array of </g1>  array of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 0 ]          2               0               2
+        [ 0 ]          3               0               3
+        [ 1 ]          4               0               4
+        [ 1 ]          5               0               5
+        [ 1 ]          6               0               6
+     */
+    tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
+    write_attr(loc_id, 1, dims, "array", tid, buf6);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_INTEGER and H5T_FLOAT
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
+        }
+    /*
+        buf7[2]= {1,2};
+        buf8[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        integer of </g1> integer of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        position        float of </g1>  float of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+     */
+    write_attr(loc_id, 1, dims, "integer", H5T_NATIVE_INT, buf7);
+    write_attr(loc_id, 1, dims, "float", H5T_NATIVE_FLOAT, buf8);
+
+    /*-------------------------------------------------------------------------
+     * 2D attributes
+     *-------------------------------------------------------------------------
+     */
+
+    /*-------------------------------------------------------------------------
+     * H5T_STRING
+     *-------------------------------------------------------------------------
+     */
+    if (make_diffs)
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                for (k = 0; k < 2; k++)
+                    buf12[i][j][k] = 'z';
+
+    /*
+        buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <string2D> and <string2D>
+        position        string2D of </g1> string2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          a                z
+        [ 0 0 ]          b                z
+        [ 0 1 ]          c                z
+        [ 0 1 ]          d                z
+        [ 1 0 ]          e                z
+        [ 1 0 ]          f                z
+        [ 1 1 ]          g                z
+        [ 1 1 ]          h                z
+        [ 2 0 ]          i                z
+        [ 2 0 ]          j                z
+        [ 2 1 ]          k                z
+        [ 2 1 ]          l                z
+     */
+
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            buf12a[i][j] = buf12[i][j];
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 2, dims2, "string2D", tid, buf12a);
+    status = H5Tclose(tid);
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 2, dims2, "VLstring2D", tid, buf12);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_BITFIELD
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        memset(buf22, 0, sizeof buf22);
+    /*
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <bitfield2D> and <bitfield2D>
+        position        bitfield2D of </g1> bitfield2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+
+    tid = H5Tcopy(H5T_STD_B8LE);
+    write_attr(loc_id, 2, dims2, "bitfield2D", tid, buf22);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_OPAQUE
+     *-------------------------------------------------------------------------
+     */
+
+    /*
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
+    status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
+    write_attr(loc_id, 2, dims2, "opaque2D", tid, buf22);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_COMPOUND
+     *-------------------------------------------------------------------------
+     */
+    if (make_diffs)
+        memset(buf32, 0, sizeof buf32);
+
+    /*
+        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
+    H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+    H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+    write_attr(loc_id, 2, dims2, "compound2D", tid, buf32);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_REFERENCE (H5R_OBJECT object reference)
+     *-------------------------------------------------------------------------
+     */
+    /* Create references to dataset */
+    if (dset_name) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                status = H5Rcreate(&buf42[i][j], fid, dset_name, H5R_OBJECT,
+                        (hid_t) -1);
+        write_attr(loc_id, 2, dims2, "reference2D", H5T_STD_REF_OBJ, buf42);
+    }
+
+    /*-------------------------------------------------------------------------
+     * H5T_ENUM
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            if (make_diffs)
+                buf452[i][j] = GREEN;
+            else
+                buf452[i][j] = RED;
+
+    /*
+        Attribute:   <enum2D> and <enum2D>
+        position        enum2D of </g1> enum2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          RED              GREEN
+        [ 0 1 ]          RED              GREEN
+        [ 1 0 ]          RED              GREEN
+        [ 1 1 ]          RED              GREEN
+        [ 2 0 ]          RED              GREEN
+        [ 2 1 ]          RED              GREEN
+     */
+
+    tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
+    H5Tenum_insert(tid, "GREEN", (val = 1, &val));
+    write_attr(loc_id, 2, dims2, "enum2D", tid, buf452);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_VLEN
+     *-------------------------------------------------------------------------
+     */
+
+    /* Allocate and initialize VL dataset to write */
+    n = 0;
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 2; j++) {
+            buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+            buf52[i][j].len = (size_t)(i + 1);
+            for (l = 0; l < i + 1; l++)
+                if (make_diffs)
+                    ((int *) buf52[i][j].p)[l] = 0;
+                else
+                    ((int *) buf52[i][j].p)[l] = n++;
+        }
+    }
+
+    /*
+        position        vlen2D of </g1> vlen2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 1 ]          1               0               1
+        [ 1 0 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 1 1 ]          5               0               5
+        [ 2 0 ]          6               0               6
+        [ 2 0 ]          7               0               7
+        [ 2 0 ]          8               0               8
+        [ 2 1 ]          9               0               9
+        [ 2 1 ]          10              0               10
+        [ 2 1 ]          11              0               11
+     */
+
+    sid = H5Screate_simple(2, dims2, NULL);
+    tid = H5Tvlen_create(H5T_NATIVE_INT);
+    aid = H5Acreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite(aid, tid, buf52);
+    assert(status >= 0);
+    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52);
+    assert(status >= 0);
+    status = H5Aclose(aid);
+    status = H5Tclose(tid);
+    status = H5Sclose(sid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_ARRAY
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        memset(buf62, 0, sizeof buf62);
+    /*
+        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array2D> and <array2D>
+        position        array2D of </g1> array2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 0 ]          2               0               2
+        [ 0 0 ]          3               0               3
+        [ 0 1 ]          4               0               4
+        [ 0 1 ]          5               0               5
+        [ 0 1 ]          6               0               6
+        [ 1 0 ]          7               0               7
+        [ 1 0 ]          8               0               8
+        [ 1 0 ]          9               0               9
+        [ 1 1 ]          10              0               10
+        [ 1 1 ]          11              0               11
+        [ 1 1 ]          12              0               12
+        [ 2 0 ]          13              0               13
+        [ 2 0 ]          14              0               14
+        [ 2 0 ]          15              0               15
+        [ 2 1 ]          16              0               16
+        [ 2 1 ]          17              0               17
+        [ 2 1 ]          18              0               18
+     */
+    tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
+    write_attr(loc_id, 2, dims2, "array2D", tid, buf62);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_INTEGER and H5T_FLOAT
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs) {
+        memset(buf72, 0, sizeof buf72);
+        memset(buf82, 0, sizeof buf82);
+    }
+    /*
+        Attribute:   <integer2D> and <integer2D>
+        position        integer2D of </g1> integer2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+        6 differences found
+        Attribute:   <float2D> and <float2D>
+        position        float2D of </g1> float2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+
+    write_attr(loc_id, 2, dims2, "integer2D", H5T_NATIVE_INT, buf72);
+    write_attr(loc_id, 2, dims2, "float2D", H5T_NATIVE_FLOAT, buf82);
+
+    /*-------------------------------------------------------------------------
+     * 3D attributes
+     *-------------------------------------------------------------------------
+     */
+
+    /*-------------------------------------------------------------------------
+     * H5T_STRING
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    for (l = 0; l < 2; l++)
+                        buf13[i][j][k][l] = 'z';
+
+    /*
+        buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+        "rs","tu","vw","xz","AB","CD","EF","GH",
+        "IJ","KL","MN","PQ","RS","TU","VW","XZ"};
+
+        Attribute:   <string3D> and <string3D>
+        position        string3D of </g1> string3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          a                z
+        [ 0 0 0 ]          b                z
+        [ 0 0 1 ]          c                z
+        [ 0 0 1 ]          d                z
+        [ 0 1 0 ]          e                z
+        [ 0 1 0 ]          f                z
+        [ 0 1 1 ]          g                z
+        [ 0 1 1 ]          h                z
+        [ 0 2 0 ]          i                z
+        [ 0 2 0 ]          j                z
+        [ 0 2 1 ]          k                z
+        [ 0 2 1 ]          l                z
+        [ 1 0 0 ]          m                z
+        [ 1 0 0 ]          n                z
+        [ 1 0 1 ]          p                z
+        [ 1 0 1 ]          q                z
+        [ 1 1 0 ]          r                z
+        [ 1 1 0 ]          s                z
+        [ 1 1 1 ]          t                z
+        [ 1 1 1 ]          u                z
+        [ 1 2 0 ]          v                z
+        [ 1 2 0 ]          w                z
+        [ 1 2 1 ]          x                z
+        [ 2 0 0 ]          A                z
+        [ 2 0 0 ]          B                z
+        [ 2 0 1 ]          C                z
+        [ 2 0 1 ]          D                z
+        [ 2 1 0 ]          E                z
+        [ 2 1 0 ]          F                z
+        [ 2 1 1 ]          G                z
+        [ 2 1 1 ]          H                z
+        [ 2 2 0 ]          I                z
+        [ 2 2 0 ]          J                z
+        [ 2 2 1 ]          K                z
+        [ 2 2 1 ]          L                z
+        [ 3 0 0 ]          M                z
+        [ 3 0 0 ]          N                z
+        [ 3 0 1 ]          P                z
+        [ 3 0 1 ]          Q                z
+        [ 3 1 0 ]          R                z
+        [ 3 1 0 ]          S                z
+        [ 3 1 1 ]          T                z
+        [ 3 1 1 ]          U                z
+        [ 3 2 0 ]          V                z
+        [ 3 2 0 ]          W                z
+        [ 3 2 1 ]          X                z
+        [ 3 2 1 ]          Z                z
+     */
+
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                buf13a[i][j][k] = buf13[i][j][k];
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 3, dims3, "string3D", tid, buf13a);
+    status = H5Tclose(tid);
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 3, dims3, "VLstring3D", tid, buf13);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_BITFIELD
+     *-------------------------------------------------------------------------
+     */
+
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                if (make_diffs)
+                    buf23[i][j][k] = 0;
+                else
+                    buf23[i][j][k] = (char) n++;
+
+    /*
+        position        bitfield3D of </g1> bitfield3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        [ 1 2 0 ]          11              0               11
+        [ 1 2 1 ]          12              0               12
+        [ 2 0 0 ]          13              0               13
+        [ 2 0 1 ]          14              0               14
+        [ 2 1 0 ]          15              0               15
+        [ 2 1 1 ]          16              0               16
+        [ 2 2 0 ]          17              0               17
+        [ 2 2 1 ]          18              0               18
+        [ 3 0 0 ]          19              0               19
+        [ 3 0 1 ]          20              0               20
+        [ 3 1 0 ]          21              0               21
+        [ 3 1 1 ]          22              0               22
+        [ 3 2 0 ]          23              0               23
+        [ 3 2 1 ]          24              0               24
+     */
+
+    tid = H5Tcopy(H5T_STD_B8LE);
+    write_attr(loc_id, 3, dims3, "bitfield3D", tid, buf23);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_OPAQUE
+     *-------------------------------------------------------------------------
+     */
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
+    status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
+    write_attr(loc_id, 3, dims3, "opaque3D", tid, buf23);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_COMPOUND
+     *-------------------------------------------------------------------------
+     */
+
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                if (make_diffs) {
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0.0F;
+                } else {
+                    buf33[i][j][k].a = (char) n++;
+                    buf33[i][j][k].b = n++;
+                }
+    /*position        compound3D of </g1> compound3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 1 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 1 0 ]          5               0               5
+        [ 0 1 0 ]          6               0               6
+        [ 0 1 1 ]          7               0               7
+        [ 0 1 1 ]          8               0               8
+        [ 0 2 0 ]          9               0               9
+        [ 0 2 0 ]          10              0               10
+        [ 0 2 1 ]          11              0               11
+        [ 0 2 1 ]          12              0               12
+        [ 1 0 0 ]          13              0               13
+        [ 1 0 0 ]          14              0               14
+        [ 1 0 1 ]          15              0               15
+        [ 1 0 1 ]          16              0               16
+        [ 1 1 0 ]          17              0               17
+        [ 1 1 0 ]          18              0               18
+        [ 1 1 1 ]          19              0               19
+        [ 1 1 1 ]          20              0               20
+        [ 1 2 0 ]          21              0               21
+        [ 1 2 0 ]          22              0               22
+        [ 1 2 1 ]          23              0               23
+        [ 1 2 1 ]          24              0               24
+        [ 2 0 0 ]          25              0               25
+        [ 2 0 0 ]          26              0               26
+        [ 2 0 1 ]          27              0               27
+        [ 2 0 1 ]          28              0               28
+        [ 2 1 0 ]          29              0               29
+        [ 2 1 0 ]          30              0               30
+        [ 2 1 1 ]          31              0               31
+        [ 2 1 1 ]          32              0               32
+        [ 2 2 0 ]          33              0               33
+        [ 2 2 0 ]          34              0               34
+        [ 2 2 1 ]          35              0               35
+        [ 2 2 1 ]          36              0               36
+        [ 3 0 0 ]          37              0               37
+        [ 3 0 0 ]          38              0               38
+        [ 3 0 1 ]          39              0               39
+        [ 3 0 1 ]          40              0               40
+        [ 3 1 0 ]          41              0               41
+        [ 3 1 0 ]          42              0               42
+        [ 3 1 1 ]          43              0               43
+        [ 3 1 1 ]          44              0               44
+        [ 3 2 0 ]          45              0               45
+        [ 3 2 0 ]          46              0               46
+        [ 3 2 1 ]          47              0               47
+        [ 3 2 1 ]          48              0               48
+     */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
+    H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+    H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+    write_attr(loc_id, 3, dims3, "compound3D", tid, buf33);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_REFERENCE (H5R_OBJECT object reference)
+     *-------------------------------------------------------------------------
+     */
+    /* Create references to dataset */
+    if (dset_name) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    status = H5Rcreate(&buf43[i][j][k], fid, dset_name,
+                            H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 3, dims3, "reference3D", H5T_STD_REF_OBJ, buf43);
+    }
+
+    /*-------------------------------------------------------------------------
+     * H5T_ENUM
+     *-------------------------------------------------------------------------
+     */
+
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                if (make_diffs)
+                    buf453[i][j][k] = RED;
+                else
+                    buf453[i][j][k] = GREEN;
+
+    /*
+        position        enum3D of </g1> enum3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          GREEN            RED
+        [ 0 0 1 ]          GREEN            RED
+        [ 0 1 0 ]          GREEN            RED
+        [ 0 1 1 ]          GREEN            RED
+        [ 0 2 0 ]          GREEN            RED
+        [ 0 2 1 ]          GREEN            RED
+        [ 1 0 0 ]          GREEN            RED
+        [ 1 0 1 ]          GREEN            RED
+        [ 1 1 0 ]          GREEN            RED
+        [ 1 1 1 ]          GREEN            RED
+        [ 1 2 0 ]          GREEN            RED
+        [ 1 2 1 ]          GREEN            RED
+        [ 2 0 0 ]          GREEN            RED
+        [ 2 0 1 ]          GREEN            RED
+        [ 2 1 0 ]          GREEN            RED
+        [ 2 1 1 ]          GREEN            RED
+        [ 2 2 0 ]          GREEN            RED
+        [ 2 2 1 ]          GREEN            RED
+        [ 3 0 0 ]          GREEN            RED
+        [ 3 0 1 ]          GREEN            RED
+        [ 3 1 0 ]          GREEN            RED
+        [ 3 1 1 ]          GREEN            RED
+        [ 3 2 0 ]          GREEN            RED
+        [ 3 2 1 ]          GREEN            RED
+     */
+
+    tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
+    H5Tenum_insert(tid, "GREEN", (val = 1, &val));
+    write_attr(loc_id, 3, dims3, "enum3D", tid, buf453);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_VLEN
+     *-------------------------------------------------------------------------
+     */
+
+    /* Allocate and initialize VL dataset to write */
+    n = 0;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++) {
+                buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+                buf53[i][j][k].len = (size_t)(i + 1);
+                for (l = 0; l < i + 1; l++)
+                    if (make_diffs)
+                        ((int *) buf53[i][j][k].p)[l] = 0;
+                    else
+                        ((int *) buf53[i][j][k].p)[l] = n++;
+            }
+    /*
+        position        vlen3D of </g1> vlen3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 1 ]          1               0               1
+        [ 0 1 0 ]          2               0               2
+        [ 0 1 1 ]          3               0               3
+        [ 0 2 0 ]          4               0               4
+        [ 0 2 1 ]          5               0               5
+        [ 1 0 0 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 0 1 ]          9               0               9
+        [ 1 1 0 ]          10              0               10
+        etc
+     */
+    sid = H5Screate_simple(3, dims3, NULL);
+    tid = H5Tvlen_create(H5T_NATIVE_INT);
+    aid = H5Acreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite(aid, tid, buf53);
+    assert(status >= 0);
+    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53);
+    assert(status >= 0);
+    status = H5Aclose(aid);
+    status = H5Tclose(tid);
+    status = H5Sclose(sid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_ARRAY
+     *-------------------------------------------------------------------------
+     */
+    n = 1;
+    for (i = 0; i < 24; i++) {
+        for (j = 0; j < (int) dimarray[0]; j++) {
+            if (make_diffs)
+                buf63[i][j] = 0;
+            else
+                buf63[i][j] = n++;
+        }
+    }
+    /*
+        position        array3D of </g1> array3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 0 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 0 1 ]          5               0               5
+        [ 0 0 1 ]          6               0               6
+        [ 0 1 0 ]          7               0               7
+        etc
+     */
+
+    tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
+    write_attr(loc_id, 3, dims3, "array3D", tid, buf63);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_INTEGER and H5T_FLOAT
+     *-------------------------------------------------------------------------
+     */
+    n = 1;
+    f = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++) {
+                if (make_diffs) {
+                    buf73[i][j][k] = 0;
+                    buf83[i][j][k] = 0.0F;
+                }
+                else {
+                    buf73[i][j][k] = n++;
+                    buf83[i][j][k] = f++;
+                }
+            }
+
+    /*
+        position        integer3D of </g1> integer3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        etc
+     */
+    write_attr(loc_id, 3, dims3, "integer3D", H5T_NATIVE_INT, buf73);
+    write_attr(loc_id, 3, dims3, "float3D", H5T_NATIVE_FLOAT, buf83);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: write_attr_in
+ *
+ * Purpose: write attributes in LOC_ID (dataset, group, named datatype)
+ *
+ *-------------------------------------------------------------------------
+ */
+static
+void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs /* flag to modify data buffers */)
+{
+    /* Compound datatype */
+    typedef struct s_t {
+        char a;
+        double b;
+    } s_t;
+
+    typedef enum {
+        RED, GREEN
+    } e_t;
+
+    hid_t aid = -1;
+    hid_t sid = -1;
+    hid_t tid = -1;
+    herr_t status;
+    int val, i, j, k, l, n;
+    float f;
+
+    /* create 1D attributes with dimension [2], 2 elements */
+    hsize_t    dims[1] = { 2 };
+    char       buf1[2][STR_SIZE] = { "ab", "de" }; /* string */
+    char      *buf1a[2]; /* VL string */
+    char       buf2[2] = { 1, 2 }; /* bitfield, opaque */
+    s_t        buf3[2] = { { 1, 2.0F }, { 3, 4.0F } }; /* compound */
+    hobj_ref_t buf4[2]; /* reference */
+    e_t        buf45[2] = { RED, RED }; /* enum */
+    hvl_t      buf5[2]; /* vlen */
+    hsize_t    dimarray[1] = { 3 }; /* array dimension */
+    int        buf6[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } }; /* array */
+    int        buf7[2] = { 1, 2 }; /* integer */
+    float      buf8[2] = { 1.0F, 2.0F }; /* float */
+
+    /* create 2D attributes with dimension [3][2], 6 elements */
+    hsize_t    dims2[2] = { 3, 2 };
+    char       buf12[3][2][STR_SIZE] = { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } }; /* string */
+    char      *buf12a[3][2]; /* VL string */
+    char       buf22[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* bitfield, opaque */
+    s_t        buf32[6] = { { 1, 2.0F }, { 3, 4.0F }, { 5, 6.0F }, { 7, 8.0F }, { 9, 10.0F }, { 11, 12.0F } }; /* compound */
+    hobj_ref_t buf42[3][2]; /* reference */
+    e_t        buf452[3][2]; /* enum */
+    hvl_t      buf52[3][2]; /* vlen */
+    int        buf62[6][3] = { { 1, 2, 3 }, { 4, 5, 6 }, { 7, 8, 9 }, { 10, 11, 12 }, { 13, 14, 15 }, { 16, 17, 18 } }; /* array */
+    int        buf72[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* integer */
+    float      buf82[3][2] = { { 1.0F, 2.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } }; /* float */
+
+    /* create 3D attributes with dimension [4][3][2], 24 elements */
+    hsize_t dims3[3] = { 4, 3, 2 };
+    char buf13[4][3][2][STR_SIZE] = { { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } },
+                                      { { "mn", "pq" }, { "rs", "tu" }, { "vw", "xz" } },
+                                      { { "AB", "CD" }, { "EF", "GH" }, { "IJ", "KL" } },
+                                      { { "MN", "PQ" }, { "RS", "TU" }, { "VW", "XZ" } } }; /* string */
+    char      *buf13a[4][3][2]; /* VL string */
+    char       buf23[4][3][2]; /* bitfield, opaque */
+    s_t        buf33[4][3][2]; /* compound */
+    hobj_ref_t buf43[4][3][2]; /* reference */
+    e_t        buf453[4][3][2]; /* enum */
+    hvl_t      buf53[4][3][2]; /* vlen */
+    int        buf63[24][3]; /* array */
+    int        buf73[4][3][2]; /* integer */
+    float      buf83[4][3][2]; /* float */
+
+    /*-------------------------------------------------------------------------
+    * 1D attributes
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
     *-------------------------------------------------------------------------
     */
+
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf45[i]=GREEN;
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
+    /*
+        buf1[2][2]= {"ab","de"};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <string> and <string>
+        position      string of </g1>  string of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          a                z
+        [ 0 ]          b                z
+        [ 1 ]          d                z
+        [ 1 ]          e                z
+    */
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 1, dims, "string", tid, buf1);
+    status = H5Tclose(tid);
+
+    for (i = 0; i < 2; i++)
+        buf1a[i] = buf1[i];
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 1, dims, "VLstring", tid, buf1a);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
+    /*
+        buf2[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <bitfield> and <bitfield>
+        position      bitfield of </g1> bitfield of </g1> difference
+        position        opaque of </g1> opaque of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+    */
+
+    tid = H5Tcopy(H5T_STD_B8LE);
+    write_attr(loc_id, 1, dims, "bitfield", tid, buf2);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+
+    /*
+        buf2[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <opaque> and <opaque>
+        position     opaque of </g1> opaque of </g1> difference
+        position        opaque of </g1> opaque of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+    */
+
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
+    status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
+    write_attr(loc_id, 1, dims, "opaque", tid, buf2);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
         }
+    /*
+        buf3[2]= {{1,2},{3,4}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <compound> and <compound>
+        position        compound of </g1> compound of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               5               4
+        [ 0 ]          2               5               3
+        [ 1 ]          3               5               2
+        [ 1 ]          4               5               1
+    */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
+    H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+    H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+    write_attr(loc_id, 1, dims, "compound", tid, buf3);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE (H5R_OBJECT object reference)
+    *-------------------------------------------------------------------------
+    */
+    /* Create references to dataset */
+    if (dset_name) {
+        status = H5Rcreate(&buf4[0], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        status = H5Rcreate(&buf4[1], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 1, dims, "reference", H5T_STD_REF_OBJ, buf4);
     }
+
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
+    if (make_diffs)
+        for (i = 0; i < 2; i++)
+            buf45[i] = GREEN;
     /*
-    buf45[2]= {RED,RED};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    Attribute:   <enum> and <enum>
-    position     enum of </g1>   enum of </g1>   difference
-    ------------------------------------------------------------
-    [ 0 ]          RED              GREEN
-    [ 1 ]          RED              GREEN
+        buf45[2]= {RED,RED};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <enum> and <enum>
+        position     enum of </g1>   enum of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          RED              GREEN
+        [ 1 ]          RED              GREEN
     */
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_attr(loc_id,1,dims,"enum",tid,buf45);
+    write_attr(loc_id, 1, dims, "enum", tid, buf45);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5652,27 +6325,26 @@ void write_attr_in(hid_t loc_id,
     /* Allocate and initialize VL dataset to write */
 
     buf5[0].len = 1;
-    buf5[0].p = HDmalloc( 1 * sizeof(int));
-    ((int *)buf5[0].p)[0]=1;
+    buf5[0].p = HDmalloc(1 * sizeof(int));
+    ((int *) buf5[0].p)[0] = 1;
     buf5[1].len = 2;
-    buf5[1].p = HDmalloc( 2 * sizeof(int));
-    ((int *)buf5[1].p)[0]=2;
-    ((int *)buf5[1].p)[1]=3;
+    buf5[1].p = HDmalloc(2 * sizeof(int));
+    ((int *) buf5[1].p)[0] = 2;
+    ((int *) buf5[1].p)[1] = 3;
 
-    if (make_diffs)
-    {
-        ((int *)buf5[0].p)[0]=0;
-        ((int *)buf5[1].p)[0]=0;
-        ((int *)buf5[1].p)[1]=0;
+    if (make_diffs) {
+        ((int *) buf5[0].p)[0] = 0;
+        ((int *) buf5[1].p)[0] = 0;
+        ((int *) buf5[1].p)[1] = 0;
     }
     /*
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    position        vlen of </g1>   vlen of </g1>   difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 1 ]          2               0               2
-    [ 1 ]          3               0               3
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        vlen of </g1>   vlen of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        [ 1 ]          3               0               3
     */
 
     sid = H5Screate_simple(1, dims, NULL);
@@ -5691,27 +6363,24 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<3; j++)
-            {
-                buf6[i][j]=0;
-            }
+    if (make_diffs) {
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 3; j++)
+                buf6[i][j] = 0;
     }
     /*
-    buf6[2][3]= {{1,2,3},{4,5,6}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    Attribute:   <array> and <array>
-    position        array of </g1>  array of </g1>  difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 0 ]          2               0               2
-    [ 0 ]          3               0               3
-    [ 1 ]          4               0               4
-    [ 1 ]          5               0               5
-    [ 1 ]          6               0               6
+        buf6[2][3]= {{1,2,3},{4,5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array> and <array>
+        position        array of </g1>  array of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 0 ]          2               0               2
+        [ 0 ]          3               0               3
+        [ 1 ]          4               0               4
+        [ 1 ]          5               0               5
+        [ 1 ]          6               0               6
     */
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_attr(loc_id, 1, dims, "array", tid, buf6);
@@ -5722,31 +6391,28 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf7[i]=0;
-            buf8[i]=0;
+    if (make_diffs) {
+        for (i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
         }
     }
     /*
-    buf7[2]= {1,2};
-    buf8[2]= {1,2};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    position        integer of </g1> integer of </g1> difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 1 ]          2               0               2
-    position        float of </g1>  float of </g1>  difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 1 ]          2               0               2
-    */
-    write_attr(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7);
-    write_attr(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8);
-
+        buf7[2]= {1,2};
+        buf8[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        integer of </g1> integer of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        position        float of </g1>  float of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+    */
+    write_attr(loc_id, 1, dims, "integer", H5T_NATIVE_INT, buf7);
+    write_attr(loc_id, 1, dims, "float", H5T_NATIVE_FLOAT, buf8);
 
     /*-------------------------------------------------------------------------
     * 2D attributes
@@ -5757,50 +6423,45 @@ void write_attr_in(hid_t loc_id,
     * H5T_STRING
     *-------------------------------------------------------------------------
     */
-    if (make_diffs)
-    {
-        for (i=0; i<3; i++)
-            for (j=0; j<2; j++)
-                for (k=0; k<2; k++)
-                    buf12[i][j][k]='z';
+    if (make_diffs) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                for (k = 0; k < 2; k++)
+                    buf12[i][j][k] = 'z';
     }
 
     /*
-    buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <string2D> and <string2D>
-    position        string2D of </g1> string2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          a                z
-    [ 0 0 ]          b                z
-    [ 0 1 ]          c                z
-    [ 0 1 ]          d                z
-    [ 1 0 ]          e                z
-    [ 1 0 ]          f                z
-    [ 1 1 ]          g                z
-    [ 1 1 ]          h                z
-    [ 2 0 ]          i                z
-    [ 2 0 ]          j                z
-    [ 2 1 ]          k                z
-    [ 2 1 ]          l                z
+        buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <string2D> and <string2D>
+        position        string2D of </g1> string2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          a                z
+        [ 0 0 ]          b                z
+        [ 0 1 ]          c                z
+        [ 0 1 ]          d                z
+        [ 1 0 ]          e                z
+        [ 1 0 ]          f                z
+        [ 1 1 ]          g                z
+        [ 1 1 ]          h                z
+        [ 2 0 ]          i                z
+        [ 2 0 ]          j                z
+        [ 2 1 ]          k                z
+        [ 2 1 ]          l                z
     */
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, (size_t)STR_SIZE);
-    write_attr(loc_id,2,dims2,"string2D",tid,buf12);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 2, dims2, "string2D", tid, buf12);
     status = H5Tclose(tid);
 
-    for (i=0; i<3; i++)
-    {
-        for (j=0; j<2; j++)
-        {
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            buf12a[i][j] = buf12[i][j];
 
-            buf12a[i][j]=buf12[i][j];
-        }
-    }
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_attr(loc_id,2,dims2,"VLstring2D",tid,buf12a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 2, dims2, "VLstring2D", tid, buf12a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5809,27 +6470,23 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf22,0,sizeof buf22);
-    }
-
+        memset(buf22, 0, sizeof buf22);
     /*
-    buf22[3][2]= {{1,2},{3,4},{5,6}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <bitfield2D> and <bitfield2D>
-    position        bitfield2D of </g1> bitfield2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <bitfield2D> and <bitfield2D>
+        position        bitfield2D of </g1> bitfield2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
     */
 
-
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_attr(loc_id,2,dims2,"bitfield2D",tid,buf22);
+    write_attr(loc_id, 2, dims2, "bitfield2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5838,21 +6495,21 @@ void write_attr_in(hid_t loc_id,
     */
 
     /*
-    buf22[3][2]= {{1,2},{3,4},{5,6}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <opaque2D> and <opaque2D>
-    position        opaque2D of </g1> opaque2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+    */
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_attr(loc_id,2,dims2,"opaque2D",tid,buf22);
+    write_attr(loc_id, 2, dims2, "opaque2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5860,29 +6517,25 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     if (make_diffs)
-    {
-        memset(buf32,0,sizeof buf32);
-    }
-
+        memset(buf32, 0, sizeof buf32);
     /*
-    buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <opaque2D> and <opaque2D>
-    position        opaque2D of </g1> opaque2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    */
-
-
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+    */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_attr(loc_id,2,dims2,"compound2D",tid,buf32);
+    write_attr(loc_id, 2, dims2, "compound2D", tid, buf32);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5890,44 +6543,41 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 3; i++) {
-            for (j = 0; j < 2; j++) {
-                status=H5Rcreate(&buf42[i][j],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_attr(loc_id,2,dims2,"reference2D",H5T_STD_REF_OBJ,buf42);
+    if (dset_name) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                status = H5Rcreate(&buf42[i][j], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 2, dims2, "reference2D", H5T_STD_REF_OBJ, buf42);
     }
 
     /*-------------------------------------------------------------------------
     * H5T_ENUM
     *-------------------------------------------------------------------------
     */
-    for (i=0; i<3; i++)
-    {
-        for (j=0; j<2; j++)
-        {
-            if (make_diffs) buf452[i][j]=GREEN; else buf452[i][j]=RED;
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++) {
+            if (make_diffs)
+                buf452[i][j] = GREEN;
+            else
+                buf452[i][j] = RED;
         }
-    }
 
     /*
-    Attribute:   <enum2D> and <enum2D>
-    position        enum2D of </g1> enum2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          RED              GREEN
-    [ 0 1 ]          RED              GREEN
-    [ 1 0 ]          RED              GREEN
-    [ 1 1 ]          RED              GREEN
-    [ 2 0 ]          RED              GREEN
-    [ 2 1 ]          RED              GREEN
+        Attribute:   <enum2D> and <enum2D>
+        position        enum2D of </g1> enum2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          RED              GREEN
+        [ 0 1 ]          RED              GREEN
+        [ 1 0 ]          RED              GREEN
+        [ 1 1 ]          RED              GREEN
+        [ 2 0 ]          RED              GREEN
+        [ 2 1 ]          RED              GREEN
     */
 
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_attr(loc_id,2,dims2,"enum2D",tid,buf452);
+    write_attr(loc_id, 2, dims2, "enum2D", tid, buf452);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5936,33 +6586,33 @@ void write_attr_in(hid_t loc_id,
     */
 
     /* Allocate and initialize VL dataset to write */
-    n=0;
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 2; j++) {
+    n = 0;
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 2; j++) {
             buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
             buf52[i][j].len = (size_t)(i + 1);
-            for(l = 0; l < i + 1; l++)
-                if(make_diffs)
-                    ((int *)buf52[i][j].p)[l] = 0;
+            for (l = 0; l < i + 1; l++)
+                if (make_diffs)
+                    ((int *) buf52[i][j].p)[l] = 0;
                 else
-                    ((int *)buf52[i][j].p)[l] = n++;
+                    ((int *) buf52[i][j].p)[l] = n++;
         }
     }
 
     /*
-    position        vlen2D of </g1> vlen2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 1 ]          1               0               1
-    [ 1 0 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 1 1 ]          5               0               5
-    [ 2 0 ]          6               0               6
-    [ 2 0 ]          7               0               7
-    [ 2 0 ]          8               0               8
-    [ 2 1 ]          9               0               9
-    [ 2 1 ]          10              0               10
-    [ 2 1 ]          11              0               11
+        position        vlen2D of </g1> vlen2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 1 ]          1               0               1
+        [ 1 0 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 1 1 ]          5               0               5
+        [ 2 0 ]          6               0               6
+        [ 2 0 ]          7               0               7
+        [ 2 0 ]          8               0               8
+        [ 2 1 ]          9               0               9
+        [ 2 1 ]          10              0               10
+        [ 2 1 ]          11              0               11
     */
 
     sid = H5Screate_simple(2, dims2, NULL);
@@ -5982,34 +6632,32 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf62,0,sizeof buf62);
-    }
+        memset(buf62, 0, sizeof buf62);
     /*
-    buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    Attribute:   <array2D> and <array2D>
-    position        array2D of </g1> array2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 0 ]          2               0               2
-    [ 0 0 ]          3               0               3
-    [ 0 1 ]          4               0               4
-    [ 0 1 ]          5               0               5
-    [ 0 1 ]          6               0               6
-    [ 1 0 ]          7               0               7
-    [ 1 0 ]          8               0               8
-    [ 1 0 ]          9               0               9
-    [ 1 1 ]          10              0               10
-    [ 1 1 ]          11              0               11
-    [ 1 1 ]          12              0               12
-    [ 2 0 ]          13              0               13
-    [ 2 0 ]          14              0               14
-    [ 2 0 ]          15              0               15
-    [ 2 1 ]          16              0               16
-    [ 2 1 ]          17              0               17
-    [ 2 1 ]          18              0               18
+        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array2D> and <array2D>
+        position        array2D of </g1> array2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 0 ]          2               0               2
+        [ 0 0 ]          3               0               3
+        [ 0 1 ]          4               0               4
+        [ 0 1 ]          5               0               5
+        [ 0 1 ]          6               0               6
+        [ 1 0 ]          7               0               7
+        [ 1 0 ]          8               0               8
+        [ 1 0 ]          9               0               9
+        [ 1 1 ]          10              0               10
+        [ 1 1 ]          11              0               11
+        [ 1 1 ]          12              0               12
+        [ 2 0 ]          13              0               13
+        [ 2 0 ]          14              0               14
+        [ 2 0 ]          15              0               15
+        [ 2 1 ]          16              0               16
+        [ 2 1 ]          17              0               17
+        [ 2 1 ]          18              0               18
     */
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_attr(loc_id, 2, dims2, "array2D", tid, buf62);
@@ -6020,36 +6668,34 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        memset(buf72,0,sizeof buf72);
-        memset(buf82,0,sizeof buf82);
+    if (make_diffs) {
+        memset(buf72, 0, sizeof buf72);
+        memset(buf82, 0, sizeof buf82);
     }
     /*
-    Attribute:   <integer2D> and <integer2D>
-    position        integer2D of </g1> integer2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    6 differences found
-    Attribute:   <float2D> and <float2D>
-    position        float2D of </g1> float2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    */
-
-    write_attr(loc_id,2,dims2,"integer2D",H5T_NATIVE_INT,buf72);
-    write_attr(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82);
-
+        Attribute:   <integer2D> and <integer2D>
+        position        integer2D of </g1> integer2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+        6 differences found
+        Attribute:   <float2D> and <float2D>
+        position        float2D of </g1> float2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+    */
+
+    write_attr(loc_id, 2, dims2, "integer2D", H5T_NATIVE_INT, buf72);
+    write_attr(loc_id, 2, dims2, "float2D", H5T_NATIVE_FLOAT, buf82);
 
     /*-------------------------------------------------------------------------
     * 3D attributes
@@ -6061,90 +6707,83 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<4; i++)
-            for (j=0; j<3; j++)
-                for (k=0; k<2; k++)
-                    for (l=0; l<2; l++)
-                        buf13[i][j][k][l]='z';
+    if (make_diffs) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    for (l = 0; l < 2; l++)
+                        buf13[i][j][k][l] = 'z';
     }
 
     /*
-    buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
-    "rs","tu","vw","xz","AB","CD","EF","GH",
-    "IJ","KL","MN","PQ","RS","TU","VW","XZ"};
-
-    Attribute:   <string3D> and <string3D>
-    position        string3D of </g1> string3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          a                z
-    [ 0 0 0 ]          b                z
-    [ 0 0 1 ]          c                z
-    [ 0 0 1 ]          d                z
-    [ 0 1 0 ]          e                z
-    [ 0 1 0 ]          f                z
-    [ 0 1 1 ]          g                z
-    [ 0 1 1 ]          h                z
-    [ 0 2 0 ]          i                z
-    [ 0 2 0 ]          j                z
-    [ 0 2 1 ]          k                z
-    [ 0 2 1 ]          l                z
-    [ 1 0 0 ]          m                z
-    [ 1 0 0 ]          n                z
-    [ 1 0 1 ]          p                z
-    [ 1 0 1 ]          q                z
-    [ 1 1 0 ]          r                z
-    [ 1 1 0 ]          s                z
-    [ 1 1 1 ]          t                z
-    [ 1 1 1 ]          u                z
-    [ 1 2 0 ]          v                z
-    [ 1 2 0 ]          w                z
-    [ 1 2 1 ]          x                z
-    [ 2 0 0 ]          A                z
-    [ 2 0 0 ]          B                z
-    [ 2 0 1 ]          C                z
-    [ 2 0 1 ]          D                z
-    [ 2 1 0 ]          E                z
-    [ 2 1 0 ]          F                z
-    [ 2 1 1 ]          G                z
-    [ 2 1 1 ]          H                z
-    [ 2 2 0 ]          I                z
-    [ 2 2 0 ]          J                z
-    [ 2 2 1 ]          K                z
-    [ 2 2 1 ]          L                z
-    [ 3 0 0 ]          M                z
-    [ 3 0 0 ]          N                z
-    [ 3 0 1 ]          P                z
-    [ 3 0 1 ]          Q                z
-    [ 3 1 0 ]          R                z
-    [ 3 1 0 ]          S                z
-    [ 3 1 1 ]          T                z
-    [ 3 1 1 ]          U                z
-    [ 3 2 0 ]          V                z
-    [ 3 2 0 ]          W                z
-    [ 3 2 1 ]          X                z
-    [ 3 2 1 ]          Z                z
+        buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+        "rs","tu","vw","xz","AB","CD","EF","GH",
+        "IJ","KL","MN","PQ","RS","TU","VW","XZ"};
+
+        Attribute:   <string3D> and <string3D>
+        position        string3D of </g1> string3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          a                z
+        [ 0 0 0 ]          b                z
+        [ 0 0 1 ]          c                z
+        [ 0 0 1 ]          d                z
+        [ 0 1 0 ]          e                z
+        [ 0 1 0 ]          f                z
+        [ 0 1 1 ]          g                z
+        [ 0 1 1 ]          h                z
+        [ 0 2 0 ]          i                z
+        [ 0 2 0 ]          j                z
+        [ 0 2 1 ]          k                z
+        [ 0 2 1 ]          l                z
+        [ 1 0 0 ]          m                z
+        [ 1 0 0 ]          n                z
+        [ 1 0 1 ]          p                z
+        [ 1 0 1 ]          q                z
+        [ 1 1 0 ]          r                z
+        [ 1 1 0 ]          s                z
+        [ 1 1 1 ]          t                z
+        [ 1 1 1 ]          u                z
+        [ 1 2 0 ]          v                z
+        [ 1 2 0 ]          w                z
+        [ 1 2 1 ]          x                z
+        [ 2 0 0 ]          A                z
+        [ 2 0 0 ]          B                z
+        [ 2 0 1 ]          C                z
+        [ 2 0 1 ]          D                z
+        [ 2 1 0 ]          E                z
+        [ 2 1 0 ]          F                z
+        [ 2 1 1 ]          G                z
+        [ 2 1 1 ]          H                z
+        [ 2 2 0 ]          I                z
+        [ 2 2 0 ]          J                z
+        [ 2 2 1 ]          K                z
+        [ 2 2 1 ]          L                z
+        [ 3 0 0 ]          M                z
+        [ 3 0 0 ]          N                z
+        [ 3 0 1 ]          P                z
+        [ 3 0 1 ]          Q                z
+        [ 3 1 0 ]          R                z
+        [ 3 1 0 ]          S                z
+        [ 3 1 1 ]          T                z
+        [ 3 1 1 ]          U                z
+        [ 3 2 0 ]          V                z
+        [ 3 2 0 ]          W                z
+        [ 3 2 1 ]          X                z
+        [ 3 2 1 ]          Z                z
     */
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, (size_t)STR_SIZE);
-    write_attr(loc_id,3,dims3,"string3D",tid,buf13);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 3, dims3, "string3D", tid, buf13);
     status = H5Tclose(tid);
 
-    for (i=0; i<4; i++)
-    {
-        for (j=0; j<3; j++)
-        {
-            for (k=0; k<2; k++)
-            {
-                buf13a[i][j][k]=buf13[i][j][k];
-            }
-        }
-    }
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                buf13a[i][j][k] = buf13[i][j][k];
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_attr(loc_id,3,dims3,"VLstring3D",tid,buf13a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 3, dims3, "VLstring3D", tid, buf13a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6152,58 +6791,55 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
-                if(make_diffs)
+                if (make_diffs)
                     buf23[i][j][k] = 0;
                 else
-                    buf23[i][j][k] = (char)n++;
+                    buf23[i][j][k] = (char) n++;
             }
-        }
-    }
-
     /*
-    position        bitfield3D of </g1> bitfield3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 1 ]          2               0               2
-    [ 0 1 0 ]          3               0               3
-    [ 0 1 1 ]          4               0               4
-    [ 0 2 0 ]          5               0               5
-    [ 0 2 1 ]          6               0               6
-    [ 1 0 0 ]          7               0               7
-    [ 1 0 1 ]          8               0               8
-    [ 1 1 0 ]          9               0               9
-    [ 1 1 1 ]          10              0               10
-    [ 1 2 0 ]          11              0               11
-    [ 1 2 1 ]          12              0               12
-    [ 2 0 0 ]          13              0               13
-    [ 2 0 1 ]          14              0               14
-    [ 2 1 0 ]          15              0               15
-    [ 2 1 1 ]          16              0               16
-    [ 2 2 0 ]          17              0               17
-    [ 2 2 1 ]          18              0               18
-    [ 3 0 0 ]          19              0               19
-    [ 3 0 1 ]          20              0               20
-    [ 3 1 0 ]          21              0               21
-    [ 3 1 1 ]          22              0               22
-    [ 3 2 0 ]          23              0               23
-    [ 3 2 1 ]          24              0               24
+        position        bitfield3D of </g1> bitfield3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        [ 1 2 0 ]          11              0               11
+        [ 1 2 1 ]          12              0               12
+        [ 2 0 0 ]          13              0               13
+        [ 2 0 1 ]          14              0               14
+        [ 2 1 0 ]          15              0               15
+        [ 2 1 1 ]          16              0               16
+        [ 2 2 0 ]          17              0               17
+        [ 2 2 1 ]          18              0               18
+        [ 3 0 0 ]          19              0               19
+        [ 3 0 1 ]          20              0               20
+        [ 3 1 0 ]          21              0               21
+        [ 3 1 1 ]          22              0               22
+        [ 3 2 0 ]          23              0               23
+        [ 3 2 1 ]          24              0               24
     */
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_attr(loc_id,3,dims3,"bitfield3D",tid,buf23);
+    write_attr(loc_id, 3, dims3, "bitfield3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
     * H5T_OPAQUE
     *-------------------------------------------------------------------------
     */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_attr(loc_id,3,dims3,"opaque3D",tid,buf23);
+    write_attr(loc_id, 3, dims3, "opaque3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6211,77 +6847,75 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf33[i][j][k].a = 0;
                     buf33[i][j][k].b = 0.0F;
                 }
                 else {
-                    buf33[i][j][k].a = (char)n++;
+                    buf33[i][j][k].a = (char) n++;
                     buf33[i][j][k].b = n++;
                 }
             }
-        }
-    }
     /*position        compound3D of </g1> compound3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 0 ]          2               0               2
-    [ 0 0 1 ]          3               0               3
-    [ 0 0 1 ]          4               0               4
-    [ 0 1 0 ]          5               0               5
-    [ 0 1 0 ]          6               0               6
-    [ 0 1 1 ]          7               0               7
-    [ 0 1 1 ]          8               0               8
-    [ 0 2 0 ]          9               0               9
-    [ 0 2 0 ]          10              0               10
-    [ 0 2 1 ]          11              0               11
-    [ 0 2 1 ]          12              0               12
-    [ 1 0 0 ]          13              0               13
-    [ 1 0 0 ]          14              0               14
-    [ 1 0 1 ]          15              0               15
-    [ 1 0 1 ]          16              0               16
-    [ 1 1 0 ]          17              0               17
-    [ 1 1 0 ]          18              0               18
-    [ 1 1 1 ]          19              0               19
-    [ 1 1 1 ]          20              0               20
-    [ 1 2 0 ]          21              0               21
-    [ 1 2 0 ]          22              0               22
-    [ 1 2 1 ]          23              0               23
-    [ 1 2 1 ]          24              0               24
-    [ 2 0 0 ]          25              0               25
-    [ 2 0 0 ]          26              0               26
-    [ 2 0 1 ]          27              0               27
-    [ 2 0 1 ]          28              0               28
-    [ 2 1 0 ]          29              0               29
-    [ 2 1 0 ]          30              0               30
-    [ 2 1 1 ]          31              0               31
-    [ 2 1 1 ]          32              0               32
-    [ 2 2 0 ]          33              0               33
-    [ 2 2 0 ]          34              0               34
-    [ 2 2 1 ]          35              0               35
-    [ 2 2 1 ]          36              0               36
-    [ 3 0 0 ]          37              0               37
-    [ 3 0 0 ]          38              0               38
-    [ 3 0 1 ]          39              0               39
-    [ 3 0 1 ]          40              0               40
-    [ 3 1 0 ]          41              0               41
-    [ 3 1 0 ]          42              0               42
-    [ 3 1 1 ]          43              0               43
-    [ 3 1 1 ]          44              0               44
-    [ 3 2 0 ]          45              0               45
-    [ 3 2 0 ]          46              0               46
-    [ 3 2 1 ]          47              0               47
-    [ 3 2 1 ]          48              0               48
-    */
-
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 1 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 1 0 ]          5               0               5
+        [ 0 1 0 ]          6               0               6
+        [ 0 1 1 ]          7               0               7
+        [ 0 1 1 ]          8               0               8
+        [ 0 2 0 ]          9               0               9
+        [ 0 2 0 ]          10              0               10
+        [ 0 2 1 ]          11              0               11
+        [ 0 2 1 ]          12              0               12
+        [ 1 0 0 ]          13              0               13
+        [ 1 0 0 ]          14              0               14
+        [ 1 0 1 ]          15              0               15
+        [ 1 0 1 ]          16              0               16
+        [ 1 1 0 ]          17              0               17
+        [ 1 1 0 ]          18              0               18
+        [ 1 1 1 ]          19              0               19
+        [ 1 1 1 ]          20              0               20
+        [ 1 2 0 ]          21              0               21
+        [ 1 2 0 ]          22              0               22
+        [ 1 2 1 ]          23              0               23
+        [ 1 2 1 ]          24              0               24
+        [ 2 0 0 ]          25              0               25
+        [ 2 0 0 ]          26              0               26
+        [ 2 0 1 ]          27              0               27
+        [ 2 0 1 ]          28              0               28
+        [ 2 1 0 ]          29              0               29
+        [ 2 1 0 ]          30              0               30
+        [ 2 1 1 ]          31              0               31
+        [ 2 1 1 ]          32              0               32
+        [ 2 2 0 ]          33              0               33
+        [ 2 2 0 ]          34              0               34
+        [ 2 2 1 ]          35              0               35
+        [ 2 2 1 ]          36              0               36
+        [ 3 0 0 ]          37              0               37
+        [ 3 0 0 ]          38              0               38
+        [ 3 0 1 ]          39              0               39
+        [ 3 0 1 ]          40              0               40
+        [ 3 1 0 ]          41              0               41
+        [ 3 1 0 ]          42              0               42
+        [ 3 1 1 ]          43              0               43
+        [ 3 1 1 ]          44              0               44
+        [ 3 2 0 ]          45              0               45
+        [ 3 2 0 ]          46              0               46
+        [ 3 2 1 ]          47              0               47
+        [ 3 2 1 ]          48              0               48
+    */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_attr(loc_id,3,dims3,"compound3D",tid,buf33);
+    write_attr(loc_id, 3, dims3, "compound3D", tid, buf33);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6289,15 +6923,13 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 3; j++) {
+    if (dset_name) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
                 for (k = 0; k < 2; k++)
-                    status=H5Rcreate(&buf43[i][j][k],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_attr(loc_id,3,dims3,"reference3D",H5T_STD_REF_OBJ,buf43);
+                    status = H5Rcreate(&buf43[i][j][k], fid, dset_name,
+                            H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 3, dims3, "reference3D", H5T_STD_REF_OBJ, buf43);
     }
 
     /*-------------------------------------------------------------------------
@@ -6305,48 +6937,47 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
-                if (make_diffs) buf453[i][j][k]=RED; else buf453[i][j][k]=GREEN;
+                if (make_diffs)
+                    buf453[i][j][k] = RED;
+                else
+                    buf453[i][j][k] = GREEN;
             }
-        }
-    }
-
     /*
-    position        enum3D of </g1> enum3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          GREEN            RED
-    [ 0 0 1 ]          GREEN            RED
-    [ 0 1 0 ]          GREEN            RED
-    [ 0 1 1 ]          GREEN            RED
-    [ 0 2 0 ]          GREEN            RED
-    [ 0 2 1 ]          GREEN            RED
-    [ 1 0 0 ]          GREEN            RED
-    [ 1 0 1 ]          GREEN            RED
-    [ 1 1 0 ]          GREEN            RED
-    [ 1 1 1 ]          GREEN            RED
-    [ 1 2 0 ]          GREEN            RED
-    [ 1 2 1 ]          GREEN            RED
-    [ 2 0 0 ]          GREEN            RED
-    [ 2 0 1 ]          GREEN            RED
-    [ 2 1 0 ]          GREEN            RED
-    [ 2 1 1 ]          GREEN            RED
-    [ 2 2 0 ]          GREEN            RED
-    [ 2 2 1 ]          GREEN            RED
-    [ 3 0 0 ]          GREEN            RED
-    [ 3 0 1 ]          GREEN            RED
-    [ 3 1 0 ]          GREEN            RED
-    [ 3 1 1 ]          GREEN            RED
-    [ 3 2 0 ]          GREEN            RED
-    [ 3 2 1 ]          GREEN            RED
+        position        enum3D of </g1> enum3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          GREEN            RED
+        [ 0 0 1 ]          GREEN            RED
+        [ 0 1 0 ]          GREEN            RED
+        [ 0 1 1 ]          GREEN            RED
+        [ 0 2 0 ]          GREEN            RED
+        [ 0 2 1 ]          GREEN            RED
+        [ 1 0 0 ]          GREEN            RED
+        [ 1 0 1 ]          GREEN            RED
+        [ 1 1 0 ]          GREEN            RED
+        [ 1 1 1 ]          GREEN            RED
+        [ 1 2 0 ]          GREEN            RED
+        [ 1 2 1 ]          GREEN            RED
+        [ 2 0 0 ]          GREEN            RED
+        [ 2 0 1 ]          GREEN            RED
+        [ 2 1 0 ]          GREEN            RED
+        [ 2 1 1 ]          GREEN            RED
+        [ 2 2 0 ]          GREEN            RED
+        [ 2 2 1 ]          GREEN            RED
+        [ 3 0 0 ]          GREEN            RED
+        [ 3 0 1 ]          GREEN            RED
+        [ 3 1 0 ]          GREEN            RED
+        [ 3 1 1 ]          GREEN            RED
+        [ 3 2 0 ]          GREEN            RED
+        [ 3 2 1 ]          GREEN            RED
     */
 
-
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_attr(loc_id,3,dims3,"enum3D",tid,buf453);
+    write_attr(loc_id, 3, dims3, "enum3D", tid, buf453);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6355,34 +6986,32 @@ void write_attr_in(hid_t loc_id,
     */
 
     /* Allocate and initialize VL dataset to write */
-    n=0;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 0;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
                 buf53[i][j][k].len = (size_t)(i + 1);
                 for (l = 0; l < i + 1; l++)
-                    if(make_diffs)
-                        ((int *)buf53[i][j][k].p)[l] = 0;
+                    if (make_diffs)
+                        ((int *) buf53[i][j][k].p)[l] = 0;
                     else
-                        ((int *)buf53[i][j][k].p)[l] = n++;
+                        ((int *) buf53[i][j][k].p)[l] = n++;
             }
-        }
-    }
     /*
-    position        vlen3D of </g1> vlen3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 1 ]          1               0               1
-    [ 0 1 0 ]          2               0               2
-    [ 0 1 1 ]          3               0               3
-    [ 0 2 0 ]          4               0               4
-    [ 0 2 1 ]          5               0               5
-    [ 1 0 0 ]          6               0               6
-    [ 1 0 0 ]          7               0               7
-    [ 1 0 1 ]          8               0               8
-    [ 1 0 1 ]          9               0               9
-    [ 1 1 0 ]          10              0               10
-    etc
+        position        vlen3D of </g1> vlen3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 1 ]          1               0               1
+        [ 0 1 0 ]          2               0               2
+        [ 0 1 1 ]          3               0               3
+        [ 0 2 0 ]          4               0               4
+        [ 0 2 1 ]          5               0               5
+        [ 1 0 0 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 0 1 ]          9               0               9
+        [ 1 1 0 ]          10              0               10
+        etc
     */
     sid = H5Screate_simple(3, dims3, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
@@ -6399,24 +7028,25 @@ void write_attr_in(hid_t loc_id,
     * H5T_ARRAY
     *-------------------------------------------------------------------------
     */
-    n=1;
-    for (i = 0; i < 24; i++) {
-        for (j = 0; j < (int)dimarray[0]; j++) {
-            if (make_diffs) buf63[i][j]=0;
-            else buf63[i][j]=n++;
+    n = 1;
+    for (i = 0; i < 24; i++)
+        for (j = 0; j < (int) dimarray[0]; j++) {
+            if (make_diffs)
+                buf63[i][j] = 0;
+            else
+                buf63[i][j] = n++;
         }
-    }
     /*
-    position        array3D of </g1> array3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 0 ]          2               0               2
-    [ 0 0 0 ]          3               0               3
-    [ 0 0 1 ]          4               0               4
-    [ 0 0 1 ]          5               0               5
-    [ 0 0 1 ]          6               0               6
-    [ 0 1 0 ]          7               0               7
-    etc
+        position        array3D of </g1> array3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 0 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 0 1 ]          5               0               5
+        [ 0 0 1 ]          6               0               6
+        [ 0 1 0 ]          7               0               7
+        etc
     */
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
@@ -6427,132 +7057,120 @@ void write_attr_in(hid_t loc_id,
     * H5T_INTEGER and H5T_FLOAT
     *-------------------------------------------------------------------------
     */
-    n=1; f=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    f = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
-                    buf73[i][j][k]=0;
-                    buf83[i][j][k]=0.0F;
+                    buf73[i][j][k] = 0;
+                    buf83[i][j][k] = 0.0F;
                 }
                 else {
-                    buf73[i][j][k]=n++;
-                    buf83[i][j][k]=f++;
+                    buf73[i][j][k] = n++;
+                    buf83[i][j][k] = f++;
                 }
             }
-        }
-    }
 
     /*
-    position        integer3D of </g1> integer3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 1 ]          2               0               2
-    [ 0 1 0 ]          3               0               3
-    [ 0 1 1 ]          4               0               4
-    [ 0 2 0 ]          5               0               5
-    [ 0 2 1 ]          6               0               6
-    [ 1 0 0 ]          7               0               7
-    [ 1 0 1 ]          8               0               8
-    [ 1 1 0 ]          9               0               9
-    [ 1 1 1 ]          10              0               10
-    etc
-    */
-    write_attr(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73);
-    write_attr(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83);
+        position        integer3D of </g1> integer3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        etc
+    */
+    write_attr(loc_id, 3, dims3, "integer3D", H5T_NATIVE_INT, buf73);
+    write_attr(loc_id, 3, dims3, "float3D", H5T_NATIVE_FLOAT, buf83);
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: write_dset_in
-*
-* Purpose: write datasets in LOC_ID
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_dset_in
+ *
+ * Purpose: write datasets in LOC_ID
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-void write_dset_in(hid_t loc_id,
-                   const char* dset_name, /* for saving reference to dataset*/
-                   hid_t fid,
-                   int make_diffs /* flag to modify data buffers */)
+void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs /* flag to modify data buffers */)
 {
     /* Compound datatype */
-    typedef struct s_t
-    {
-        char   a;
+    typedef struct s_t {
+        char a;
         double b;
     } s_t;
 
-    typedef enum
-    {
-        RED,
-        GREEN
+    typedef enum {
+        RED, GREEN
     } e_t;
 
-    hid_t   did;
-    hid_t   sid;
-    hid_t   tid;
-    hid_t   dcpl;
-    herr_t  status;
-    int     val, i, j, k, l, n;
-    float   f;
-    int     fillvalue=2;
-    int     scalar_data = 2;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t tid = -1;
+    hid_t dcpl = -1;
+    herr_t status;
+    int val, i, j, k, l, n;
+    float f;
+    int fillvalue = 2;
+    int scalar_data = 2;
 
     /* create 1D attributes with dimension [2], 2 elements */
-    hsize_t    dims[1]={2};
-    char       buf1[2][STR_SIZE]= {"ab","de"}; /* string */
-    char       *buf1a[2];                      /* VL string */
-    char       buf2[2]= {1,2};                 /* bitfield, opaque */
-    s_t        buf3[2]= {{1,2.0F},{3,4.0F}};   /* compound */
-    hobj_ref_t buf4[2];                        /* reference */
-    e_t        buf45[2]= {RED,GREEN};          /* enum */
-    hvl_t      buf5[2];                        /* vlen */
-    hsize_t    dimarray[1]={3};                /* array dimension */
-    int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
-    int        buf7[2]= {1,2};                 /* integer */
-    float      buf8[2]= {1.0F,2.0F};           /* float */
+    hsize_t dims[1] = { 2 };
+    char buf1[2][STR_SIZE] = { "ab", "de" }; /* string */
+    char *buf1a[2]; /* VL string */
+    char buf2[2] = { 1, 2 }; /* bitfield, opaque */
+    s_t buf3[2] = { { 1, 2.0F }, { 3, 4.0F } }; /* compound */
+    hobj_ref_t buf4[2]; /* reference */
+    e_t buf45[2] = { RED, GREEN }; /* enum */
+    hvl_t buf5[2]; /* vlen */
+    hsize_t dimarray[1] = { 3 }; /* array dimension */
+    int buf6[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } }; /* array */
+    int buf7[2] = { 1, 2 }; /* integer */
+    float buf8[2] = { 1.0F, 2.0F }; /* float */
 
     /* create 2D attributes with dimension [3][2], 6 elements */
-    hsize_t    dims2[2]={3,2};
-    char       buf12[3][2][STR_SIZE]= {{"ab","cd"},{"ef","gh"},{"ij","kl"}};     /* string */
-    char       *buf12a[3][2];                                        /* VL string */
-    char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
-    s_t        buf32[6]= {{1,2.0F},{3,4.0F},{5,6.0F},{7,8.0F},{9,10.0F},{11,12.0F}};   /* compound */
-    hobj_ref_t buf42[3][2];                                          /* reference */
-    hvl_t      buf52[3][2];                                          /* vlen */
-    int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};  /* array */
-    int        buf72[3][2]= {{1,2},{3,4},{5,6}};                     /* integer */
-    float      buf82[3][2]= {{1.0F,2.0F},{3.0F,4.0F},{5.0F,6.0F}};                     /* float */
+    hsize_t dims2[2] = { 3, 2 };
+    char buf12[3][2][STR_SIZE] = { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } }; /* string */
+    char *buf12a[3][2]; /* VL string */
+    char buf22[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* bitfield, opaque */
+    s_t buf32[6] = { { 1, 2.0F }, { 3, 4.0F }, { 5, 6.0F }, { 7, 8.0F }, { 9, 10.0F }, { 11, 12.0F } }; /* compound */
+    hobj_ref_t buf42[3][2]; /* reference */
+    hvl_t buf52[3][2]; /* vlen */
+    int buf62[6][3] = { { 1, 2, 3 }, { 4, 5, 6 }, { 7, 8, 9 }, { 10, 11, 12 }, { 13, 14, 15 }, { 16, 17, 18 } }; /* array */
+    int buf72[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* integer */
+    float buf82[3][2] = { { 1.0F, 2.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } }; /* float */
 
     /* create 3D attributes with dimension [4][3][2], 24 elements */
-    hsize_t    dims3[3]={4,3,2};
-    char       buf13[4][3][2][STR_SIZE]= {{{"ab","cd"},{"ef","gh"},{"ij","kl"}},
-    {{"mn","pq"},{"rs","tu"},{"vw","xz"}},
-    {{"AB","CD"},{"EF","GH"},{"IJ","KL"}},
-    {{"MN","PQ"},{"RS","TU"},{"VW","XZ"}}};  /* string */
-    char       *buf13a[4][3][2];  /* VL string */
-    char       buf23[4][3][2];    /* bitfield, opaque */
-    s_t        buf33[4][3][2];    /* compound */
-    hobj_ref_t buf43[4][3][2];    /* reference */
-    hvl_t      buf53[4][3][2];    /* vlen */
-    int        buf63[24][3];      /* array */
-    int        buf73[4][3][2];    /* integer */
-    float      buf83[4][3][2];    /* float */
-
-    if(make_diffs == 2) {
+    hsize_t dims3[3] = { 4, 3, 2 };
+    char buf13[4][3][2][STR_SIZE] = { { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } },
+                                    { { "mn", "pq" }, { "rs", "tu" }, { "vw", "xz" } },
+                                    { { "AB", "CD" }, { "EF", "GH" }, { "IJ", "KL" } },
+                                    { { "MN", "PQ" }, { "RS", "TU" }, { "VW", "XZ" } } }; /* string */
+    char *buf13a[4][3][2]; /* VL string */
+    char buf23[4][3][2]; /* bitfield, opaque */
+    s_t buf33[4][3][2]; /* compound */
+    hobj_ref_t buf43[4][3][2]; /* reference */
+    hvl_t buf53[4][3][2]; /* vlen */
+    int buf63[24][3]; /* array */
+    int buf73[4][3][2]; /* integer */
+    float buf83[4][3][2]; /* float */
+
+    if (make_diffs == 2)
         dimarray[0] = 4;
-    }
 
     /*-------------------------------------------------------------------------
     * H5S_SCALAR
     *-------------------------------------------------------------------------
     */
 
-
-
-    if(make_diffs)
+    if (make_diffs)
         scalar_data = 1;
 
     /* create a space  */
@@ -6568,7 +7186,6 @@ void write_dset_in(hid_t loc_id,
     H5Dclose(did);
     H5Sclose(sid);
 
-
     /*-------------------------------------------------------------------------
     * 1D
     *-------------------------------------------------------------------------
@@ -6579,27 +7196,22 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<2; j++)
-                buf1[i][j]='z';
-    }
-
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid,(size_t)STR_SIZE);
-    write_dset(loc_id,1,dims,"string",tid,buf1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_dset(loc_id, 1, dims, "string", tid, buf1);
     status = H5Tclose(tid);
 
-    for (i=0; i<2; i++)
-    {
-        buf1a[i]=buf1[i];
-    }
+    for (i = 0; i < 2; i++)
+        buf1a[i] = buf1[i];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_dset(loc_id,1,dims,"VLstring",tid,buf1a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_dset(loc_id, 1, dims, "VLstring", tid, buf1a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6608,13 +7220,11 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            buf2[i]=buf2[1]=0;
-    }
+        for (i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_dset(loc_id,1,dims,"bitfield",tid,buf2);
+    write_dset(loc_id, 1, dims, "bitfield", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6623,16 +7233,14 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf3[i].a=0; buf3[i].b=0;
+        for (i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
         }
-    }
 
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_dset(loc_id,1,dims,"opaque",tid,buf2);
+    write_dset(loc_id, 1, dims, "opaque", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6640,19 +7248,14 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf45[i]=GREEN;
-        }
-    }
+        for (i = 0; i < 2; i++)
+            buf45[i] = GREEN;
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_dset(loc_id,1,dims,"compound",tid,buf3);
+    write_dset(loc_id, 1, dims, "compound", tid, buf3);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6660,11 +7263,10 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        status=H5Rcreate(&buf4[0],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        status=H5Rcreate(&buf4[1],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        write_dset(loc_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4);
+    if (dset_name) {
+        status = H5Rcreate(&buf4[0], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        status = H5Rcreate(&buf4[1], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_dset(loc_id, 1, dims, "reference", H5T_STD_REF_OBJ, buf4);
     }
 
     /*-------------------------------------------------------------------------
@@ -6672,16 +7274,16 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    gen_datareg(fid,make_diffs);
+    gen_datareg(fid, make_diffs);
 
     /*-------------------------------------------------------------------------
     * H5T_ENUM
     *-------------------------------------------------------------------------
     */
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_dset(loc_id,1,dims,"enum",tid,buf45);
+    write_dset(loc_id, 1, dims, "enum", tid, buf45);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6692,22 +7294,23 @@ void write_dset_in(hid_t loc_id,
     /* Allocate and initialize VL dataset to write */
 
     buf5[0].len = 1;
-    buf5[0].p = HDmalloc( 1 * sizeof(int));
-    ((int *)buf5[0].p)[0]=1;
+    buf5[0].p = HDmalloc(1 * sizeof(int));
+    ((int *) buf5[0].p)[0] = 1;
     buf5[1].len = 2;
-    buf5[1].p = HDmalloc( 2 * sizeof(int));
-    ((int *)buf5[1].p)[0]=2;
-    ((int *)buf5[1].p)[1]=3;
+    buf5[1].p = HDmalloc(2 * sizeof(int));
+    ((int *) buf5[1].p)[0] = 2;
+    ((int *) buf5[1].p)[1] = 3;
 
-    if(make_diffs) {
-        ((int *)buf5[0].p)[0] = 0;
-        ((int *)buf5[1].p)[0] = 0;
-        ((int *)buf5[1].p)[1]=0;
+    if (make_diffs) {
+        ((int *) buf5[0].p)[0] = 0;
+        ((int *) buf5[1].p)[0] = 0;
+        ((int *) buf5[1].p)[1] = 0;
     }
 
     sid = H5Screate_simple(1, dims, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
-    did = H5Dcreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT,
+    H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5);
     HDassert(status >= 0);
     status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
@@ -6722,37 +7325,32 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<3; j++)
-            {
-                buf6[i][j]=0;
-            }
-    }
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 3; j++)
+                buf6[i][j] = 0;
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_dset(loc_id, 1, dims, "array", tid, buf6);
     status = H5Tclose(tid);
 
     {
-        double  *dbuf;                           /* information to write */
-        hid_t   ldid;                            /* dataset ID   */
-        hid_t   lsid;                            /* dataspace ID   */
-        hid_t   ltid;                            /* datatype ID   */
-        size_t  size;
-        hsize_t sdims[] = {1};
-        hsize_t tdims[] = {H5TOOLS_MALLOCSIZE / sizeof(double) + 1};
-        size_t  jj;
+        double *dbuf; /* information to write */
+        hid_t ldid = -1; /* dataset ID   */
+        hid_t lsid = -1; /* dataspace ID   */
+        hid_t ltid = -1; /* datatype ID   */
+        size_t size;
+        hsize_t sdims[] = { 1 };
+        hsize_t tdims[] = { H5TOOLS_MALLOCSIZE / sizeof(double) + 1 };
+        size_t jj;
 
         /* allocate and initialize array data to write */
-        size = ( H5TOOLS_MALLOCSIZE / sizeof(double) + 1 ) * sizeof(double);
-        dbuf = (double *)HDmalloc(size);
+        size = (H5TOOLS_MALLOCSIZE / sizeof(double) + 1) * sizeof(double);
+        dbuf = (double *) HDmalloc(size);
 
-        for(jj = 0; jj < (H5TOOLS_MALLOCSIZE / sizeof(double) + 1); jj++)
-            dbuf[jj] = (double)jj;
+        for (jj = 0; jj < (H5TOOLS_MALLOCSIZE / sizeof(double) + 1); jj++)
+            dbuf[jj] = (double) jj;
 
-        if (make_diffs)
-        {
+        if (make_diffs) {
             dbuf[5] = 0;
             dbuf[6] = 0;
         }
@@ -6779,17 +7377,13 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf7[i]=0;
-            buf8[i]=0;
+        for (i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
         }
-    }
-
-    write_dset(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7);
-    write_dset(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8);
 
+    write_dset(loc_id, 1, dims, "integer", H5T_NATIVE_INT, buf7);
+    write_dset(loc_id, 1, dims, "float", H5T_NATIVE_FLOAT, buf8);
 
     /*-------------------------------------------------------------------------
     * 2D
@@ -6801,30 +7395,25 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<3; i++)
-            for (j=0; j<2; j++)
-                for (k=0; k<2; k++)
-                    buf12[i][j][k]='z';
+    if (make_diffs) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                for (k = 0; k < 2; k++)
+                    buf12[i][j][k] = 'z';
     }
 
-
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid,(size_t)STR_SIZE);
-    write_dset(loc_id,2,dims2,"string2D",tid,buf12);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_dset(loc_id, 2, dims2, "string2D", tid, buf12);
     status = H5Tclose(tid);
 
-    for (i=0; i<3; i++)
-    {
-        for (j=0; j<2; j++)
-        {
-            buf12a[i][j]=buf12[i][j];
-        }
-    }
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            buf12a[i][j] = buf12[i][j];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_dset(loc_id,2,dims2,"VLstring2D",tid,buf12a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_dset(loc_id, 2, dims2, "VLstring2D", tid, buf12a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6832,23 +7421,20 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
     if (make_diffs)
-    {
-        memset(buf22,0,sizeof buf22);
-    }
+        memset(buf22, 0, sizeof buf22);
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_dset(loc_id,2,dims2,"bitfield2D",tid,buf22);
+    write_dset(loc_id, 2, dims2, "bitfield2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
     * H5T_OPAQUE
     *-------------------------------------------------------------------------
     */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_dset(loc_id,2,dims2,"opaque2D",tid,buf22);
+    write_dset(loc_id, 2, dims2, "opaque2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6857,14 +7443,12 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf32,0,sizeof buf32);
-    }
+        memset(buf32, 0, sizeof buf32);
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_dset(loc_id,2,dims2,"compound2D",tid,buf32);
+    write_dset(loc_id, 2, dims2, "compound2D", tid, buf32);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6872,14 +7456,11 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 3; i++) {
-            for (j = 0; j < 2; j++) {
-                status=H5Rcreate(&buf42[i][j],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_dset(loc_id,2,dims2,"reference2D",H5T_STD_REF_OBJ,buf42);
+    if (dset_name) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                status = H5Rcreate(&buf42[i][j], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_dset(loc_id, 2, dims2, "reference2D", H5T_STD_REF_OBJ, buf42);
     }
 
     /*-------------------------------------------------------------------------
@@ -6888,9 +7469,9 @@ void write_dset_in(hid_t loc_id,
     */
 
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_dset(loc_id,2,dims2,"enum2D",tid,0);
+    write_dset(loc_id, 2, dims2, "enum2D", tid, 0);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6900,18 +7481,17 @@ void write_dset_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n = 0;
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 2; j++) {
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++) {
             buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
             buf52[i][j].len = (size_t)(i + 1);
-            for(l = 0; l < i + 1; l++) {
-                if(make_diffs)
-                    ((int *)buf52[i][j].p)[l] = 0;
+            for (l = 0; l < i + 1; l++) {
+                if (make_diffs)
+                    ((int *) buf52[i][j].p)[l] = 0;
                 else
-                    ((int *)buf52[i][j].p)[l] = n++;
+                    ((int *) buf52[i][j].p)[l] = n++;
             }
         }
-    }
 
     sid = H5Screate_simple(2, dims2, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
@@ -6930,10 +7510,7 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf62,0,sizeof buf62);
-    }
-
+        memset(buf62, 0, sizeof buf62);
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_dset(loc_id, 2, dims2, "array2D", tid, buf62);
@@ -6944,14 +7521,11 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
-    if (make_diffs)
-    {
+    if (make_diffs) {
         memset(buf72, 0, sizeof buf72);
         memset(buf82, 0, sizeof buf82);
     }
 
-
     dcpl = H5Pcreate(H5P_DATASET_CREATE);
     status = H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue);
     sid = H5Screate_simple(2, dims2, NULL);
@@ -6966,8 +7540,7 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    write_dset(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82);
-
+    write_dset(loc_id, 2, dims2, "float2D", H5T_NATIVE_FLOAT, buf82);
 
     /*-------------------------------------------------------------------------
     * 3D
@@ -6979,33 +7552,27 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<4; i++)
-            for (j=0; j<3; j++)
-                for (k=0; k<2; k++)
-                    for (l=0; l<2; l++)
-                        buf13[i][j][k][l]='z';
+    if (make_diffs) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    for (l = 0; l < 2; l++)
+                        buf13[i][j][k][l] = 'z';
     }
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid,(size_t)STR_SIZE);
-    write_dset(loc_id,3,dims3,"string3D",tid,buf13);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_dset(loc_id, 3, dims3, "string3D", tid, buf13);
     status = H5Tclose(tid);
 
-    for (i=0; i<4; i++)
-    {
-        for (j=0; j<3; j++)
-        {
-            for (k=0; k<2; k++)
-            {
-                buf13a[i][j][k]=buf13[i][j][k];
-            }
-        }
-    }
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                buf13a[i][j][k] = buf13[i][j][k];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_dset(loc_id,3,dims3,"VLstring3D",tid,buf13a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_dset(loc_id, 3, dims3, "VLstring3D", tid, buf13a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7013,31 +7580,27 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
-                if(make_diffs)
+                if (make_diffs)
                     buf23[i][j][k] = 0;
                 else
-                    buf23[i][j][k] = (char)n++;
+                    buf23[i][j][k] = (char) n++;
             }
-        }
-    }
-
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_dset(loc_id,3,dims3,"bitfield3D",tid,buf23);
+    write_dset(loc_id, 3, dims3, "bitfield3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
     * H5T_OPAQUE
     *-------------------------------------------------------------------------
     */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_dset(loc_id,3,dims3,"opaque3D",tid,buf23);
+    write_dset(loc_id, 3, dims3, "opaque3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7045,27 +7608,24 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf33[i][j][k].a = 0;
                     buf33[i][j][k].b = 0.0F;
                 }
                 else {
-                    buf33[i][j][k].a = (char)n++;
+                    buf33[i][j][k].a = (char) n++;
                     buf33[i][j][k].b = n++;
                 }
             }
-        }
-    }
-
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_dset(loc_id,3,dims3,"compound3D",tid,buf33);
+    write_dset(loc_id, 3, dims3, "compound3D", tid, buf33);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7073,15 +7633,12 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 3; j++) {
+    if (dset_name) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
                 for (k = 0; k < 2; k++)
-                    status=H5Rcreate(&buf43[i][j][k],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_dset(loc_id,3,dims3,"reference3D",H5T_STD_REF_OBJ,buf43);
+                    status = H5Rcreate(&buf43[i][j][k], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_dset(loc_id, 3, dims3, "reference3D", H5T_STD_REF_OBJ, buf43);
     }
 
     /*-------------------------------------------------------------------------
@@ -7090,9 +7647,9 @@ void write_dset_in(hid_t loc_id,
     */
 
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_dset(loc_id,3,dims3,"enum3D",tid,0);
+    write_dset(loc_id, 3, dims3, "enum3D", tid, 0);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7101,21 +7658,19 @@ void write_dset_in(hid_t loc_id,
     */
 
     /* Allocate and initialize VL dataset to write */
-    n=0;
-    for(i = 0; i < 4; i++) {
-        for(j = 0; j < 3; j++) {
-            for(k = 0; k < 2; k++) {
+    n = 0;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++) {
                 buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
                 buf53[i][j][k].len = (size_t)(i + 1);
-                for(l = 0; l < i + 1; l++) {
-                    if(make_diffs)
-                        ((int *)buf53[i][j][k].p)[l] = 0;
+                for (l = 0; l < i + 1; l++) {
+                    if (make_diffs)
+                        ((int *) buf53[i][j][k].p)[l] = 0;
                     else
-                        ((int *)buf53[i][j][k].p)[l] = n++;
+                        ((int *) buf53[i][j][k].p)[l] = n++;
                 }
             }
-        }
-    }
 
     sid = H5Screate_simple(3, dims3, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
@@ -7133,14 +7688,14 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
-    n=1;
-    for (i = 0; i < 24; i++) {
+    n = 1;
+    for (i = 0; i < 24; i++)
         for (j = 0; j < 3; j++) {
-            if (make_diffs) buf63[i][j]=0;
-            else buf63[i][j]=n++;
+            if (make_diffs)
+                buf63[i][j] = 0;
+            else
+                buf63[i][j] = n++;
         }
-    }
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_dset(loc_id, 3, dims3, "array3D", tid, buf63);
@@ -7150,82 +7705,86 @@ void write_dset_in(hid_t loc_id,
     * H5T_INTEGER and H5T_FLOAT
     *-------------------------------------------------------------------------
     */
-    n=1; f=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    f = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
-                    buf73[i][j][k]=0;
-                    buf83[i][j][k]=0.0F;
+                    buf73[i][j][k] = 0;
+                    buf83[i][j][k] = 0.0F;
                 }
                 else {
-                    buf73[i][j][k]=n++;
-                    buf83[i][j][k]=f++;
+                    buf73[i][j][k] = n++;
+                    buf83[i][j][k] = f++;
                 }
             }
-        }
-    }
-    write_dset(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73);
-    write_dset(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83);
+
+    write_dset(loc_id, 3, dims3, "integer3D", H5T_NATIVE_INT, buf73);
+    write_dset(loc_id, 3, dims3, "float3D", H5T_NATIVE_FLOAT, buf83);
 }
 
 /*-------------------------------------------------------------------------
-* Function: gen_datareg
-*
-* Purpose: generate a dataset region and its reference
-*
-* Date: April 19, 2006
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: gen_datareg
+ *
+ * Purpose: generate a dataset region and its reference
+ *
+ * Date: April 19, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
 
 static
-void gen_datareg(hid_t fid,
-                 int make_diffs /* flag to modify data buffers */)
+void gen_datareg(hid_t fid, int make_diffs /* flag to modify data buffers */)
 {
     /* data dataset */
-    hid_t           did1;              /* dataset ID   */
-    hid_t           sid1;              /* dataspace ID  */
-    hsize_t         dims1[2] = {10,10};/* dimensions */
-    int             *buf;              /* dataset buffer */
+    hid_t did1 = -1; /* dataset ID   */
+    hid_t sid1 = -1; /* dataspace ID  */
+    hsize_t dims1[2] = { 10, 10 };/* dimensions */
+    int *buf; /* dataset buffer */
     /* reference dataset */
-    hid_t           did2;              /* dataset ID   */
-    hid_t           sid2;              /* dataspace ID  */
-    hsize_t         dims2[] = {2};     /* 2 references */
-    hdset_reg_ref_t *rbuf;             /* buffer for write the references  */
-    hsize_t         start[10];         /* starting location of hyperslab */
-    hsize_t         count[10];         /* element count of hyperslab */
-    hsize_t         coord[5][2];       /* coordinates for point selection */
-    herr_t          status;
-    int             i;
+    hid_t did2 = -1; /* dataset ID   */
+    hid_t sid2 = -1; /* dataspace ID  */
+    hsize_t dims2[] = { 2 }; /* 2 references */
+    hdset_reg_ref_t *rbuf; /* buffer for write the references  */
+    hsize_t start[10]; /* starting location of hyperslab */
+    hsize_t count[10]; /* element count of hyperslab */
+    hsize_t coord[5][2]; /* coordinates for point selection */
+    herr_t status;
+    int i;
 
     /* allocate the buffer for write the references */
-    rbuf = (hdset_reg_ref_t *)HDcalloc((size_t)2, sizeof(hdset_reg_ref_t));
+    rbuf = (hdset_reg_ref_t *) HDcalloc((size_t )2, sizeof(hdset_reg_ref_t));
 
     /* allocate the buffer for write the data dataset */
-    buf = (int *)HDmalloc(10 * 10 * sizeof(int));
+    buf = (int *) HDmalloc(10 * 10 * sizeof(int));
 
-    for(i = 0; i < 10 * 10; i++)
+    for (i = 0; i < 10 * 10; i++)
         buf[i] = i;
 
     /* create the data dataset */
-    sid1   = H5Screate_simple(2, dims1, NULL);
-    did1   = H5Dcreate2(fid, "dsetref", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    sid1 = H5Screate_simple(2, dims1, NULL);
+    did1 = H5Dcreate2(fid, "dsetref", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
     HDassert(status >= 0);
 
     /* create the reference dataset */
-    sid2   = H5Screate_simple(1, dims2, NULL);
-    did2   = H5Dcreate2(fid, "refreg", H5T_STD_REF_DSETREG, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    sid2 = H5Screate_simple(1, dims2, NULL);
+    did2 = H5Dcreate2(fid, "refreg", H5T_STD_REF_DSETREG, sid2, H5P_DEFAULT,
+    H5P_DEFAULT, H5P_DEFAULT);
 
     /* create the references */
     /* select hyperslab for first reference */
 
-    start[0] = 2; start[1] = 2;
-    count[0] = 6; count[1] = 6;
-    if(make_diffs) {
-        start[0] = 0; start[1] = 0;
-        count[0] = 3; count[1] = 3;
+    start[0] = 2;
+    start[1] = 2;
+    count[0] = 6;
+    count[1] = 6;
+    if (make_diffs) {
+        start[0] = 0;
+        start[1] = 0;
+        count[0] = 3;
+        count[1] = 3;
     }
 
     status = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL);
@@ -7237,25 +7796,32 @@ void gen_datareg(hid_t fid,
     HDassert(status >= 0);
 
     /* select sequence of five points for second reference */
-    coord[0][0]=6; coord[0][1]=9;
-    coord[1][0]=2; coord[1][1]=2;
-    coord[2][0]=8; coord[2][1]=4;
-    coord[3][0]=1; coord[3][1]=6;
-    coord[4][0]=2; coord[4][1]=8;
-    if (make_diffs)
-    {
-        coord[1][0]=3; coord[1][1]=3;
-        coord[3][0]=2; coord[3][1]=5;
-        coord[4][0]=1; coord[4][1]=7;
-    }
-    H5Sselect_elements(sid1,H5S_SELECT_SET,(size_t)5,(const hsize_t *)coord);
+    coord[0][0] = 6;
+    coord[0][1] = 9;
+    coord[1][0] = 2;
+    coord[1][1] = 2;
+    coord[2][0] = 8;
+    coord[2][1] = 4;
+    coord[3][0] = 1;
+    coord[3][1] = 6;
+    coord[4][0] = 2;
+    coord[4][1] = 8;
+    if (make_diffs) {
+        coord[1][0] = 3;
+        coord[1][1] = 3;
+        coord[3][0] = 2;
+        coord[3][1] = 5;
+        coord[4][0] = 1;
+        coord[4][1] = 7;
+    }
+    H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t) 5, (const hsize_t *) coord);
     H5Sget_select_npoints(sid1);
 
     /* store second dataset region */
-    H5Rcreate(&rbuf[1],fid,"dsetref",H5R_DATASET_REGION,sid1);
+    H5Rcreate(&rbuf[1], fid, "dsetref", H5R_DATASET_REGION, sid1);
 
     /* write */
-    status = H5Dwrite(did2,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,rbuf);
+    status = H5Dwrite(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
     HDassert(status >= 0);
 
     /* close, free memory buffers */
@@ -7272,60 +7838,58 @@ void gen_datareg(hid_t fid,
     HDfree(buf);
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_hyperslab
-*
-* Purpose: test diff by hyperslabs. create a dataset with 1GB dimensions
-*  by iterating trough 1KB hyperslabs
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_hyperslab
+ *
+ * Purpose: test diff by hyperslabs. create a dataset with 1GB dimensions
+ *  by iterating trough 1KB hyperslabs
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int test_hyperslab(const char *fname,
-                   int make_diffs /* flag to modify data buffers */)
+int test_hyperslab(const char *fname, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   did=-1;
-    hid_t   fid=-1;
-    hid_t   f_sid=-1;
-    hid_t   m_sid=-1;
-    hid_t   tid=-1;
-    hid_t   dcpl=-1;
-    hsize_t dims[1]={GBLL};                  /* dataset dimensions */
-    hsize_t hs_size[1]={GBLL/(1024*1024)};   /* hyperslab dimensions */
-    hsize_t chunk_dims[1]={GBLL/1024};       /* chunk dimensions */
+    hid_t did = -1;
+    hid_t fid = -1;
+    hid_t f_sid = -1;
+    hid_t m_sid = -1;
+    hid_t tid = -1;
+    hid_t dcpl = -1;
+    hsize_t dims[1] = { GBLL }; /* dataset dimensions */
+    hsize_t hs_size[1] = { GBLL / (1024 * 1024) }; /* hyperslab dimensions */
+    hsize_t chunk_dims[1] = { GBLL / 1024 }; /* chunk dimensions */
     hsize_t hs_start[1];
-    size_t  size;
-    size_t  nelmts=(size_t)GBLL/(1024*1024); /* elements in each hyperslab */
-    char    fillvalue=-1;
-    char    *buf=NULL;
-    int     i, j, s;
-    char    c;
+    size_t size;
+    size_t nelmts = (size_t)GBLL / (1024 * 1024); /* elements in each hyperslab */
+    char fillvalue = -1;
+    char *buf = NULL;
+    int i, j, s;
+    char c;
 
     /* create */
     fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto out;
-    if(H5Pset_fill_value(dcpl, H5T_NATIVE_CHAR, &fillvalue) < 0)
+    if (H5Pset_fill_value(dcpl, H5T_NATIVE_CHAR, &fillvalue) < 0)
         goto out;
-    if(H5Pset_chunk(dcpl, 1, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 1, chunk_dims) < 0)
         goto out;
-    if((f_sid = H5Screate_simple(1, dims, NULL)) < 0)
+    if ((f_sid = H5Screate_simple(1, dims, NULL)) < 0)
         goto out;
-    if((did = H5Dcreate2(fid, "big", H5T_NATIVE_CHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, "big", H5T_NATIVE_CHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto out;
-    if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
+    if ((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
         goto out;
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
-    if((size = H5Tget_size(tid)) <= 0)
+    if ((size = H5Tget_size(tid)) <= 0)
         goto out;
 
     /* create a evenly divided buffer from 0 to 127  */
-    buf = (char *)HDmalloc((size_t)(nelmts * size));
+    buf = (char *) HDmalloc((size_t)(nelmts * size));
     s = 1024 * 1024 / 127;
-    for(i = 0, j = 0, c = 0; i < 1024 * 1024; j++, i++) {
-        if(j == s) {
+    for (i = 0, j = 0, c = 0; i < 1024 * 1024; j++, i++) {
+        if (j == s) {
             c++;
             j = 0;
         }
@@ -7334,32 +7898,30 @@ int test_hyperslab(const char *fname,
         HDmemset(buf, c, nelmts);
 
         /* make a different hyperslab at this position */
-        if(make_diffs && i == 512 * 512)
+        if (make_diffs && i == 512 * 512)
             HDmemset(buf, 0, nelmts);
 
-        hs_start[0] = (unsigned long long)i * GBLL / (1024 * 1024);
-        if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0)
+        hs_start[0] = (unsigned long long) i * GBLL / (1024 * 1024);
+        if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, hs_start, NULL, hs_size, NULL) < 0)
             goto out;
 
         /* write only one hyperslab */
-        if ( i==512*512)
-        {
-            if (H5Dwrite (did,H5T_NATIVE_CHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0)
+        if (i == 512 * 512) {
+            if (H5Dwrite(did, H5T_NATIVE_CHAR, m_sid, f_sid, H5P_DEFAULT, buf) < 0)
                 goto out;
         }
-
     }
     HDfree(buf);
-    buf=NULL;
+    buf = NULL;
 
     /* close */
-    if(H5Sclose(f_sid) < 0)
+    if (H5Sclose(f_sid) < 0)
         goto out;
-    if(H5Sclose(m_sid) < 0)
+    if (H5Sclose(m_sid) < 0)
         goto out;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
     H5Fclose(fid);
 
@@ -7374,40 +7936,32 @@ out:
         H5Fclose(fid);
     } H5E_END_TRY;
     return -1;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: write_attr
-*
-* Purpose: utility function to write an attribute in LOC_ID
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_attr
+ *
+ * Purpose: utility function to write an attribute in LOC_ID
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int write_attr(hid_t loc_id,
-               int rank,
-               hsize_t *dims,
-               const char *name,
-               hid_t tid,
-               void *buf)
+int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf)
 {
-    hid_t   aid=-1;
-    hid_t   sid=-1;
+    hid_t aid = -1;
+    hid_t sid = -1;
 
     /* create a space  */
-    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         goto out;
 
     /* create the attribute */
-    if((aid = H5Acreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((aid = H5Acreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* write */
-    if(buf)
-    {
-        if(H5Awrite(aid, tid, buf) < 0)
+    if (buf) {
+        if (H5Awrite(aid, tid, buf) < 0)
             goto out;
     }
 
@@ -7425,35 +7979,29 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: write_dset
-*
-* Purpose: utility function to create and write a dataset in LOC_ID
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_dset
+ *
+ * Purpose: utility function to create and write a dataset in LOC_ID
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int write_dset( hid_t loc_id,
-               int rank,
-               hsize_t *dims,
-               const char *name,
-               hid_t tid,
-               void *buf )
+int write_dset(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf)
 {
-    hid_t   did=-1;
-    hid_t   sid=-1;
+    hid_t did = -1;
+    hid_t sid = -1;
 
     /* create a space  */
-    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         goto out;
 
     /* create the dataset */
-    if((did = H5Dcreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* write */
-    if(buf)
-    {
-        if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (buf) {
+        if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
             goto out;
     }
 
diff --git a/tools/h5diff/testfiles/h5diff_8625.txt b/tools/h5diff/testfiles/h5diff_8625.txt
new file mode 100644
index 0000000..a7ddb86
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_8625.txt
@@ -0,0 +1,10 @@
+dataset: </group/Compound_dset1> and </group_copy/Compound_dset3>
+Warning: different storage datatype
+Warning: different storage datatype
+Not comparable: </group/Compound_dset1> or </group_copy/Compound_dset3> is of mixed string type
+0 differences found
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects without details of differences.
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_8639.txt b/tools/h5diff/testfiles/h5diff_8639.txt
new file mode 100644
index 0000000..4022e06
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_8639.txt
@@ -0,0 +1,72 @@
+
+group1   group2
+---------------------------------------
+    x      x                   
+
+group  : </g1> and </g1>
+0 differences found
+Warning: different storage datatype
+Not comparable: <VLstring> or <VLstring> is of mixed string type
+Warning: different storage datatype
+Not comparable: <VLstring2D> or <VLstring2D> is of mixed string type
+Warning: different storage datatype
+Not comparable: <VLstring3D> or <VLstring3D> is of mixed string type
+attribute: <array of </g1>> and <array of </g1>>
+0 differences found
+attribute: <array2D of </g1>> and <array2D of </g1>>
+0 differences found
+attribute: <array3D of </g1>> and <array3D of </g1>>
+0 differences found
+attribute: <bitfield of </g1>> and <bitfield of </g1>>
+0 differences found
+attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
+0 differences found
+attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
+0 differences found
+attribute: <compound of </g1>> and <compound of </g1>>
+0 differences found
+attribute: <compound2D of </g1>> and <compound2D of </g1>>
+0 differences found
+attribute: <compound3D of </g1>> and <compound3D of </g1>>
+0 differences found
+attribute: <enum of </g1>> and <enum of </g1>>
+0 differences found
+attribute: <enum2D of </g1>> and <enum2D of </g1>>
+0 differences found
+attribute: <enum3D of </g1>> and <enum3D of </g1>>
+0 differences found
+attribute: <float of </g1>> and <float of </g1>>
+0 differences found
+attribute: <float2D of </g1>> and <float2D of </g1>>
+0 differences found
+attribute: <float3D of </g1>> and <float3D of </g1>>
+0 differences found
+attribute: <integer of </g1>> and <integer of </g1>>
+0 differences found
+attribute: <integer2D of </g1>> and <integer2D of </g1>>
+0 differences found
+attribute: <integer3D of </g1>> and <integer3D of </g1>>
+0 differences found
+attribute: <opaque of </g1>> and <opaque of </g1>>
+0 differences found
+attribute: <opaque2D of </g1>> and <opaque2D of </g1>>
+0 differences found
+attribute: <opaque3D of </g1>> and <opaque3D of </g1>>
+0 differences found
+Warning: different storage datatype
+Not comparable: <string> or <string> is of mixed string type
+Warning: different storage datatype
+Not comparable: <string2D> or <string2D> is of mixed string type
+Warning: different storage datatype
+Not comparable: <string3D> or <string3D> is of mixed string type
+attribute: <vlen of </g1>> and <vlen of </g1>>
+0 differences found
+attribute: <vlen2D of </g1>> and <vlen2D of </g1>>
+0 differences found
+attribute: <vlen3D of </g1>> and <vlen3D of </g1>>
+0 differences found
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects without details of differences.
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_attr1.h5 b/tools/h5diff/testfiles/h5diff_attr1.h5
index 5004f13..fc519d4 100644
--- a/tools/h5diff/testfiles/h5diff_attr1.h5
+++ b/tools/h5diff/testfiles/h5diff_attr1.h5
diff --git a/tools/h5diff/testfiles/h5diff_attr2.h5 b/tools/h5diff/testfiles/h5diff_attr2.h5
index 92a91c0..627d432 100644
--- a/tools/h5diff/testfiles/h5diff_attr2.h5
+++ b/tools/h5diff/testfiles/h5diff_attr2.h5
diff --git a/tools/h5diff/testfiles/h5diff_attr3.h5 b/tools/h5diff/testfiles/h5diff_attr3.h5
new file mode 100644
index 0000000..df2c664
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_attr3.h5
diff --git a/tools/h5diff/testfiles/h5diff_tmp1.txt b/tools/h5diff/testfiles/h5diff_tmp1.txt
deleted file mode 100644
index 40e3fb6..0000000
--- a/tools/h5diff/testfiles/h5diff_tmp1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -c for a list of objects.
-EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_tmp2.txt b/tools/h5diff/testfiles/h5diff_tmp2.txt
deleted file mode 100644
index a2d6da6..0000000
--- a/tools/h5diff/testfiles/h5diff_tmp2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-dataset: </G/down/Data> and </G/down/Data>
-1599 differences found
-dataset: </G/down/Tail/array> and </G/down/Tail/array>
-8 differences found
-dataset: </G/up/Data> and </G/up/Data>
-1845 differences found
-dataset: </G/up/Tail/array> and </G/up/Tail/array>
-10 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -c for a list of objects.
-EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 b/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
deleted file mode 100644
index bbcfb63..0000000
--- a/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
+++ /dev/null
diff --git a/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 b/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
deleted file mode 100644
index 6b19ed7..0000000
--- a/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
+++ /dev/null
diff --git a/tools/h5diff/testfiles/tmptest.he5 b/tools/h5diff/testfiles/tmptest.he5
deleted file mode 100644
index edcfcd2..0000000
--- a/tools/h5diff/testfiles/tmptest.he5
+++ /dev/null
diff --git a/tools/h5diff/testfiles/tmptest2.he5 b/tools/h5diff/testfiles/tmptest2.he5
deleted file mode 100644
index a6ab02b..0000000
--- a/tools/h5diff/testfiles/tmptest2.he5
+++ /dev/null
diff --git a/tools/h5diff/testh5diff.sh.in b/tools/h5diff/testh5diff.sh.in
index ff370a9..4563e39 100644
--- a/tools/h5diff/testh5diff.sh.in
+++ b/tools/h5diff/testh5diff.sh.in
@@ -82,6 +82,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_types.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dtypes.h5
 $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
 $SRC_H5DIFF_TESTFILES/h5diff_attr2.h5
+$SRC_H5DIFF_TESTFILES/h5diff_attr3.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dset1.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dset2.h5
 $SRC_H5DIFF_TESTFILES/h5diff_hyper1.h5
@@ -307,13 +308,9 @@ $SRC_H5DIFF_TESTFILES/h5diff_709.txt
 $SRC_H5DIFF_TESTFILES/h5diff_710.txt
 $SRC_H5DIFF_TESTFILES/h5diff_80.txt
 $SRC_H5DIFF_TESTFILES/h5diff_90.txt
-$SRC_H5DIFF_TESTFILES/h5diff_tmp1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_tmp2.txt
+$SRC_H5DIFF_TESTFILES/h5diff_8625.txt
+$SRC_H5DIFF_TESTFILES/h5diff_8639.txt
 $SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt
-$SRC_H5DIFF_TESTFILES/tmptest.he5
-$SRC_H5DIFF_TESTFILES/tmptest2.he5
-$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.reference.h5
-$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.output.h5
 "
 
 #
@@ -776,10 +773,6 @@ TOOLTEST h5diff_631.txt -v --use-system-epsilon h5diff_basic1.h5 h5diff_basic1.h
 # 7.  attributes
 # ##############################################################################
 TOOLTEST h5diff_70.txt -v h5diff_attr1.h5 h5diff_attr2.h5
-# temporary test to verify HDF5-8625
-TOOLTEST h5diff_tmp1.txt tmptest2.he5 tmptest.he5
-# temporary test to verify HDF5-8639
-TOOLTEST h5diff_tmp2.txt tmpSingleSiteBethe.output.h5 tmpSingleSiteBethe.reference.h5
 
 # ##################################################
 #  attrs with verbose option level
@@ -1101,6 +1094,10 @@ TOOLTEST h5diff_487.txt -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5
 # # diff various multiple vlen and fixed strings in a compound type dataset
 # ##############################################################################
 TOOLTEST h5diff_530.txt -v  h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group /group_copy
+# test to verify HDFFV-8625
+TOOLTEST h5diff_8625.txt -v --enable-error-stack h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group/Compound_dset1 /group_copy/Compound_dset3
+# test to verify HDFFV-8639
+TOOLTEST h5diff_8639.txt -v h5diff_attr3.h5 h5diff_attr2.h5 /g1
 TOOLTEST h5diff_vlstr.txt -v  tvlstr.h5 tvlstr2.h5
 
 # ##############################################################################
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 3a91e54..f301014 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -97,10 +97,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5dump-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5dump ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index 4831d5c..bde8286 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -43,11 +43,13 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  INSTALL_PROGRAM_PDB (h5import ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
-          h5import
+          ${H5_DEP_EXECUTABLES}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index 927a64c..632fba8 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -37,8 +37,6 @@ set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam")
 
 set (H5_DEP_EXECUTABLES
     h5jam
-    getub
-    tellub
     h5unjam
 )
 
@@ -70,11 +68,13 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
-          h5jam h5unjam
+          ${H5_DEP_EXECUTABLES}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index 269ca89..519d6df 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -182,9 +182,11 @@ parse_command_line (int argc, const char *argv[])
       case 'h':
           usage (h5tools_getprogname());
           leave (EXIT_SUCCESS);
+          break;
       case 'V':
           print_version (h5tools_getprogname());
           leave (EXIT_SUCCESS);
+          break;
       case '?':
       default:
           usage (h5tools_getprogname());
@@ -201,10 +203,6 @@ parse_command_line (int argc, const char *argv[])
  * Return:      Success:    0
  *              Failure:    1
  *
- * Programmer:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 0e49edb..d9c3977 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -73,10 +73,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5ls-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5ls ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 86611a9..4b15d7c 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -114,10 +114,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5repack-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5repack ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 63233b8..a4f8f5b 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -882,7 +882,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                         HDfree(buf);
                                         buf = NULL;
                                     }
-                                 }
+                                }
                                 else { /* possibly not enough memory, read/write by hyperslabs */
                                     size_t p_type_nbytes = msize; /*size of memory type */
                                     hsize_t p_nelmts = nelmts; /*total elements */
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 523f81a..1371691 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -42,7 +42,7 @@ static int aux_copy_obj(hid_t dcpl_id, /* dataset creation property list */
     H5D_layout_t layout;
     int          rank;           /* rank of dataset */
     hsize_t      chsize[64];     /* chunk size in elements */
-    unsigned int i, j;
+    unsigned int i;
 
     /* get information about input filters */
     if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
@@ -237,7 +237,7 @@ int apply_filters(const char* name, /* object name from traverse list */
     int         nfilters;      /* number of filters in DCPL */
     hsize_t     chsize[64];    /* chunk size in elements */
     H5D_layout_t layout;
-    int         i, j;
+    int         i;
     pack_info_t obj;
     pack_info_t filtobj;
 
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
index 8c9ec64..9499ea8 100644
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@@ -56,10 +56,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5stat-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 4c145a4..068a635 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -39,7 +39,10 @@ set (H5_TOOLS_LIB_HDRS
 
 add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
 TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET} STATIC " " " ")
-target_link_libraries (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_link_libraries (${HDF5_TOOLS_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
+  target_link_libraries (${HDF5_TOOLS_LIB_TARGET} PRIVATE ${MPI_C_LIBRARIES})
+endif ()
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_TOOLS_LIB_TARGET} ${HDF5_TOOLS_LIB_NAME} STATIC)
 set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES
@@ -52,7 +55,10 @@ set (install_targets ${HDF5_TOOLS_LIB_TARGET})
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
   TARGET_C_PROPERTIES (${HDF5_TOOLS_LIBSH_TARGET} SHARED " " " ")
-  target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
+  if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
+    target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} PRIVATE ${MPI_C_LIBRARIES})
+  endif ()
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TOOLS_LIB_NAME} SHARED ${HDF5_TOOLS_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_TOOLS_LIBSH_TARGET} PROPERTIES
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 6019738..7f08cc7 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -325,8 +325,6 @@ hsize_t diff_attr(hid_t loc1_id,
     hid_t      space2_id = -1;    /* space ID */
     hid_t      ftype1_id = -1;    /* file data type ID */
     hid_t      ftype2_id = -1;    /* file data type ID */
-    int        vstrtype1 = 0;     /* ftype1 is a variable string */
-    int        vstrtype2 = 0;     /* ftype2 is a variable string */
     hid_t      mtype1_id = -1;    /* memory data type ID */
     hid_t      mtype2_id = -1;    /* memory data type ID */
     size_t     msize1;            /* memory size of memory type */
@@ -385,28 +383,8 @@ hsize_t diff_attr(hid_t loc1_id,
             /* get the datatypes  */
             if((ftype1_id = H5Aget_type(attr1_id)) < 0)
                 HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type first attribute failed");
-            vstrtype1 = H5Tis_variable_str(ftype1_id);
             if((ftype2_id = H5Aget_type(attr2_id)) < 0)
                 HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type second attribute failed");
-            vstrtype2 = H5Tis_variable_str(ftype2_id);
-
-            /* no compare if either one but not both are variable string type */
-            if (vstrtype1 != vstrtype2) {
-                if((opts->m_verbose || opts->m_list_not_cmp))
-                    parallel_print("Not comparable: one of attribute <%s/%s> or <%s/%s> is of variable length type\n",
-                            path1, name1, path2, name2);
-                opts->not_cmp = 1;
-                if (H5Tclose(ftype1_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose first attribute ftype failed");
-                if (H5Tclose(ftype2_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose second attribute ftype failed");
-                if (H5Aclose(attr1_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose first attribute failed");
-                if (H5Aclose(attr2_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose second attribute failed");
-
-                continue;
-            }
 
             if((mtype1_id = H5Tget_native_type(ftype1_id, H5T_DIR_DEFAULT)) < 0)
                 HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_native_type first attribute ftype failed");
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 9d0462d..af6a171 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -192,7 +192,8 @@ hsize_t diff_datasetid(hid_t did1,
     hid_t      sm_space = -1;           /*stripmine data space */
     size_t     need;                    /* bytes needed for malloc */
     int        i;
-    unsigned int  vl_data = 0;          /*contains VL datatypes */
+    unsigned int  vl_data1 = 0;          /*contains VL datatypes */
+    unsigned int  vl_data2 = 0;          /*contains VL datatypes */
 
     h5difftrace("diff_datasetid start\n");
     /* Get the dataspace handle */
@@ -314,7 +315,9 @@ hsize_t diff_datasetid(hid_t did1,
      * VLEN memory buffer later
      */
     if(TRUE == h5tools_detect_vlen(m_tid1))
-        vl_data = TRUE;
+        vl_data1 = TRUE;
+    if(TRUE == h5tools_detect_vlen(m_tid2))
+        vl_data2 = TRUE;
     h5diffdebug2("h5tools_detect_vlen - errstat:%d\n", opts->err_stat);
 
     /*------------------------------------------------------------------------
@@ -405,11 +408,12 @@ hsize_t diff_datasetid(hid_t did1,
             h5diffdebug2("diff_array nfound:%d\n", nfound);
 
             /* reclaim any VL memory, if necessary */
-            if(vl_data) {
-                h5difftrace("check vl_data\n");
+            h5diffdebug2("check vl_data1:%d\n", vl_data1);
+            if(vl_data1)
                 H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
+            h5diffdebug2("check vl_data2:%d\n", vl_data2);
+            if(vl_data2)
                 H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
-            } /* end if */
             if(buf1 != NULL) {
                 HDfree(buf1);
                 buf1 = NULL;
@@ -499,10 +503,10 @@ hsize_t diff_datasetid(hid_t did1,
                         dadims, opts, name1, name2, dam_tid, did1, did2);
 
                 /* reclaim any VL memory, if necessary */
-                if(vl_data) {
+                if(vl_data1)
                     H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
-                    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
-                } /* end if */
+                if(vl_data2)
+                    H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
 
                 /* calculate the next hyperslab offset */
                 for(i = rank1, carry = 1; i > 0 && carry; --i) {
@@ -539,29 +543,29 @@ done:
     /* free */
     if(buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
+        if(vl_data1)
             H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
         HDfree(buf1);
         buf1 = NULL;
     }
     if(buf2 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
+        if(vl_data2)
             H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
         HDfree(buf2);
         buf2 = NULL;
     }
     if(sm_buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
+        if(vl_data1)
             H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
         HDfree(sm_buf1);
         sm_buf1 = NULL;
     }
     if(sm_buf2 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
-            H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
+        if(vl_data2)
+            H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
         HDfree(sm_buf2);
         sm_buf2 = NULL;
     }
@@ -570,6 +574,7 @@ done:
     H5E_BEGIN_TRY {
         H5Sclose(sid1);
         H5Sclose(sid2);
+        H5Sclose(sm_space);
         H5Tclose(f_tid1);
         H5Tclose(f_tid2);
         H5Tclose(m_tid1);
@@ -761,12 +766,31 @@ int diff_can_type(hid_t       f_tid1, /* file data type */
         }
     }
 
+    if(tclass1 == H5T_STRING) {
+        htri_t vstrtype1 = -1;
+        htri_t vstrtype2 = -1;
+        h5difftrace("diff_can_type end - H5T_STRING\n");
+
+        vstrtype1 = H5Tis_variable_str(f_tid1);
+        vstrtype2 = H5Tis_variable_str(f_tid2);
+
+        /* no compare if either one but not both are variable string type */
+        if (vstrtype1 != vstrtype2) {
+            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name)
+                parallel_print("Not comparable: <%s> or <%s> is of mixed string type\n",
+                        obj1_name, obj2_name);
+            opts->not_cmp = 1;
+            HGOTO_DONE(0);
+        }
+    }
+
     if(tclass1 == H5T_COMPOUND) {
         int   nmembs1;
         int   nmembs2;
         int   j;
         hid_t memb_type1 = -1;
         hid_t memb_type2 = -1;
+        h5difftrace("diff_can_type end - H5T_COMPOUND\n");
 
         nmembs1 = H5Tget_nmembers(f_tid1);
         nmembs2 = H5Tget_nmembers(f_tid2);
diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c
index c894598..ab184d3 100644
--- a/tools/lib/io_timer.c
+++ b/tools/lib/io_timer.c
@@ -25,10 +25,6 @@
 #include "H5private.h"
 #include "hdf5.h"
 
-#ifdef H5_HAVE_PARALLEL
-#include <mpi.h>
-#endif
-
 #include "io_timer.h"
 
 /*
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h
index 21d7d00..2189e31 100644
--- a/tools/lib/ph5diff.h
+++ b/tools/lib/ph5diff.h
@@ -42,9 +42,5 @@ struct diffs_found
     int      not_cmp;
 };
 
-#ifdef H5_HAVE_PARALLEL
-#include <mpi.h>
-#endif
-
 #endif  /* _PH5DIFF_H__ */
 
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index da1af42..1c22235 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -76,13 +76,13 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  INSTALL_PROGRAM_PDB (h5debug ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  INSTALL_PROGRAM_PDB (h5repart ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  INSTALL_PROGRAM_PDB (h5mkgrp ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
-          h5debug h5repart h5mkgrp
+          ${H5_DEP_EXECUTABLES}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index 43d6bfe..b7ff73c 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -129,6 +129,7 @@ parse_command_line(int argc, const char *argv[], param_t *parms)
             case 'h':
                 usage();
                 leave(EXIT_SUCCESS);
+                break;
 
             /* Create objects with the latest version of the format */
             case 'l':
@@ -149,6 +150,7 @@ parse_command_line(int argc, const char *argv[], param_t *parms)
             case 'V':
                 print_version(h5tools_getprogname());
                 leave(EXIT_SUCCESS);
+                break;
 
             /* Bad command line argument */
             default: