Merge mostly CMake changes from develop and file cleanup

14 files changed, 2210 insertions, 2415 deletions

diff --git a/test/big.c b/test/big.c
index 30b715e..f5ee4ec 100644
--- a/test/big.c
+++ b/test/big.c
@@ -275,6 +275,14 @@ error:
  *
  *-------------------------------------------------------------------------
  */
+/* Disable warning for "format not a string literal" here -QAK */
+/*
+ *      This pragma only needs to surround the snprintf() calls with
+ *      'name' in the code below, but early (4.4.7, at least) gcc only
+ *      allows diagnostic pragmas to be toggled outside of functions.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static int
 enough_room(hid_t fapl)
 {
@@ -315,6 +323,7 @@ done:
 
     return ret_value;
 }
+#pragma GCC diagnostic pop
 
 
 /*-------------------------------------------------------------------------
diff --git a/test/dtypes.c b/test/dtypes.c
index 3514de4..25cc890 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -18,7 +18,7 @@
  * Purpose:     Tests the datatype interface (H5T)
  */
 
-#include "h5test.h"
+#include "testhdf5.h"
 #include "H5srcdir.h"
 #include "H5Iprivate.h"     /* For checking that datatype id's don't leak */
 
@@ -698,7 +698,7 @@ test_compound_2(void)
     bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
     orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)orig) + i;
+	s_ptr = ((struct st*)((void *)orig)) + i;
 	s_ptr->a    = i*8+0;
 	s_ptr->b    = i*8+1;
 	s_ptr->c[0] = i*8+2;
@@ -736,8 +736,8 @@ test_compound_2(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)orig) + i;
-	d_ptr = ((struct dt*)buf)  + i;
+	s_ptr = ((struct st*)((void *)orig)) + i;
+	d_ptr = ((struct dt*)((void *)buf))  + i;
 	if (s_ptr->a    != d_ptr->a    ||
 	    s_ptr->b    != d_ptr->b    ||
 	    s_ptr->c[0] != d_ptr->c[0] ||
@@ -829,7 +829,7 @@ test_compound_3(void)
     bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
     orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
-        s_ptr = ((struct st*)orig) + i;
+        s_ptr = ((struct st*)((void *)orig)) + i;
         s_ptr->a    = i*8+0;
         s_ptr->b    = i*8+1;
         s_ptr->c[0] = i*8+2;
@@ -866,8 +866,8 @@ test_compound_3(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)orig) + i;
-	d_ptr = ((struct dt*)buf)  + i;
+	s_ptr = ((struct st*)((void *)orig)) + i;
+	d_ptr = ((struct dt*)((void *)buf))  + i;
 	if (s_ptr->a    != d_ptr->a    ||
 	    s_ptr->c[0] != d_ptr->c[0] ||
 	    s_ptr->c[1] != d_ptr->c[1] ||
@@ -960,7 +960,7 @@ test_compound_4(void)
     bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
     orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
-        s_ptr = ((struct st*)orig) + i;
+        s_ptr = ((struct st*)((void *)orig)) + i;
         s_ptr->a    = i*8+0;
         s_ptr->b    = (i*8+1) & 0x7fff;
         s_ptr->c[0] = i*8+2;
@@ -999,8 +999,8 @@ test_compound_4(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)orig) + i;
-	d_ptr = ((struct dt*)buf)  + i;
+	s_ptr = ((struct st*)((void *)orig)) + i;
+	d_ptr = ((struct dt*)((void *)buf))  + i;
 	if (s_ptr->a    != d_ptr->a    ||
 	    s_ptr->b    != d_ptr->b    ||
 	    s_ptr->c[0] != d_ptr->c[0] ||
@@ -1197,7 +1197,7 @@ test_compound_6(void)
     bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
     orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
-        s_ptr = ((struct st*)orig) + i;
+        s_ptr = ((struct st*)((void *)orig)) + i;
         s_ptr->b    = (i*8+1) & 0x7fff;
         s_ptr->d    = (i*8+6) & 0x7fff;
     }
@@ -1226,8 +1226,8 @@ test_compound_6(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)orig) + i;
-	d_ptr = ((struct dt*)buf)  + i;
+	s_ptr = ((struct st*)((void *)orig)) + i;
+	d_ptr = ((struct dt*)((void *)buf))  + i;
 	if (s_ptr->b    != d_ptr->b    ||
 	    s_ptr->d    != d_ptr->d) {
 	    H5_FAILED();
@@ -1678,7 +1678,7 @@ test_compound_9(void)
 {
     typedef struct cmpd_struct {
        int    i1;
-       char*  str;
+       const char* str;
        int    i2;
     } cmpd_struct;
 
@@ -1785,6 +1785,13 @@ test_compound_9(void)
         goto error;
     } /* end if */
 
+    if(H5Dvlen_reclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim read data\n");
+        goto error;
+    } /* end if */
+    rdata.str = NULL;
+
     if(H5Dclose(dset_id) < 0)
         goto error;
     if(H5Tclose(cmpd_tid) < 0)
@@ -1811,6 +1818,12 @@ test_compound_9(void)
         goto error;
     } /* end if */
 
+    if((space_id = H5Dget_space(dset_id)) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't get space\n");
+        goto error;
+    } /* end if */
+
     if((cmpd_tid = H5Dget_type(dset_id)) < 0) {
          H5_FAILED(); AT();
         printf("cannot open dataset\n");
@@ -1838,10 +1851,19 @@ test_compound_9(void)
         goto error;
     } /* end if */
 
+    if(H5Dvlen_reclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't read data\n");
+        goto error;
+    } /* end if */
+    rdata.str = NULL;
+
     if(rdata.str) HDfree(rdata.str);
 
     if(H5Dclose(dset_id) < 0)
         goto error;
+    if(H5Sclose(space_id) < 0)
+        goto error;
     if(H5Tclose(cmpd_tid) < 0)
         goto error;
     if(H5Tclose(dup_tid) < 0)
@@ -1901,12 +1923,12 @@ test_compound_10(void)
     for(i=0; i<ARRAY_DIM; i++) {
         wdata[i].i1 = i*10+i;
         wdata[i].str = HDstrdup("C string A");
-        wdata[i].str[9] += (char)i;
+        wdata[i].str[9] = (char)(wdata[i].str[9] + i);
         wdata[i].i2 = i*1000+i*10;
 
         wdata[i].text.p   = (void*)HDstrdup("variable-length text A\0");
         len = wdata[i].text.len = HDstrlen((char*)wdata[i].text.p)+1;
-        ((char*)(wdata[i].text.p))[len-2] += (char)i;
+        ((char *)(wdata[i].text.p))[len - 2] = (char)(((char *)(wdata[i].text.p))[len - 2] + i);
         ((char*)(wdata[i].text.p))[len-1] = '\0';
     }
 
@@ -2016,12 +2038,17 @@ test_compound_10(void)
             printf("incorrect VL read data\n");
             goto error;
         }
-
-        HDfree(t1);
-        HDfree(t2);
-        HDfree(wdata[i].str);
-        HDfree(rdata[i].str);
     } /* end for */
+    if(H5Dvlen_reclaim(arr_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim read data\n");
+        goto error;
+    } /* end if */
+    if(H5Dvlen_reclaim(arr_tid, space_id, H5P_DEFAULT, &wdata) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim read data\n");
+        goto error;
+    } /* end if */
 
     if(H5Dclose(dset_id) < 0)
         goto error;
@@ -2086,6 +2113,8 @@ test_compound_11(void)
     hid_t big_tid, little_tid;  /* Datatype IDs for type conversion */
     hid_t big_tid2, little_tid2;  /* Datatype IDs for type conversion */
     hid_t opaq_src_tid, opaq_dst_tid;  /* Datatype IDs for type conversion */
+    hid_t space_id;             /* Dataspace for buffer elements */
+    hsize_t dim[1];             /* Dimensions for dataspace */
     void *buf = NULL;          /* Conversion buffer */
     void *buf_orig = NULL;      /* Copy of original conversion buffer */
     void *bkg = NULL;           /* Background buffer */
@@ -2134,6 +2163,13 @@ test_compound_11(void)
     /* Make copy of buffer before conversion */
     HDmemcpy(buf_orig,buf,sizeof(big_t)*NTESTELEM);
 
+    dim[0] = NTESTELEM;
+    if((space_id = H5Screate_simple(1, dim, NULL)) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't create space\n");
+        goto error;
+    } /* end if */
+
     /* Make copies of the 'big' and 'little' datatypes, so the type
      * conversion routine doesn't use the same ones this time and next time
      */
@@ -2145,7 +2181,7 @@ test_compound_11(void)
 
     /* Verify converted buffer is correct */
     for(u=0; u<NTESTELEM; u++) {
-        if(((big_t *)buf_orig)[u].d1!=((little_t *)buf)[u].d1) {
+        if(!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) {
             printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].d1,(unsigned)u,((little_t *)buf)[u].d1);
             TEST_ERROR
@@ -2165,8 +2201,12 @@ test_compound_11(void)
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
-        HDfree(((little_t *)buf)[u].s1);
     } /* end for */
+    if(H5Dvlen_reclaim(little_tid2, space_id, H5P_DEFAULT, buf) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim data\n");
+        goto error;
+    } /* end if */
 
     /* Build source and destination types for conversion routine */
     if((opaq_src_tid=H5Tcreate(H5T_OPAQUE, (size_t)4)) < 0) TEST_ERROR
@@ -2185,7 +2225,7 @@ test_compound_11(void)
 
     /* Verify converted buffer is correct */
     for(u=0; u<NTESTELEM; u++) {
-        if(((big_t *)buf_orig)[u].d1!=((little_t *)buf)[u].d1) {
+        if(!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) {
             printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].d1,(unsigned)u,((little_t *)buf)[u].d1);
             TEST_ERROR
@@ -2205,8 +2245,12 @@ test_compound_11(void)
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
-        HDfree(((little_t *)buf)[u].s1);
     } /* end for */
+    if(H5Dvlen_reclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim data\n");
+        goto error;
+    } /* end if */
 
     /* Unregister the conversion routine */
     if(H5Tunregister(H5T_PERS_HARD, "opaq_test", opaq_src_tid, opaq_dst_tid, convert_opaque) < 0) TEST_ERROR
@@ -2219,7 +2263,7 @@ test_compound_11(void)
 
     /* Verify converted buffer is correct */
     for(u=0; u<NTESTELEM; u++) {
-        if(((big_t *)buf_orig)[u].d1!=((little_t *)buf)[u].d1) {
+        if(!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) {
             printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].d1,(unsigned)u,((little_t *)buf)[u].d1);
             TEST_ERROR
@@ -2239,12 +2283,17 @@ test_compound_11(void)
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
-        HDfree(((little_t *)buf)[u].s1);
     } /* end for */
+    if(H5Dvlen_reclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim data\n");
+        goto error;
+    } /* end if */
 
     /* Free everything */
     for(u=0; u<NTESTELEM; u++)
         HDfree(((big_t *)buf_orig)[u].s1);
+    if(H5Sclose(space_id) < 0) TEST_ERROR
     if(H5Tclose(opaq_dst_tid) < 0) TEST_ERROR
     if(H5Tclose(opaq_src_tid) < 0) TEST_ERROR
     if(H5Tclose(little_tid2) < 0) TEST_ERROR
@@ -2436,7 +2485,7 @@ test_compound_13(void)
     /* Check the data. */
     for (u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++)
         if(data_out.x[u] != data_in.x[u]) TEST_ERROR
-    if(data_out.y != data_in.y) TEST_ERROR
+    if(!H5_FLT_ABS_EQUAL(data_out.y, data_in.y)) TEST_ERROR
 
     /* Release all resources. */
     if(H5Aclose(attid) < 0) FAIL_STACK_ERROR
@@ -2477,7 +2526,7 @@ test_compound_14(void)
     typedef struct cmpd_struct_1 {
        char         c1;
        char         c2;
-       char*        str;
+       const char*  str;
     } cmpd_struct_1;
 
     typedef struct cmpd_struct_2 {
@@ -2723,6 +2772,18 @@ test_compound_14(void)
         goto error;
     } /* end if */
 
+    if(H5Dvlen_reclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim read data\n");
+        goto error;
+    } /* end if */
+    rdata1.str = NULL;
+    if(H5Dvlen_reclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim read data\n");
+        goto error;
+    } /* end if */
+    rdata2.str = NULL;
     if(H5Dclose(dset1_id) < 0)
         goto error;
     if(H5Dclose(dset2_id) < 0)
@@ -2757,6 +2818,12 @@ test_compound_14(void)
         goto error;
     } /* end if */
 
+    if((space_id = H5Dget_space(dset2_id)) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't get space\n");
+        goto error;
+    } /* end if */
+
     rdata1.c1 = rdata1.c2 = 0;
     if(rdata1.str) HDfree(rdata1.str);
 
@@ -2792,13 +2859,25 @@ test_compound_14(void)
         goto error;
     } /* end if */
 
-    if(rdata1.str) HDfree(rdata1.str);
-    if(rdata2.str) HDfree(rdata2.str);
+    if(H5Dvlen_reclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim read data\n");
+        goto error;
+    } /* end if */
+    rdata1.str = NULL;
+    if(H5Dvlen_reclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) {
+        H5_FAILED(); AT();
+        printf("Can't reclaim read data\n");
+        goto error;
+    } /* end if */
+    rdata2.str = NULL;
 
     if(H5Dclose(dset1_id) < 0)
         goto error;
     if(H5Dclose(dset2_id) < 0)
         goto error;
+    if(H5Sclose(space_id) < 0)
+        goto error;
     if(H5Tclose(cmpd_m1_tid) < 0)
         goto error;
     if(H5Tclose(cmpd_m2_tid) < 0)
@@ -3220,7 +3299,7 @@ test_compound_18(void)
 
     /* Create compound datatype, but don't insert fields */
     tid = H5Tcreate(H5T_COMPOUND, (size_t)8);
-    assert(tid > 0);
+    HDassert(tid > 0);
 
     /* Attempt to create file with compound datatype that has no fields */
     /* Create File */
@@ -3229,7 +3308,7 @@ test_compound_18(void)
 
     /* Create a dataspace to use */
     sid = H5Screate_simple(1, &dim, NULL);
-    assert(sid > 0);
+    HDassert(sid > 0);
 
     /* Create a dataset with the bad compound datatype */
     H5E_BEGIN_TRY {
@@ -3242,7 +3321,7 @@ test_compound_18(void)
 
     /* Create a group */
     gid = H5Gcreate2(file, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    assert(gid > 0);
+    HDassert(gid > 0);
 
     /* Create an attribute with the bad compound datatype */
     H5E_BEGIN_TRY {
@@ -4593,7 +4672,7 @@ test_conv_enum_2(void)
 
     /* Destination enum type */
     dsttype = H5Tenum_create(H5T_NATIVE_INT);
-    assert(H5Tget_size(dsttype) > H5Tget_size(srctype));
+    HDassert(H5Tget_size(dsttype) > H5Tget_size(srctype));
     for (i=0; i<8; i++)
         H5Tenum_insert(dsttype, mname[i], &i);
 
@@ -6032,7 +6111,7 @@ test_int_float_except(void)
     /* Check the buffer after conversion, as floats */
     for(u = 0; u < CONVERT_SIZE; u++) {
         floatp = (float *)&buf[u];
-        if(*floatp != buf_float[u]) TEST_ERROR
+        if(!H5_FLT_ABS_EQUAL(*floatp, buf_float[u])) TEST_ERROR
     } /* end for */
 
     /* Check for proper exceptions */
@@ -6053,7 +6132,7 @@ test_int_float_except(void)
     /* Check the buffer after conversion, as floats */
     for(u = 0; u < CONVERT_SIZE; u++) {
         floatp = (float *)&buf2[u];
-        if(*floatp != buf2_float[u]) TEST_ERROR
+        if(!H5_FLT_ABS_EQUAL(*floatp, buf2_float[u])) TEST_ERROR
     } /* end for */
 
     /* Check for proper exceptions */
@@ -6746,89 +6825,89 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl,
 
     /* Make copy of FAPL */
     my_fapl = H5Pcopy(fapl);
-    assert(my_fapl > 0);
+    HDassert(my_fapl > 0);
 
     if(new_format) {
         /* Use latest version of file format */
         status = H5Pset_libver_bounds(my_fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
-        assert(status >= 0);
+        HDassert(status >= 0);
     } /* end if */
 
     /* Create a file creation property list (used for the root group's creation property list) */
     fcpl = H5Pcreate(H5P_FILE_CREATE);
-    assert(fcpl > 0);
+    HDassert(fcpl > 0);
 
     if(new_format) {
         /* Use dense link storage for all links in root group */
         status = H5Pset_link_phase_change(fcpl, 0, 0);
-        assert(status >= 0);
+        HDassert(status >= 0);
     } /* end if */
 
     /* Create file with attribute that uses committed datatype */
     file = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, my_fapl);
-    assert(file > 0);
+    HDassert(file > 0);
 
     /* Close FCPL */
     status = H5Pclose(fcpl);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Close FAPL */
     status = H5Pclose(my_fapl);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Create datatype to commit */
     type = H5Tvlen_create(H5T_NATIVE_INT);
-    assert(type > 0);
+    HDassert(type > 0);
 
     /* Commit datatype */
     status = H5Tcommit2(file, DEL_OBJ_NAMED_NAMED_DTYPE, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Create scalar dataspace */
     space = H5Screate(H5S_SCALAR);
-    assert(space > 0);
+    HDassert(space > 0);
 
     /* Create a dataset creation property list */
     dcpl = H5Pcreate(H5P_DATASET_CREATE);
-    assert(dcpl > 0);
+    HDassert(dcpl > 0);
 
     if(new_format) {
         /* Use dense attribute storage for all attributes on dataset */
         status = H5Pset_attr_phase_change(dcpl, 0, 0);
-        assert(status >= 0);
+        HDassert(status >= 0);
     } /* end if */
 
     /* Create dataset */
     dset = H5Dcreate2(file, DEL_OBJ_NAMED_DATASET, type, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
-    assert(dset > 0);
+    HDassert(dset > 0);
 
     /* Close DCPL */
     status = H5Pclose(dcpl);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Close dataset */
     status = H5Dclose(dset);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Create attribute */
     attr = H5Acreate_by_name(file, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    assert(attr > 0);
+    HDassert(attr > 0);
 
     /* Close dataspace */
     status = H5Sclose(space);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Close datatype */
     status = H5Tclose(type);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Close attribute */
     status = H5Aclose(attr);
-    assert(status >= 0);
+    HDassert(status >= 0);
 
     /* Close file */
     status = H5Fclose(file);
-    assert(status >= 0);
+    HDassert(status >= 0);
 } /* end create_del_obj_named_test_file() */
 
 
@@ -7461,7 +7540,7 @@ int
 main(void)
 {
     long	nerrors = 0;
-    hid_t		fapl = -1;
+    hid_t	fapl = -1;
 
     /* Set the random # seed */
     HDsrandom((unsigned)HDtime(NULL));
@@ -7478,7 +7557,6 @@ main(void)
     nerrors += test_detect();
     nerrors += test_compound_1();
     nerrors += test_query();
-
     nerrors += test_transient(fapl);
     nerrors += test_named(fapl);
     nerrors += test_encode();
@@ -7528,7 +7606,7 @@ main(void)
     if(nerrors) {
         printf("***** %lu FAILURE%s! *****\n",
                nerrors, 1==nerrors?"":"S");
-        HDexit(1);
+        HDexit(EXIT_FAILURE);
     }
 
     printf("All datatype tests passed.\n");
diff --git a/test/error_test.c b/test/error_test.c
index 580234a..1de9065 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -320,6 +320,14 @@ long_desc_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *clie
  *
  *-------------------------------------------------------------------------
  */
+/* Disable warning for "format not a string literal" here -QAK */
+/*
+ *      This pragma only needs to surround the snprintf() calls with
+ *      'full_desc' in the code below, but early (4.4.7, at least) gcc only
+ *      allows diagnostic pragmas to be toggled outside of functions.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static herr_t
 test_long_desc(void)
 {
@@ -374,6 +382,7 @@ error:
 
     return -1;
 } /* end test_long_desc() */
+#pragma GCC diagnostic pop
 
 
 /*-------------------------------------------------------------------------
diff --git a/test/external.c b/test/external.c
index ad8e7b6..ff33605 100644
--- a/test/external.c
+++ b/test/external.c
@@ -1445,11 +1445,11 @@ main(void)
 
         /* Set the fapl for different file formats */
         if(latest_format) {
-            puts("\nTesting with the latest file format:");
+            HDputs("\nTesting with the latest file format:");
             current_fapl_id = fapl_id_new;
         } /* end if */
         else {
-            puts("Testing with the default file format:");
+            HDputs("Testing with the default file format:");
             current_fapl_id = fapl_id_old;
         } /* end else */
 
@@ -1522,7 +1522,6 @@ error:
         H5Gclose(gid);
     } H5E_END_TRY;
     nerrors = MAX(1, nerrors);
-    printf ("%d TEST%s FAILED.\n", nerrors, 1==nerrors?"":"s");
+    HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
     return EXIT_FAILURE;
 } /* end main() */
-
diff --git a/test/fheap.c b/test/fheap.c
index fa0b0d7..b326248 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -529,6 +529,14 @@ get_fill_size(const fheap_test_param_t *tparam)
  *
  *-------------------------------------------------------------------------
  */
+/* Disable warning for "format not a string literal" here -QAK */
+/*
+ *      This pragma only needs to surround the snprintf() calls with
+ *      test_desc in the code below, but early (4.4.7, at least) gcc only
+ *      allows diagnostic pragmas to be toggled outside of functions.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static int
 begin_test(fheap_test_param_t *tparam, const char *base_desc,
     fheap_heap_ids_t *keep_ids, size_t *fill_size)
@@ -542,7 +550,7 @@ begin_test(fheap_test_param_t *tparam, const char *base_desc,
     del_str = get_del_string(tparam);
     HDassert(del_str);
     test_desc = H5MM_malloc(HDstrlen(del_str) + HDstrlen(base_desc));
-    sprintf(test_desc, base_desc, del_str);
+    HDsprintf(test_desc, base_desc, del_str);
     TESTING(test_desc);
     H5MM_xfree(del_str);
     H5MM_xfree(test_desc);
@@ -557,6 +565,7 @@ begin_test(fheap_test_param_t *tparam, const char *base_desc,
     /* Success */
     return(0);
 } /* end begin_test() */
+#pragma GCC diagnostic pop
 
 
 /*-------------------------------------------------------------------------
@@ -582,10 +591,13 @@ reopen_file(hid_t *file, H5F_t **f, const char *filename, hid_t fapl, hid_t dxpl
         /* Close heap */
         if(H5HF_close(*fh, dxpl) < 0)
             FAIL_STACK_ERROR
+        *fh = NULL;
 
         /* Close file */
         if(H5Fclose(*file) < 0)
             FAIL_STACK_ERROR
+        *file = (-1);
+        *f = NULL;
 
         /* Re-open the file */
         if((*file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
@@ -662,6 +674,7 @@ open_heap(char *filename, hid_t fapl, hid_t dxpl, const H5HF_create_t *cparam,
         /* Close (empty) heap */
         if(H5HF_close(*fh, dxpl) < 0)
             FAIL_STACK_ERROR
+        *fh = NULL;
     } /* end if */
 
     /* Close file */
@@ -734,6 +747,7 @@ reopen_heap(H5F_t *f, hid_t dxpl, H5HF_t **fh, haddr_t fh_addr,
         /* Close (empty) heap */
         if(H5HF_close(*fh, dxpl) < 0)
             FAIL_STACK_ERROR
+        *fh = NULL;
 
         /* Re-open heap */
         if(NULL == (*fh = H5HF_open(f, dxpl, fh_addr)))
@@ -741,10 +755,10 @@ reopen_heap(H5F_t *f, hid_t dxpl, H5HF_t **fh, haddr_t fh_addr,
     } /* end if */
 
     /* Success */
-    return(0);
+    return 0;
 
 error:
-    return(-1);
+    return -1;
 } /* end reopen_heap() */
 
 
@@ -1802,7 +1816,6 @@ error:
  * Purpose:	Create fractal heap
  *
  * Return:	Success:	0
- *
  *		Failure:	1
  *
  * Programmer:	Quincey Koziol
@@ -1878,6 +1891,7 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED
     /* Close the fractal heap */
     if(H5HF_close(fh, H5P_DATASET_XFER_DEFAULT) < 0)
         FAIL_STACK_ERROR
+    fh = NULL;
 
     /* Delete heap */
     if(H5HF_delete(f, H5P_DATASET_XFER_DEFAULT, fh_addr) < 0)
@@ -1898,15 +1912,15 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED
     /* All tests passed */
     PASSED()
 
-    return(0);
+    return 0;
 
 error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh, H5P_DATASET_XFER_DEFAULT);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
-    return(1);
+    return 1;
 } /* test_create() */
 
 
@@ -1916,7 +1930,6 @@ error:
  * Purpose:	Create & reopen a fractal heap
  *
  * Return:	Success:	0
- *
  *		Failure:	1
  *
  * Programmer:	Quincey Koziol
@@ -1971,6 +1984,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED
     /* Close the fractal heap */
     if(H5HF_close(fh, H5P_DATASET_XFER_DEFAULT) < 0)
         FAIL_STACK_ERROR
+    fh = NULL;
 
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
@@ -2001,7 +2015,7 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh, H5P_DATASET_XFER_DEFAULT);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_reopen() */
@@ -2126,7 +2140,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UN
     /* All tests passed */
     PASSED()
 
-    return(0);
+    return 0;
 
 error:
     H5E_BEGIN_TRY {
@@ -2134,10 +2148,11 @@ error:
             H5HF_close(fh, H5P_DATASET_XFER_DEFAULT);
         if(fh2)
             H5HF_close(fh2, H5P_DATASET_XFER_DEFAULT);
-	H5Fclose(file);
-	H5Fclose(file2);
+        H5Fclose(file);
+        H5Fclose(file2);
     } H5E_END_TRY;
-    return(1);
+
+    return 1;
 } /* test_open_twice() */
 
 
@@ -2237,6 +2252,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_U
     if(fh2) {
         /* Close opened heap */
         H5HF_close(fh2, H5P_DATASET_XFER_DEFAULT);
+        fh2 = NULL;
 
         /* Indicate error */
         TEST_ERROR
@@ -2247,20 +2263,6 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_U
         FAIL_STACK_ERROR
     fh = NULL;
 
-#ifdef QAK
-    /* Try re-opening the heap again (should fail, as heap is now deleted) */
-    H5E_BEGIN_TRY {
-        fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr);
-    } H5E_END_TRY;
-    if(fh) {
-        /* Close opened heap */
-        H5HF_close(fh, H5P_DATASET_XFER_DEFAULT);
-
-        /* Indicate error */
-        TEST_ERROR
-    } /* end if */
-#endif /* QAK */
-
     /* Close the file */
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
@@ -2276,7 +2278,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_U
     /* All tests passed */
     PASSED()
 
-    return(0);
+    return 0;
 
 error:
     H5E_BEGIN_TRY {
@@ -2284,9 +2286,9 @@ error:
             H5HF_close(fh, H5P_DATASET_XFER_DEFAULT);
         if(fh2)
             H5HF_close(fh2, H5P_DATASET_XFER_DEFAULT);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
-    return(1);
+    return 1;
 } /* test_delete_open() */
 
 
@@ -2619,15 +2621,15 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam)
     /* All tests passed */
     PASSED()
 
-    return(0);
+    return 0;
 
 error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh, dxpl);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
-    return(1);
+    return 1;
 } /* test_id_limits() */
 
 
@@ -2721,6 +2723,7 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam)
     /* Close the fractal heap */
     if(H5HF_close(fh, H5P_DATASET_XFER_DEFAULT) < 0)
         FAIL_STACK_ERROR
+    fh = NULL;
 
 
     /* Close the file */
@@ -2734,15 +2737,15 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam)
     /* All tests passed */
     PASSED()
 
-    return(0);
+    return 0;
 
 error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh, dxpl);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
-    return(1);
+    return 1;
 } /* test_filtered_create() */
 
 
@@ -2858,7 +2861,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
     /* Close the fractal heap */
     if(H5HF_close(fh, H5P_DATASET_XFER_DEFAULT) < 0)
         FAIL_STACK_ERROR
-
+    fh = NULL;
 
     /* Close the file */
     if(H5Fclose(file) < 0)
@@ -2867,15 +2870,15 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
     /* All tests passed */
     PASSED()
 
-    return(0);
+    return 0;
 
 error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh, dxpl);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
-    return(1);
+    return 1;
 } /* test_size() */
 
 
@@ -6341,7 +6344,7 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
 
     /* Initialize the buffer for objects to insert */
     for(u = 0; u < sizeof(obj); u++)
-        obj[u] = u;
+        obj[u] = (unsigned char)u;
 
     /* Insert object into heap */
     if(H5HF_insert(fh, dxpl, sizeof(obj), obj, &heap_id) < 0)
@@ -6378,6 +6381,7 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     /* Close the fractal heap */
     if(H5HF_close(fh, dxpl) < 0)
         TEST_ERROR
+    fh = NULL;
 
     /* Close the file */
     if(H5Fclose(file) < 0)
@@ -6497,7 +6501,7 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
 
     /* Initialize the buffer for objects to insert */
     for(u = 0; u < sizeof(obj); u++)
-        obj[u] = u;
+        obj[u] = (unsigned char)u;
 
     /* Insert first object into heap */
     if(H5HF_insert(fh, dxpl, sizeof(obj), obj, &heap_id1) < 0)
@@ -6562,6 +6566,7 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     /* Close the fractal heap */
     if(H5HF_close(fh, dxpl) < 0)
         TEST_ERROR
+    fh = NULL;
 
     /* Close the file */
     if(H5Fclose(file) < 0)
@@ -6722,6 +6727,7 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     /* Close the fractal heap */
     if(H5HF_close(fh, dxpl) < 0)
         FAIL_STACK_ERROR
+    fh = NULL;
 
     /* Close the file */
     if(H5Fclose(file) < 0)
@@ -6953,6 +6959,7 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     /* Close the fractal heap */
     if(H5HF_close(fh, dxpl) < 0)
         TEST_ERROR
+    fh = NULL;
 
     /* Close the file */
     if(H5Fclose(file) < 0)
@@ -7248,6 +7255,7 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     /* Close the fractal heap */
     if(H5HF_close(fh, dxpl) < 0)
         TEST_ERROR
+    fh = NULL;
 
     /* Close the file */
     if(H5Fclose(file) < 0)
@@ -7342,14 +7350,14 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_
      */
     TESTING("incremental object insertion and removal")
 
+    HDmemset(&obj1, 0, sizeof(obj1));
+    HDmemset(&obj2, 0, sizeof(obj2));
     for(i = 0; i < 100; i++) {
-        sprintf(obj1.b, "%s%d", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", i);
-
         for(j = 0; j < i; j++) {
-            sprintf(obj2.b, "%s%d", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", j);
-
             if(H5HF_remove(fh, dxpl, heap_id[j]) < 0)
                 FAIL_STACK_ERROR
+
+            HDsprintf(obj2.b, "%s%2d", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", j);
             if(H5HF_insert(fh, dxpl, (sizeof(obj2)), &obj2, heap_id[j]) < 0)
                 FAIL_STACK_ERROR
         } /* end for */
@@ -7360,6 +7368,7 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_
 
         /* Insert object */
         HDmemset(heap_id[i], 0, id_len);
+        HDsprintf(obj1.b, "%s%2d", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", i);
         if(H5HF_insert(fh, dxpl, (sizeof(obj1)), &obj1, heap_id[i]) < 0)
             FAIL_STACK_ERROR
     } /* end for */
@@ -13606,7 +13615,7 @@ error:
         H5MM_xfree(heap_id);
         if(fh)
             H5HF_close(fh, dxpl);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_filtered_huge() */
@@ -15294,7 +15303,7 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh, dxpl);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_random() */
@@ -15998,7 +16007,7 @@ main(void)
     fapl = h5_fileaccess();
     ExpressMode = GetTestExpress();
     if(ExpressMode > 1)
-	printf("***Express test mode on.  Some tests may be skipped\n");
+        HDprintf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Initialize heap creation parameters */
     init_small_cparam(&small_cparam);
@@ -16460,7 +16469,7 @@ HDfprintf(stderr, "Uncomment tests!\n");
 
     if(nerrors)
         goto error;
-    puts("All fractal heap tests passed.");
+    HDputs("All fractal heap tests passed.");
 
     /* Release space for the shared objects */
     H5MM_xfree(shared_wobj_g);
@@ -16479,14 +16488,14 @@ HDfprintf(stderr, "Uncomment cleanup!\n");
     return 0;
 
 error:
-    puts("*** TESTS FAILED ***");
+    HDputs("*** TESTS FAILED ***");
     H5E_BEGIN_TRY {
         H5MM_xfree(shared_wobj_g);
         H5MM_xfree(shared_robj_g);
         H5MM_xfree(shared_ids_g);
         H5MM_xfree(shared_lens_g);
         H5MM_xfree(shared_offs_g);
-	H5Pclose(fapl);
+        H5Pclose(fapl);
     } H5E_END_TRY;
     return 1;
 } /* end main() */
diff --git a/test/file_image.c b/test/file_image.c
index 2018973..7859626 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -666,6 +666,14 @@ error:
  *
  ******************************************************************************
  */
+/* Disable warning for "format not a string literal" here -QAK */
+/*
+ *      This pragma only needs to surround the snprintf() calls with
+ *      'member_file_name' in the code below, but early (4.4.7, at least) gcc only
+ *      allows diagnostic pragmas to be toggled outside of functions.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static int
 test_get_file_image(const char * test_banner,
                     const int file_name_num,
@@ -906,6 +914,7 @@ test_get_file_image(const char * test_banner,
 error:
     return 1;
 } /* end test_get_file_image() */
+#pragma GCC diagnostic pop
 
 
 /******************************************************************************
diff --git a/test/gheap.c b/test/gheap.c
index 393b4d2..7ddbd37 100644
--- a/test/gheap.c
+++ b/test/gheap.c
@@ -15,9 +15,9 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Tuesday, March 31, 1998
  *
- * Purpose:    Tests the global heap.  The global heap is the set of all
- *        collections but the collections are not related to one
- *        another by anything that appears in the file format.
+ * Purpose:     Tests the global heap.  The global heap is the set of all
+ *              collections but the collections are not related to one
+ *              another by anything that appears in the file format.
  */
 #include "h5test.h"
 #include "H5private.h"
@@ -59,33 +59,31 @@ const char *FILENAME[] = {
 /*-------------------------------------------------------------------------
  * Function:    test_1
  *
- * Purpose:    Writes a sequence of objects to the global heap where each
- *        object is larger than the one before.
+ * Purpose:     Writes a sequence of objects to the global heap where each
+ *              object is larger than the one before.
  *
- * Return:    Success:    0
+ * Return:      Success:    0
  *
- *        Failure:    number of errors
+ *              Failure:    number of errors
  *
  * Programmer:    Robb Matzke
  *              Tuesday, March 31, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_1 (hid_t fapl)
 {
-    hid_t    file = -1;
-    H5F_t     *f = NULL;
-    H5HG_t    *obj = NULL;
-    uint8_t    out[GHEAP_TEST_NOBJS];
-    uint8_t    in[GHEAP_TEST_NOBJS];
-    size_t    u;
-    size_t    size;
-    herr_t    status;
-    int        nerrors = 0;
-    char    filename[1024];
+    hid_t       file = H5I_INVALID_HID;
+    H5F_t       *f = NULL;
+    H5HG_t      *obj = NULL;
+    uint8_t     out[GHEAP_TEST_NOBJS];
+    uint8_t     in[GHEAP_TEST_NOBJS];
+    size_t      u;
+    size_t      size;
+    herr_t      status;
+    int         nerrors = 0;
+    char        filename[1024];
 
     TESTING("monotonically increasing lengths");
 
@@ -96,10 +94,10 @@ test_1 (hid_t fapl)
     /* Open a clean file */
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+        goto error;
     if(NULL == (f = (H5F_t *)H5I_object(file))) {
         H5_FAILED();
-        puts("    Unable to create file");
+        HDputs("    Unable to create file");
         goto error;
     }
 
@@ -115,11 +113,12 @@ test_1 (hid_t fapl)
         status = H5HG_insert(f, H5P_DATASET_XFER_DEFAULT, size, out, obj + u);
         if(status < 0) {
             H5_FAILED();
-            puts("    Unable to insert object into global heap");
+            HDputs("    Unable to insert object into global heap");
             nerrors++;
-        } else if(u && H5F_addr_gt(obj[u - 1].addr, obj[u].addr)) {
+        }
+        else if(u && H5F_addr_gt(obj[u - 1].addr, obj[u].addr)) {
             H5_FAILED();
-            puts("    Collection addresses are not monotonically increasing");
+            HDputs("    Collection addresses are not monotonically increasing");
             nerrors++;
         }
     }
@@ -133,11 +132,12 @@ test_1 (hid_t fapl)
         H5Eclear2(H5E_DEFAULT);
         if(NULL == H5HG_read(f, H5P_DATASET_XFER_DEFAULT, obj + u, in, NULL)) {
             H5_FAILED();
-            puts("    Unable to read object");
+            HDputs("    Unable to read object");
             nerrors++;
-        } else if(HDmemcmp(in, out, size)) {
+        }
+        else if(HDmemcmp(in, out, size)) {
             H5_FAILED();
-            puts("    Value read doesn't match value written");
+            HDputs("    Value read doesn't match value written");
             nerrors++;
         }
     }
@@ -146,15 +146,17 @@ test_1 (hid_t fapl)
     HDfree(obj);
     obj = NULL;
 
-    if(H5Fclose(file) < 0) goto error;
-    if(nerrors) goto error;
+    if(H5Fclose(file) < 0)
+        goto error;
+    if(nerrors)
+        goto error;
 
     PASSED();
     return 0;
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     if(obj)
         HDfree(obj);
@@ -165,32 +167,30 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_2
  *
- * Purpose:    Writes a sequence of objects to the global heap where each
- *        object is smaller than the one before.
+ * Purpose:     Writes a sequence of objects to the global heap where each
+ *              object is smaller than the one before.
  *
- * Return:    Success:    0
+ * Return:      Success:    0
  *
- *        Failure:        number of errors
+ *              Failure:     number of errors
  *
- * Programmer:    Robb Matzke
+ * Programmer:  Robb Matzke
  *              Tuesday, March 31, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_2 (hid_t fapl)
 {
-    hid_t    file = -1;
-    H5F_t     *f = NULL;
-    H5HG_t    *obj = NULL;
-    uint8_t    out[GHEAP_TEST_NOBJS];
-    uint8_t    in[GHEAP_TEST_NOBJS];
-    size_t    u;
-    size_t    size;
-    int        nerrors = 0;
-    char    filename[1024];
+    hid_t       file = H5I_INVALID_HID;
+    H5F_t       *f = NULL;
+    H5HG_t      *obj = NULL;
+    uint8_t     out[GHEAP_TEST_NOBJS];
+    uint8_t     in[GHEAP_TEST_NOBJS];
+    size_t      u;
+    size_t      size;
+    int         nerrors = 0;
+    char        filename[1024];
 
     TESTING("monotonically decreasing lengths");
 
@@ -201,10 +201,10 @@ test_2 (hid_t fapl)
     /* Open a clean file */
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+        goto error;
     if(NULL == (f = (H5F_t *)H5I_object(file))) {
         H5_FAILED();
-        puts("    Unable to create file");
+        HDputs("    Unable to create file");
         goto error;
     }
 
@@ -217,7 +217,7 @@ test_2 (hid_t fapl)
         H5Eclear2(H5E_DEFAULT);
         if (H5HG_insert (f, H5P_DATASET_XFER_DEFAULT, size, out, obj + u) < 0) {
             H5_FAILED();
-            puts("    Unable to insert object into global heap");
+            HDputs("    Unable to insert object into global heap");
             nerrors++;
         }
     }
@@ -231,11 +231,12 @@ test_2 (hid_t fapl)
         H5Eclear2(H5E_DEFAULT);
         if(NULL == H5HG_read(f, H5P_DATASET_XFER_DEFAULT, obj + u, in, NULL)) {
             H5_FAILED();
-            puts("    Unable to read object");
+            HDputs("    Unable to read object");
             nerrors++;
-        } else if (memcmp (in, out, size)) {
+        }
+        else if (memcmp (in, out, size)) {
             H5_FAILED();
-            puts("    Value read doesn't match value written");
+            HDputs("    Value read doesn't match value written");
             nerrors++;
         }
     }
@@ -244,15 +245,17 @@ test_2 (hid_t fapl)
     HDfree(obj);
     obj = NULL;
 
-    if (H5Fclose(file)<0) goto error;
-    if (nerrors) goto error;
+    if(H5Fclose(file) < 0)
+        goto error;
+    if(nerrors)
+        goto error;
 
     PASSED();
     return 0;
 
  error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     if(obj)
         HDfree(obj);
@@ -263,32 +266,30 @@ test_2 (hid_t fapl)
 /*-------------------------------------------------------------------------
  * Function:    test_3
  *
- * Purpose:    Creates a few global heap objects and then removes them all.
- *        The collection should also be removed.
+ * Purpose:     Creates a few global heap objects and then removes them all.
+ *              The collection should also be removed.
  *
- * Return:    Success:    0
+ * Return:      Success:    0
  *
- *        Failure:    number of errors
+ *              Failure:    number of errors
  *
  * Programmer:    Robb Matzke
  *              Tuesday, March 31, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_3 (hid_t fapl)
 {
-    hid_t    file = -1;
-    H5F_t     *f = NULL;
-    H5HG_t    *obj = NULL;
-    uint8_t    out[GHEAP_TEST_NOBJS];
-    size_t    u;
-    size_t    size;
-    herr_t    status;
-    int        nerrors = 0;
-    char    filename[1024];
+    hid_t       file = H5I_INVALID_HID;
+    H5F_t       *f = NULL;
+    H5HG_t      *obj = NULL;
+    uint8_t     out[GHEAP_TEST_NOBJS];
+    size_t      u;
+    size_t      size;
+    herr_t      status;
+    int         nerrors = 0;
+    char        filename[1024];
 
     TESTING("complete object removal");
 
@@ -299,11 +300,11 @@ test_3 (hid_t fapl)
     /* Open a clean file */
     h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+        goto error;
     if(NULL == (f = (H5F_t *)H5I_object(file))) {
-    H5_FAILED();
-    puts("    Unable to create file");
-    goto error;
+        H5_FAILED();
+        HDputs("    Unable to create file");
+        goto error;
     }
 
     /* Create some stuff */
@@ -314,7 +315,7 @@ test_3 (hid_t fapl)
         status = H5HG_insert(f, H5P_DATASET_XFER_DEFAULT, size, out, obj + u);
         if (status<0) {
             H5_FAILED();
-            puts("    Unable to insert object into global heap");
+            HDputs("    Unable to insert object into global heap");
             nerrors++;
         }
     }
@@ -324,7 +325,7 @@ test_3 (hid_t fapl)
         status = H5HG_remove(f, H5P_DATASET_XFER_DEFAULT, obj + u);
         if (status<0) {
             H5_FAILED();
-            puts("    Unable to remove object");
+            HDputs("    Unable to remove object");
             nerrors++;
         }
     }
@@ -333,15 +334,17 @@ test_3 (hid_t fapl)
     HDfree(obj);
     obj = NULL;
 
-    if (H5Fclose(file)<0) goto error;
-    if (nerrors) goto error;
+    if(H5Fclose(file) < 0)
+        goto error;
+    if(nerrors)
+        goto error;
 
     PASSED();
     return 0;
 
  error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     if(obj)
         HDfree(obj);
@@ -352,33 +355,31 @@ test_3 (hid_t fapl)
 /*-------------------------------------------------------------------------
  * Function:    test_4
  *
- * Purpose:    Tests the H5HG_remove() feature by writing lots of objects
- *        and occassionally removing some.  When we're done they're all
- *        removed.
+ * Purpose:     Tests the H5HG_remove() feature by writing lots of objects
+ *              and occassionally removing some.  When we're done they're all
+ *              removed.
  *
- * Return:    Success:    0
+ * Return:      Success:    0
  *
- *        Failure:    number of errors
+ *              Failure:    number of errors
  *
  * Programmer:    Robb Matzke
  *              Tuesday, March 31, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_4 (hid_t fapl)
 {
-    hid_t    file = -1;
-    H5F_t     *f = NULL;
-    H5HG_t    *obj = NULL;
-    uint8_t    out[GHEAP_TEST_NOBJS];
-    size_t    u;
-    size_t    size;
-    herr_t    status;
-    int        nerrors = 0;
-    char    filename[1024];
+    hid_t       file = H5I_INVALID_HID;
+    H5F_t       *f = NULL;
+    H5HG_t      *obj = NULL;
+    uint8_t     out[GHEAP_TEST_NOBJS];
+    size_t      u;
+    size_t      size;
+    herr_t      status;
+    int         nerrors = 0;
+    char        filename[1024];
 
     TESTING("partial object removal");
 
@@ -389,10 +390,10 @@ test_4 (hid_t fapl)
     /* Open a clean file */
     h5_fixname(FILENAME[3], fapl, filename, sizeof filename);
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+        goto error;
     if(NULL == (f = (H5F_t *)H5I_object(file))) {
         H5_FAILED();
-        puts("    Unable to create file");
+        HDputs("    Unable to create file");
         goto error;
     }
 
@@ -404,21 +405,20 @@ test_4 (hid_t fapl)
         status = H5HG_insert(f, H5P_DATASET_XFER_DEFAULT, size, out, obj + u);
         if (status<0) {
             H5_FAILED();
-            puts("    Unable to insert object into global heap");
+            HDputs("    Unable to insert object into global heap");
             nerrors++;
         }
 
-        /*
-        * Remove every third one beginning with the second, but after the
-        * next one has already been inserted.  That is, insert A, B, C;
-        * remove B, insert D, E, F; remove E; etc.
-        */
+        /* Remove every third one beginning with the second, but after the
+         * next one has already been inserted.  That is, insert A, B, C;
+         * remove B, insert D, E, F; remove E; etc.
+         */
         if(1 == (u % 3)) {
             H5Eclear2(H5E_DEFAULT);
             status = H5HG_remove(f, H5P_DATASET_XFER_DEFAULT, obj + u - 1);
             if (status<0) {
                 H5_FAILED();
-                puts("    Unable to remove object");
+                HDputs("    Unable to remove object");
                 nerrors++;
             }
             HDmemset(obj + u - 1, 0, sizeof *obj);
@@ -429,15 +429,17 @@ test_4 (hid_t fapl)
     HDfree(obj);
     obj = NULL;
 
-    if (H5Fclose(file)<0) goto error;
-    if (nerrors) goto error;
+    if(H5Fclose(file) < 0)
+        goto error;
+    if(nerrors)
+        goto error;
 
     PASSED();
     return 0;
 
  error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     if(obj)
         HDfree(obj);
@@ -448,32 +450,30 @@ test_4 (hid_t fapl)
 /*-------------------------------------------------------------------------
  * Function:    test_ooo_indices
  *
- * Purpose:    Tests that indices can be stored out of order.  This can
+ * Purpose:     Tests that indices can be stored out of order.  This can
  *              happen when the indices "wrap around" due to many
  *              insertions and deletions (for example, from rewriting a
  *              VL dataset).
  *
- * Return:    Success:    0
+ * Return:      Success:    0
  *
- *        Failure:    number of errors
+ *              Failure:    number of errors
  *
  * Programmer:    Neil Fortner
  *              Monday, October 26, 2009
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 test_ooo_indices(hid_t fapl)
 {
-    hid_t    file = -1;
-    H5F_t     *f = NULL;
+    hid_t       file = H5I_INVALID_HID;
+    H5F_t       *f = NULL;
     unsigned    i, j;
-    H5HG_t    *obj = NULL;
-    herr_t    status;
-    int        nerrors=0;
-    char    filename[1024];
+    H5HG_t      *obj = NULL;
+    herr_t      status;
+    int         nerrors = 0;
+    char        filename[1024];
 
     TESTING("out of order indices");
 
@@ -486,16 +486,18 @@ test_ooo_indices(hid_t fapl)
         goto error;
     if(NULL == (f = (H5F_t *)H5I_object(file))) {
         H5_FAILED();
-        puts("    Unable to create file");
+        HDputs("    Unable to create file");
         goto error;
-    } /* end if */
+    }
 
     /* Alternately insert 1000 entries and remove the previous group of 1000
-     * entries, until the indices wrap around */
-    for(i=0; i<66; i++) {
+     * entries, until the indices wrap around.
+     */
+    for(i = 0; i < 66; i++) {
         /* Insert 1000 entries.  The index into the obj array will alternate up
          * and down by 1000 so the previous set of insertions is preserved and
-         * can be deleted. */
+         * can be deleted.
+         */
         for(j=1000*((~i&1)); j<1000*((~i&1)+1); j++) {
             H5Eclear2(H5E_DEFAULT);
             status = H5HG_insert(f, H5P_DATASET_XFER_DEFAULT, sizeof(j), &j, &obj[j]);
@@ -505,7 +507,7 @@ test_ooo_indices(hid_t fapl)
             /* Check that the index is as expected */
             if(obj[j].idx != ((1000 * i) + j - (1000 * ((~i & 1)))) % ((1u << 16) - 1) + 1)
                 GHEAP_REPEATED_ERR("    Unexpected global heap index");
-        } /* end for */
+        }
 
         /* Remove the previous 1000 entries */
         if(i>0)
@@ -514,20 +516,21 @@ test_ooo_indices(hid_t fapl)
                 status = H5HG_remove(f, H5P_DATASET_XFER_DEFAULT, &obj[j]);
                 if (status<0)
                     GHEAP_REPEATED_ERR("    Unable to remove object from global heap");
-            } /* end for */
-    } /* end for */
+            }
+    }
 
     /* The indices should have "wrapped around" on the last iteration */
     HDassert(obj[534].idx == 65535);
     HDassert(obj[535].idx == 1);
 
     /* Reopen the file */
-    if (H5Fclose(file)<0) goto error;
+    if (H5Fclose(file) < 0)
+        goto error;
     if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
         goto error;
     if(NULL == (f = (H5F_t *)H5I_object(file))) {
         H5_FAILED();
-        puts("    Unable to open file");
+        HDputs("    Unable to open file");
         goto error;
     } /* end if */
 
@@ -537,14 +540,15 @@ test_ooo_indices(hid_t fapl)
             goto error;
         if(i != j) {
             H5_FAILED();
-            puts("    Incorrect read value");
+            HDputs("    Incorrect read value");
             goto error;
-        } /* end if */
-    } /* end for */
-
-    if (H5Fclose(file)<0) goto error;
-    if (nerrors) goto error;
+        }
+    }
 
+    if(H5Fclose(file) < 0)
+        goto error;
+    if(nerrors)
+        goto error;
     HDfree(obj);
     obj = NULL;
 
@@ -553,7 +557,7 @@ test_ooo_indices(hid_t fapl)
 
  error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     if(obj)
         HDfree(obj);
@@ -562,47 +566,47 @@ test_ooo_indices(hid_t fapl)
 
 
 /*-------------------------------------------------------------------------
- * Function:    main
- *
- * Purpose:    Tests global heap.
+ * Function:	main
  *
- * Return:    Success:    zero
+ * Purpose:     Tests global heap.
  *
- *        Failure:    non-zero
- *
- * Programmer:    Robb Matzke
- *              Tuesday, March 31, 1998
- *
- * Modifications:
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  *-------------------------------------------------------------------------
  */
 int
 main (void)
 {
-    int        nerrors=0;
-    hid_t    fapl;
+    int         nerrors = 0;
+    hid_t       fapl_id = H5I_INVALID_HID;
 
     h5_reset();
-    fapl = h5_fileaccess();
+    if ((fapl_id = h5_fileaccess()) < 0)
+        goto error;
 
-    nerrors += test_1(fapl);
-    nerrors += test_2(fapl);
-    nerrors += test_3(fapl);
-    nerrors += test_4(fapl);
-    nerrors += test_ooo_indices(fapl);
+    nerrors += test_1(fapl_id);
+    nerrors += test_2(fapl_id);
+    nerrors += test_3(fapl_id);
+    nerrors += test_4(fapl_id);
+    nerrors += test_ooo_indices(fapl_id);
 
     /* Verify symbol table messages are cached */
-    nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
+    nerrors += (h5_verify_cached_stabs(FILENAME, fapl_id) < 0 ? 1 : 0);
 
     if (nerrors)
         goto error;
-    puts("All global heap tests passed.");
-    h5_cleanup(FILENAME, fapl);
-    return 0;
+
+    HDputs("All global heap tests passed.");
+    
+    h5_cleanup(FILENAME, fapl_id);
+    HDexit(EXIT_SUCCESS);
 
  error:
-    puts("*** TESTS FAILED ***");
-    return 1;
-}
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl_id);
+    } H5E_END_TRY;
+
+    HDputs("*** TESTS FAILED ***");
+    HDexit(EXIT_FAILURE);
+} /* end main() */
 
diff --git a/test/h5test.c b/test/h5test.c
index fb582ff..e370c6d 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -42,7 +42,10 @@
  *      use for HDF5 file access.  The first word in the
  *      value is the name of the driver and subsequent data
  *      is interpreted according to the driver.  See
- *      h5_fileaccess() for details.
+ *      h5_get_vfd_fapl() for details.
+ *
+ * HDF5_LIBVER_BOUNDS:    This string describes what library version bounds to
+ *      use for HDF5 file access.  See h5_get_libver_fapl() for details.
  *
  * HDF5_PREFIX:    A string to add to the beginning of all serial test
  *      file names.  This can be used to run tests in a
@@ -95,9 +98,10 @@ static const char *multi_letters = "msbrglo";
 static H5E_auto2_t err_func = NULL;
 
 static herr_t h5_errors(hid_t estack, void *client_data);
-static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix, 
+static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix,
                               char *fullname, size_t size);
 
+
 
 /*-------------------------------------------------------------------------
  * Function:  h5_errors
@@ -143,47 +147,8 @@ h5_clean_files(const char *base_name[], hid_t fapl)
     int i;
 
     for(i = 0; base_name[i]; i++) {
-        char filename[1024];
-        char temp[2048];
-        hid_t driver;
-
-        if(NULL == h5_fixname(base_name[i], fapl, filename, sizeof(filename)))
-            continue;
-
-        driver = H5Pget_driver(fapl);
-
-        if(driver == H5FD_FAMILY) {
-            int j;
-
-            for(j = 0; /*void*/; j++) {
-                HDsnprintf(temp, sizeof temp, filename, j);
-
-                if(HDaccess(temp, F_OK) < 0)
-                    break;
-
-                HDremove(temp);
-            } /* end for */
-        } else if(driver == H5FD_CORE) {
-            hbool_t backing;        /* Whether the core file has backing store */
-
-            H5Pget_fapl_core(fapl, NULL, &backing);
-
-            /* If the file was stored to disk with bacing store, remove it */
-            if(backing)
-                HDremove(filename);
-        } else if (driver == H5FD_MULTI) {
-            H5FD_mem_t mt;
-
-            HDassert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
-
-            for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
-                HDsnprintf(temp, sizeof temp, "%s-%c.h5", filename, multi_letters[mt]);
-                HDremove(temp); /*don't care if it fails*/
-            } /* end for */
-        } else {
-            HDremove(filename);
-        }
-    } /* end for */
+        h5_delete_test_file(base_name[i], fapl);
+    }
 
     /* Close the FAPL used to access the file */
     H5Pclose(fapl);
@@ -209,6 +174,14 @@ h5_clean_files(const char *base_name[], hid_t fapl)
  *
  *-------------------------------------------------------------------------
  */
+/* Disable warning for "format not a string literal" here -QAK */
+/*
+ *      This pragma only needs to surround the snprintf() calls with
+ *      sub_filename in the code below, but early (4.4.7, at least) gcc only
+ *      allows diagnostic pragmas to be toggled outside of functions.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 void
 h5_delete_test_file(const char *base_name, hid_t fapl)
 {
@@ -251,13 +224,14 @@ h5_delete_test_file(const char *base_name, hid_t fapl)
         for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
             HDsnprintf(sub_filename, sizeof(sub_filename), "%s-%c.h5", filename, multi_letters[mt]);
             HDremove(sub_filename);
-        } /* end for */
+        }
     } else {
         HDremove(filename);
-    } /* end if */
+    } /* end driver selection tree */
 
     return;
 } /* end h5_delete_test_file() */
+#pragma GCC diagnostic pop
 
 
 /*-------------------------------------------------------------------------
@@ -327,6 +301,35 @@ h5_cleanup(const char *base_name[], hid_t fapl)
 
 
 /*-------------------------------------------------------------------------
+ * Function:    h5_test_shutdown
+ *
+ * Purpose:     Performs any special test cleanup required before the test
+ *              ends.
+ *
+ *              NOTE: This function should normally only be called once
+ *              in a given test, usually just before leaving main(). It
+ *              is intended for use in the single-file unit tests, not
+ *              testhdf5.
+ *
+ * Return:      void
+ *
+ * Programmer:  Dana Robinson
+ *              February 2016
+ *
+ *-------------------------------------------------------------------------
+ */
+void
+h5_test_shutdown(void)
+{
+
+    /* Restore the original error reporting routine */
+    h5_restore_err();
+
+    return;
+} /* end h5_test_shutdown() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    h5_restore_err
  *
  * Purpose:     Restore the default error handler.
@@ -404,6 +407,39 @@ h5_reset(void)
 
 
 /*-------------------------------------------------------------------------
+ * Function:    h5_test_init
+ *
+ * Purpose:     Performs any special actions before the test begins.
+ *
+ *              NOTE: This function should normally only be called once
+ *              in a given test, usually at the beginning of main(). It
+ *              is intended for use in the single-file unit tests, not
+ *              testhdf5.
+ *
+ * Return:      void
+ *
+ * Programmer:  Dana Robinson
+ *              February 2016
+ *
+ *-------------------------------------------------------------------------
+ */
+void
+h5_test_init(void)
+{
+    HDfflush(stdout);
+    HDfflush(stderr);
+    H5close();
+
+    /* Save current error stack reporting routine and redirect to our local one */
+    HDassert(err_func == NULL);
+    H5Eget_auto2(H5E_DEFAULT, &err_func, NULL);
+    H5Eset_auto2(H5E_DEFAULT, h5_errors, NULL);
+
+    return;
+} /* end h5_test_init() */
+
+
+/*-------------------------------------------------------------------------
  * Function:  h5_fixname
  *
  * Purpose:  Create a file name from a file base name like `test' and
@@ -431,6 +467,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
     return (h5_fixname_real(base_name, fapl, ".h5", fullname, size));
 }
 
+
 
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname_no_suffix
@@ -451,6 +488,7 @@ h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t s
     return (h5_fixname_real(base_name, fapl, NULL, fullname, size));
 }
 
+
 
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname_real
@@ -475,10 +513,11 @@ h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t s
  *-------------------------------------------------------------------------
  */
 static char *
-h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, 
+h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
                 char *fullname, size_t size)
 {
     const char     *prefix = NULL;
+    const char     *env = NULL;    /* HDF5_DRIVER environment variable     */
     char           *ptr, last = '\0';
     const char     *suffix = _suffix;
     size_t          i, j;
@@ -506,7 +545,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
     /* Must first check fapl is not H5P_DEFAULT (-1) because H5FD_XXX
      * could be of value -1 if it is not defined.
      */
-    isppdriver = H5P_DEFAULT != fapl && (H5FD_MPIO==driver);
+    isppdriver = H5P_DEFAULT != fapl && (H5FD_MPIO == driver);
 
     /* Check HDF5_NOCLEANUP environment setting.
      * (The #ifdef is needed to prevent compile failure in case MPI is not
@@ -701,8 +740,8 @@ h5_rmprefix(const char *filename)
  *              but with a file driver set according to the constant or
  *              environment variable HDF5_DRIVER
  *
- * Return:      Success:  A file access property list
- *              Failure:  -1
+ * Return:      Success:    A file access property list
+ *              Failure:    H5I_INVALID_HID
  *
  * Programmer:  Robb Matzke
  *              Thursday, November 19, 1998
@@ -712,125 +751,270 @@ h5_rmprefix(const char *filename)
 hid_t
 h5_fileaccess(void)
 {
-    const char  *val = NULL;
-    const char  *name;
-    char        s[1024];
-    hid_t       fapl = -1;
+    hid_t       fapl_id = H5I_INVALID_HID;
+
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        goto error;
+
+    /* Attempt to set up a file driver first */
+    if(h5_get_vfd_fapl(fapl_id) < 0)
+        goto error;
+
+    /* Finally, check for libver bounds */
+    if(h5_get_libver_fapl(fapl_id) < 0)
+        goto error;
+ 
+    return fapl_id;
+
+error:
+    if(fapl_id != H5I_INVALID_HID)
+        H5Pclose(fapl_id);
+    return H5I_INVALID_HID;
+} /* end h5_fileaccess() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    h5_fileaccess_flags
+ *
+ * Purpose:     Returns a file access template which is the default template
+ *              but with a file driver, VOL connector, or libver bound set
+ *              according to a constant or environment variable
+ *
+ * Return:      Success:    A file access property list
+ *              Failure:    H5I_INVALID_HID
+ *
+ * Programmer:  Robb Matzke
+ *              Thursday, November 19, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+hid_t
+h5_fileaccess_flags(unsigned flags)
+{
+    hid_t       fapl_id = H5I_INVALID_HID;
 
-    /* First use the environment variable, then the constant */
-    val = HDgetenv("HDF5_DRIVER");
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        goto error;
+
+    /* Attempt to set up a file driver first */
+    if((flags & H5_FILEACCESS_VFD) && h5_get_vfd_fapl(fapl_id) < 0)
+        goto error;
+
+    /* Finally, check for libver bounds */
+    if((flags & H5_FILEACCESS_LIBVER) && h5_get_libver_fapl(fapl_id) < 0)
+        goto error;
+
+    return fapl_id;
+
+error:
+    if(fapl_id != H5I_INVALID_HID)
+        H5Pclose(fapl_id);
+    return H5I_INVALID_HID;
+} /* end h5_fileaccess_flags() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    h5_get_vfd_fapl
+ *
+ * Purpose:     Sets the file driver for a FAPL according to the value specified
+ *              in the constant or environment variable "HDF5_DRIVER".
+ *
+ * Return:      Success:    0
+ *              Failure:    -1
+ *
+ * Programmer:  Dana Robinson
+ *              February 2016
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+h5_get_vfd_fapl(hid_t fapl)
+{
+    const char  *env = NULL;    /* HDF5_DRIVER environment variable     */
+    const char  *tok = NULL;    /* strtok pointer                       */
+    char        *lasts = NULL;  /* Context pointer for strtok_r() call */
+    char        buf[1024];      /* buffer for tokenizing HDF5_DRIVER    */
+
+    /* Get the environment variable, if it exists */
+    env = HDgetenv("HDF5_DRIVER");
 #ifdef HDF5_DRIVER
-    if(!val)
-        val = HDF5_DRIVER;
+    /* Use the environment variable, then the compile-time constant */
+    if(!env)
+        env = HDF5_DRIVER;
 #endif
 
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        return -1;
-    if(!val || !*val)
-        return fapl; /* use default */
-
-    HDstrncpy(s, val, sizeof s);
-    s[sizeof(s)-1] = '\0';
-    if(NULL == (name = HDstrtok(s, " \t\n\r")))
-        return fapl;
-
-    if(!HDstrcmp(name, "sec2")) {
-        /* Unix read() and write() system calls */
-        if (H5Pset_fapl_sec2(fapl) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "stdio")) {
+    /* If the environment variable was not set, just return
+     * without modifying the FAPL.
+     */
+    if(!env || !*env)
+        goto done;
+
+    /* Get the first 'word' of the environment variable.
+     * If it's nothing (environment variable was whitespace)
+     * just return the default fapl.
+     */
+    HDstrncpy(buf, env, sizeof(buf));
+    buf[sizeof(buf) - 1] = '\0';
+    if(NULL == (tok = HDstrtok_r(buf, " \t\n\r", &lasts)))
+        goto done;
+
+    if(!HDstrcmp(tok, "sec2")) {
+        /* POSIX (section 2) read() and write() system calls */
+        if(H5Pset_fapl_sec2(fapl) < 0)
+            goto error;
+    } else if(!HDstrcmp(tok, "stdio")) {
         /* Standard C fread() and fwrite() system calls */
-        if (H5Pset_fapl_stdio(fapl) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "core")) {
+        if(H5Pset_fapl_stdio(fapl) < 0)
+            goto error;
+    } else if(!HDstrcmp(tok, "core")) {
         /* In-memory driver settings (backing store on, 1 MB increment) */
-        if(H5Pset_fapl_core(fapl, (size_t)1, TRUE) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "core_paged")) {
+        if(H5Pset_fapl_core(fapl, (size_t)H5_MB, TRUE) < 0)
+            goto error;
+    } else if(!HDstrcmp(tok, "core_paged")) {
         /* In-memory driver with write tracking and paging on */
-        if(H5Pset_fapl_core(fapl, (size_t)1, TRUE) < 0)
-            return -1;
+        if(H5Pset_fapl_core(fapl, (size_t)H5_MB, TRUE) < 0)
+            goto error;
         if(H5Pset_core_write_tracking(fapl, TRUE, (size_t)4096) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "split")) {
+            goto error;
+     } else if(!HDstrcmp(tok, "split")) {
         /* Split meta data and raw data each using default driver */
-        if(H5Pset_fapl_split(fapl,
-            "-m.h5", H5P_DEFAULT,
-            "-r.h5", H5P_DEFAULT) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "multi")) {
+        if(H5Pset_fapl_split(fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
+            goto error;
+    } else if(!HDstrcmp(tok, "multi")) {
         /* Multi-file driver, general case of the split driver */
-        H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
-        hid_t memb_fapl[H5FD_MEM_NTYPES];
-        const char *memb_name[H5FD_MEM_NTYPES];
-        char *sv[H5FD_MEM_NTYPES];
-        haddr_t memb_addr[H5FD_MEM_NTYPES];
+        H5FD_mem_t  memb_map[H5FD_MEM_NTYPES];
+        hid_t       memb_fapl[H5FD_MEM_NTYPES];
+        const char  *memb_name[H5FD_MEM_NTYPES];
+        char        *sv[H5FD_MEM_NTYPES];
+        haddr_t     memb_addr[H5FD_MEM_NTYPES];
         H5FD_mem_t  mt;
 
-        HDmemset(memb_map, 0, sizeof memb_map);
-        HDmemset(memb_fapl, 0, sizeof memb_fapl);
-        HDmemset(memb_name, 0, sizeof memb_name);
-        HDmemset(memb_addr, 0, sizeof memb_addr);
+        HDmemset(memb_map, 0, sizeof(memb_map));
+        HDmemset(memb_fapl, 0, sizeof(memb_fapl));
+        HDmemset(memb_name, 0, sizeof(memb_name));
+        HDmemset(memb_addr, 0, sizeof(memb_addr));
 
-        HDassert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
+        HDassert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
         for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, mt)) {
             memb_fapl[mt] = H5P_DEFAULT;
-            if(NULL == (sv[mt] = (char *)HDmalloc(H5TEST_MULTI_FILENAME_LEN)))
-                return -1;
+            sv[mt] = (char *)HDmalloc(H5TEST_MULTI_FILENAME_LEN);
+            HDassert(sv[mt]);
             HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
             memb_name[mt] = sv[mt];
             memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
         } /* end for */
 
         if(H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0)
-            return -1;
+            goto error;
 
         for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, mt))
             HDfree(sv[mt]);
-    }
-    else if(!HDstrcmp(name, "family")) {
-        hsize_t fam_size = 100*1024*1024; /*100 MB*/
-
+    } else if(!HDstrcmp(tok, "family")) {
         /* Family of files, each 1MB and using the default driver */
-        if((val = HDstrtok(NULL, " \t\n\r")))
-            fam_size = (hsize_t)(HDstrtod(val, NULL) * 1024*1024);
-        if(H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT)<0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "log")) {
-        unsigned log_flags = H5FD_LOG_LOC_IO | H5FD_LOG_ALLOC;
+        hsize_t fam_size = 100 * 1024 * 1024;   /* 100 MB */
 
+        /* Was a family size specified in the environment variable? */
+        if((tok = HDstrtok_r(NULL, " \t\n\r", &lasts)))
+            fam_size = (hsize_t)(HDstrtod(tok, NULL) * 1024 * 1024);
+        if(H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT) < 0)
+            goto error;
+    } else if(!HDstrcmp(tok, "log")) {
         /* Log file access */
-        if((val = HDstrtok(NULL, " \t\n\r")))
-            log_flags = (unsigned)HDstrtol(val, NULL, 0);
+        unsigned log_flags = H5FD_LOG_LOC_IO | H5FD_LOG_ALLOC;
+
+        /* Were special log file flags specified in the environment variable? */
+        if((tok = HDstrtok_r(NULL, " \t\n\r", &lasts)))
+            log_flags = (unsigned)HDstrtol(tok, NULL, 0);
+
         if(H5Pset_fapl_log(fapl, NULL, log_flags, (size_t)0) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "direct")) {
+            goto error;
 #ifdef H5_HAVE_DIRECT
-        /* Linux direct read() and write() system calls.  Set memory boundary, file block size,
-         * and copy buffer size to the default values. */
+    } else if(!HDstrcmp(tok, "direct")) {
+        /* Linux direct read() and write() system calls.  Set memory boundary,
+         * file block size, and copy buffer size to the default values.
+         */
         if(H5Pset_fapl_direct(fapl, 1024, 4096, 8 * 4096) < 0)
-            return -1;
+            goto error;
 #endif
-    }
-    else if(!HDstrcmp(name, "latest")) {
+    } else if(!HDstrcmp(tok, "latest")) {
         /* use the latest format */
         if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-            return -1;
+            goto error;
     }
     else {
         /* Unknown driver */
-        return -1;
-    }
+        goto error;
+    } /* end if */
 
-    return fapl;
-}
+done:
+    return 0;
+
+error:
+    return -1;
+} /* end h5_get_vfd_fapl() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    h5_get_libver_fapl
+ *
+ * Purpose:     Sets the library version bounds for a FAPL according to the
+ *              value in the constant or environment variable "HDF5_LIBVER_BOUNDS".
+ *
+ * Return:      Success:    0
+ *              Failure:    -1
+ *
+ * Programmer:  Quincey Koziol
+ *              November 2018
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+h5_get_libver_fapl(hid_t fapl)
+{
+    const char  *env = NULL;    /* HDF5_DRIVER environment variable     */
+    const char  *tok = NULL;    /* strtok pointer                       */
+    char        *lasts = NULL;  /* Context pointer for strtok_r() call */
+    char        buf[1024];      /* buffer for tokenizing HDF5_DRIVER    */
+
+    /* Get the environment variable, if it exists */
+    env = HDgetenv("HDF5_LIBVER_BOUNDS");
+#ifdef HDF5_LIBVER_BOUNDS
+    /* Use the environment variable, then the compile-time constant */
+    if(!env)
+        env = HDF5_LIBVER_BOUNDS;
+#endif
+
+    /* If the environment variable was not set, just return
+     * without modifying the FAPL.
+     */
+    if(!env || !*env)
+        goto done;
+
+    /* Get the first 'word' of the environment variable.
+     * If it's nothing (environment variable was whitespace)
+     * just return the default fapl.
+     */
+    HDstrncpy(buf, env, sizeof(buf));
+    buf[sizeof(buf) - 1] = '\0';
+    if(NULL == (tok = HDstrtok_r(buf, " \t\n\r", &lasts)))
+        goto done;
+
+    if(!HDstrcmp(tok, "latest")) {
+        /* use the latest format */
+        if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+            goto error;
+    } /* end if */
+    else {
+        /* Unknown setting */
+        goto error;
+    } /* end else */
+
+done:
+    return 0;
+
+error:
+    return -1;
+} /* end h5_get_libver_fapl() */
 
 
 /*-------------------------------------------------------------------------
@@ -954,7 +1138,7 @@ h5_set_info_object(void)
     int    ret_value=0;
 
     /* handle any MPI INFO hints via $HDF5_MPI_INFO */
-    if ((envp = getenv("HDF5_MPI_INFO")) != NULL){
+    if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL){
         char *next, *valp;
 
         valp = envp = next = HDstrdup(envp);
@@ -1016,7 +1200,7 @@ h5_set_info_object(void)
 
                 /* actually set the darned thing */
                 if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) {
-                    printf("MPI_Info_set failed\n");
+                    HDprintf("MPI_Info_set failed\n");
                     ret_value = -1;
                 }
             }
@@ -1079,6 +1263,14 @@ h5_dump_info_object(MPI_Info info)
  *
  *-------------------------------------------------------------------------
  */
+/* Disable warning for "format not a string literal" here -QAK */
+/*
+ *      This pragma only needs to surround the snprintf() calls with
+ *      temp in the code below, but early (4.4.7, at least) gcc only
+ *      allows diagnostic pragmas to be toggled outside of functions.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 h5_stat_size_t
 h5_get_file_size(const char *filename, hid_t fapl)
 {
@@ -1180,6 +1372,7 @@ h5_get_file_size(const char *filename, hid_t fapl)
 
     return(-1);
 } /* end get_file_size() */
+#pragma GCC diagnostic pop
 
 /*
  * This routine is designed to provide equivalent functionality to 'printf'
@@ -1192,9 +1385,9 @@ print_func(const char *format, ...)
   va_list arglist;
   int ret_value;
 
-  va_start(arglist, format);
+  HDva_start(arglist, format);
   ret_value = vprintf(format, arglist);
-  va_end(arglist);
+  HDva_end(arglist);
   return ret_value;
 }
 
@@ -1279,7 +1472,7 @@ getenv_all(MPI_Comm comm, int root, const char* name)
     int len;
     static char* env = NULL;
 
-    assert(name);
+    HDassert(name);
 
     MPI_Initialized(&mpi_initialized);
     MPI_Finalized(&mpi_finalized);
@@ -1287,7 +1480,7 @@ getenv_all(MPI_Comm comm, int root, const char* name)
     if(mpi_initialized && !mpi_finalized) {
         MPI_Comm_rank(comm, &mpi_rank);
         MPI_Comm_size(comm, &mpi_size);
-        assert(root < mpi_size);
+        HDassert(root < mpi_size);
 
         /* The root task does the getenv call
          * and sends the result to the other tasks */
@@ -1377,7 +1570,7 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name)
     while((nread = HDread(fd_old, buf, (size_t)READ_BUF_SIZE)) > 0)
         if(HDwrite(fd_new, buf, (size_t)nread) < 0)
             goto error;
- 
+
     /* Close files */
     if(HDclose(fd_old) < 0)
         goto error;
@@ -1405,15 +1598,11 @@ error:
  *
  * Purpose:     Callback function for h5_verify_cached_stabs.
  *
- * Return:      Success:        0
- *
- *              Failure:        -1
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Neil Fortner
  *              Tuesday, April 12, 2011
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1421,9 +1610,9 @@ h5_verify_cached_stabs_cb(hid_t oid, const char H5_ATTR_UNUSED *name,
     const H5O_info_t *oinfo, void H5_ATTR_UNUSED *udata)
 {
     if(oinfo->type == H5O_TYPE_GROUP)
-        return(H5G__verify_cached_stabs_test(oid));
+        return H5G__verify_cached_stabs_test(oid);
     else
-        return(0);
+        return SUCCEED;
 } /* end h5_verify_cached_stabs_cb() */
 
 
diff --git a/test/h5test.h b/test/h5test.h
index b331044..a2606dd 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -102,7 +102,7 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
  * the H5_FAILED() macro is invoked automatically when an API function fails.
  */
 #define TESTING(WHAT)  {printf("Testing %-62s",WHAT); fflush(stdout);}
-#define TESTING_2(WHAT)  {printf(" Testing %-62s",WHAT); fflush(stdout);}
+#define TESTING_2(WHAT)  {printf("  Testing %-60s",WHAT); fflush(stdout);}
 #define PASSED()  {puts(" PASSED");fflush(stdout);}
 #define H5_FAILED()  {puts("*FAILED*");fflush(stdout);}
 #define H5_WARNING()  {puts("*WARNING*");fflush(stdout);}
@@ -121,6 +121,10 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 #define ALARM_ON  TestAlarmOn()
 #define ALARM_OFF  HDalarm(0)
 
+/* Flags for h5_fileaccess_flags() */
+#define H5_FILEACCESS_VFD       0x01
+#define H5_FILEACCESS_LIBVER    0x02
+
 /*
  * The methods to compare the equality of floating-point values:
  *    1. XXX_ABS_EQUAL - check if the difference is smaller than the
@@ -150,6 +154,7 @@ H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, s
 H5TEST_DLL char *h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size);
 H5TEST_DLL char *h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size);
 H5TEST_DLL hid_t h5_fileaccess(void);
+H5TEST_DLL hid_t h5_fileaccess_flags(unsigned flags);
 H5TEST_DLL void h5_no_hwconv(void);
 H5TEST_DLL const char *h5_rmprefix(const char *filename);
 H5TEST_DLL void h5_reset(void);
@@ -160,15 +165,20 @@ H5TEST_DLL int print_func(const char *format, ...);
 H5TEST_DLL int h5_make_local_copy(const char *origfilename, const char *local_copy_name);
 H5TEST_DLL herr_t h5_verify_cached_stabs(const char *base_name[], hid_t fapl);
 
-/* Functions that will replace VFD-dependent functions that violate
- * the single responsibility principle. Unlike their predecessors,
- * these new functions do not have hidden side effects.
- */
-/* h5_fileaccess() replacement */
+/* Functions that will replace components of a FAPL */
+H5TEST_DLL herr_t h5_get_vfd_fapl(hid_t fapl_id);
+H5TEST_DLL herr_t h5_get_libver_fapl(hid_t fapl_id);
+
 /* h5_clean_files() replacements */
 H5TEST_DLL void h5_delete_test_file(const char *base_name, hid_t fapl);
 H5TEST_DLL void h5_delete_all_test_files(const char *base_name[], hid_t fapl);
 
+/* h5_reset() replacement */
+H5TEST_DLL void h5_test_init(void);
+
+/* h5_cleanup() replacement */
+H5TEST_DLL void h5_test_shutdown(void);
+
 /* Routines for operating on the list of tests (for the "all in one" tests) */
 H5TEST_DLL void TestUsage(void);
 H5TEST_DLL void AddTest(const char *TheName, void (*TheCall) (void),
diff --git a/test/lheap.c b/test/lheap.c
index 4b851e8..d3e165e 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -91,7 +91,7 @@ main(void)
     for(i = 0; i < NOBJS; i++) {
         sprintf(buf, "%03d-", i);
         for(j = 4; j < i; j++)
-            buf[j] = '0' + j % 10;
+            buf[j] = (char)('0' + j % 10);
         if(j > 4)
             buf[j] = '\0';
 
diff --git a/test/mf.c b/test/mf.c
index 7703ef4..5b979d3 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -35,7 +35,7 @@
 #include "H5Iprivate.h"
 #include "H5VMprivate.h"
 
-#define FILENAME_LEN		1024
+#define FILENAME_LEN        1024
 
 #define TEST_BLOCK_SIZE5	5
 #define TEST_BLOCK_SIZE20	20
@@ -52,8 +52,8 @@
 #define TEST_BLOCK_SIZE8000	8000
 #define TEST_BLOCK_SIZE2048	2048
 
-#define TEST_BLOCK_ADDR70	70
-#define TEST_BLOCK_ADDR100	100
+#define TEST_BLOCK_ADDR70   70
+#define TEST_BLOCK_ADDR100  100
 
 #define TEST_ALIGN1024		1024
 #define TEST_ALIGN4096		4096
diff --git a/test/objcopy.c b/test/objcopy.c
index e679007..ad9656f 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -57,61 +57,61 @@ const char *FILENAME[] = {
 #define CONFIG_DENSE 16
 #define MAX_CONFIGURATION 31
 
-#define FILE_EXT 		"objcopy_ext.dat"
+#define FILE_EXT         "objcopy_ext.dat"
 /* The fill_old.h5 is generated from gen_old_fill.c in HDF5 'test' directory
  * for version 1.4(after 1.4.3).  To get this data file, simply compile
  * gen_old_fill.c with HDF5 library (before v1.5) and run it. */
 #define FILE_OLD_LAYOUT         "fill_old.h5"
 
 
-#define NAME_DATATYPE_SIMPLE 	"H5T_NATIVE_INT"
-#define NAME_DATATYPE_SIMPLE2 	"H5T_NATIVE_INT-2"
-#define NAME_DATATYPE_VL 	"vlen of int"
-#define NAME_DATATYPE_VL_VL 	"vlen of vlen of int"
-#define NAME_DATASET_SIMPLE 	"dataset_simple"
+#define NAME_DATATYPE_SIMPLE     "H5T_NATIVE_INT"
+#define NAME_DATATYPE_SIMPLE2     "H5T_NATIVE_INT-2"
+#define NAME_DATATYPE_VL     "vlen of int"
+#define NAME_DATATYPE_VL_VL     "vlen of vlen of int"
+#define NAME_DATASET_SIMPLE     "dataset_simple"
 #define NAME_DATASET_SIMPLE2    "dataset_simple_copy"
 #define NAME_DATASET_SIMPLE3    "dataset_simple_another_copy"
-#define NAME_DATASET_COMPOUND 	"dataset_compound"
-#define NAME_DATASET_CHUNKED 	"dataset_chunked"
-#define NAME_DATASET_CHUNKED2 	"dataset_chunked2"
-#define NAME_DATASET_COMPACT 	"dataset_compact"
-#define NAME_DATASET_EXTERNAL 	"dataset_ext"
-#define NAME_DATASET_NAMED_DTYPE 	"dataset_named_dtype"
-#define NAME_DATASET_NAMED_DTYPE2 	"dataset_named_dtype2"
-#define NAME_DATASET_MULTI_OHDR 	"dataset_multi_ohdr"
-#define NAME_DATASET_MULTI_OHDR2 	"dataset_multi_ohdr2"
-#define NAME_DATASET_VL 	"dataset_vl"
-#define NAME_DATASET_VL_VL 	"dataset_vl_vl"
-#define NAME_DATASET_CMPD_VL 	"dataset_cmpd_vl"
-#define NAME_DATASET_SUB_SUB 	"/g0/g00/g000/dataset_simple"
-#define NAME_GROUP_UNCOPIED 	"/uncopied"
-#define NAME_GROUP_EMPTY 	"/empty"
-#define NAME_GROUP_TOP 		"/g0"
+#define NAME_DATASET_COMPOUND     "dataset_compound"
+#define NAME_DATASET_CHUNKED     "dataset_chunked"
+#define NAME_DATASET_CHUNKED2     "dataset_chunked2"
+#define NAME_DATASET_COMPACT     "dataset_compact"
+#define NAME_DATASET_EXTERNAL     "dataset_ext"
+#define NAME_DATASET_NAMED_DTYPE     "dataset_named_dtype"
+#define NAME_DATASET_NAMED_DTYPE2     "dataset_named_dtype2"
+#define NAME_DATASET_MULTI_OHDR     "dataset_multi_ohdr"
+#define NAME_DATASET_MULTI_OHDR2     "dataset_multi_ohdr2"
+#define NAME_DATASET_VL     "dataset_vl"
+#define NAME_DATASET_VL_VL     "dataset_vl_vl"
+#define NAME_DATASET_CMPD_VL     "dataset_cmpd_vl"
+#define NAME_DATASET_SUB_SUB     "/g0/g00/g000/dataset_simple"
+#define NAME_GROUP_UNCOPIED     "/uncopied"
+#define NAME_GROUP_EMPTY     "/empty"
+#define NAME_GROUP_TOP         "/g0"
 #define NAME_GROUP_TOP2         "/g1"
 #define NAME_GROUP_TOP3         "/g2"
 #define NAME_GROUP_TOP4         "/g3"
-#define NAME_GROUP_SUB 		"/g0/g00"
-#define NAME_GROUP_SUB_2	"/g0/g01"
-#define NAME_GROUP_SUB_SUB 	"/g0/g00/g000"
-#define NAME_GROUP_SUB_SUB2 	"g000"
-#define NAME_GROUP_DATASET 	"/g0/dataset_simple"
-#define NAME_GROUP_LINK		"/g_links"
-#define NAME_GROUP_LINK2	"/g_links2"
-#define NAME_GROUP_LOOP		"g_loop"
-#define NAME_GROUP_LOOP2	"g_loop2"
-#define NAME_GROUP_LOOP3	"g_loop3"
-#define NAME_GROUP_REF	        "ref_grp"
-#define NAME_LINK_DATASET	"/g_links/dataset_simple"
-#define NAME_LINK_HARD		"/g_links/hard_link_to_dataset_simple"
-#define NAME_LINK_SOFT		"/g_links/soft_link_to_dataset_simple"
-#define NAME_LINK_SOFT2		"/g_links2/soft_link_to_dataset_simple"
-#define NAME_LINK_EXTERN	"/g_links/external_link_to_dataset_simple"
+#define NAME_GROUP_SUB         "/g0/g00"
+#define NAME_GROUP_SUB_2    "/g0/g01"
+#define NAME_GROUP_SUB_SUB     "/g0/g00/g000"
+#define NAME_GROUP_SUB_SUB2     "g000"
+#define NAME_GROUP_DATASET     "/g0/dataset_simple"
+#define NAME_GROUP_LINK        "/g_links"
+#define NAME_GROUP_LINK2    "/g_links2"
+#define NAME_GROUP_LOOP        "g_loop"
+#define NAME_GROUP_LOOP2    "g_loop2"
+#define NAME_GROUP_LOOP3    "g_loop3"
+#define NAME_GROUP_REF            "ref_grp"
+#define NAME_LINK_DATASET    "/g_links/dataset_simple"
+#define NAME_LINK_HARD        "/g_links/hard_link_to_dataset_simple"
+#define NAME_LINK_SOFT        "/g_links/soft_link_to_dataset_simple"
+#define NAME_LINK_SOFT2        "/g_links2/soft_link_to_dataset_simple"
+#define NAME_LINK_EXTERN    "/g_links/external_link_to_dataset_simple"
 #define NAME_LINK_EXTERN2       "/g_links2/external_link_to_dataset_simple"
-#define NAME_LINK_SOFT_DANGLE	"/g_links/soft_link_to_nowhere"
-#define NAME_LINK_SOFT_DANGLE2	"/g_links2/soft_link_to_nowhere"
+#define NAME_LINK_SOFT_DANGLE    "/g_links/soft_link_to_nowhere"
+#define NAME_LINK_SOFT_DANGLE2    "/g_links2/soft_link_to_nowhere"
 #define NAME_LINK_EXTERN_DANGLE "/g_links/external_link_to_nowhere"
 #define NAME_LINK_EXTERN_DANGLE2        "/g_links2/external_link_to_nowhere"
-#define NAME_OLD_FORMAT		"/dset1"
+#define NAME_OLD_FORMAT        "/dset1"
 
 #define NAME_BUF_SIZE   1024
 #define ATTR_NAME_LEN 80
@@ -151,7 +151,7 @@ attach_attribute_compound_vlstr(hid_t loc_id);
 static int
 compare_attribute_compound_vlstr(hid_t loc, hid_t loc2);
 
-
+
 /*-------------------------------------------------------------------------
  * Function: addr_insert
  *
@@ -185,7 +185,7 @@ addr_insert(H5O_info_t *oi)
     idtab_g.obj[n] = oi->addr;
 } /* end addr_insert() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: addr_lookup
  *
@@ -214,7 +214,7 @@ addr_lookup(H5O_info_t *oi)
     return FALSE;
 } /* end addr_lookup() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: addr_reset
  *
@@ -236,7 +236,7 @@ addr_reset(void)
     idtab_g.nalloc = idtab_g.nobjs = 0;
 } /* end addr_reset() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    attach_ref_attr
  *
@@ -247,8 +247,6 @@ addr_reset(void)
  * Programmer:  Peter Cao
  *              Friday, August 4, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -297,7 +295,7 @@ error:
     return(-1);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    attach_reg_ref_attr
  *
@@ -308,8 +306,6 @@ error:
  * Programmer:  Peter Cao
  *              Monday, March 5, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -374,7 +370,7 @@ error:
     return(-1);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    create_reg_ref_dataset
  *
@@ -385,8 +381,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, August 4, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -469,7 +463,7 @@ error:
     return(-1);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    attach_attribute_vl
  *
@@ -480,8 +474,6 @@ error:
  * Programmer:  Peter Cao
  *              Saturday, December 17, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -527,19 +519,17 @@ done:
 } /* end of attach_attribute_vl */
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_attach_attributes
  *
  * Purpose:     Attach NUM_ATTRIBUTES attributes to the object to be copied
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -601,13 +591,13 @@ done:
     return ret_value;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_attach_paired_attributes
  *
  * Purpose:     Attach NUM_ATTRIBUTES attributes to a pair of objects to be copied
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:  Quincey Koziol
  *              Tuesday, November 1, 2005
@@ -670,7 +660,7 @@ done:
     return -1;
 } /* end test_copy_attach_paired_attributes() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    compare_attribute
  *
@@ -801,24 +791,20 @@ error:
     return FALSE;
 } /* end compare_attribute() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    compare_std_attributes
  *
  * Purpose:     Compare "standard" attributes on two objects to check that they are equal
  *
- * Return:	TRUE if objects have same attributes/FALSE if they are different
+ * Return:    TRUE if objects have same attributes/FALSE if they are different
  *
  * Programmer:  Quincey Koziol
  *              Monday, October 31, 2005
  *
- * Note:	This isn't very general, the attributes are assumed to be
+ * Note:    This isn't very general, the attributes are assumed to be
  *              those written in test_copy_attach_attributes().
  *
- * Modifier:    Peter Cao
- *              Wednesday, March 21, 2007
- *              Change to compare any attributes of two objects
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -873,19 +859,19 @@ compare_std_attributes(hid_t oid, hid_t oid2, hid_t pid)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Aclose(aid2);
-    	H5Aclose(aid);
+        H5Aclose(aid2);
+        H5Aclose(aid);
     } H5E_END_TRY;
     return FALSE;
 } /* end compare_std_attributes() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    compare_data
  *
  * Purpose:     Compare two buffers of data to check that they are equal
  *
- * Return:	TRUE if buffer are equal/FALSE if they are different
+ * Return:    TRUE if buffer are equal/FALSE if they are different
  *
  * Programmer:  Quincey Koziol
  *              Monday, November 21, 2005
@@ -945,15 +931,15 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts,
                  * for each */
                 for(elmt=0; elmt<nelmts; elmt++) {
                     /* Check vlen lengths */
-                    if(((const hvl_t *)memb1)->len
-                            != ((const hvl_t *)memb2)->len)
+                    if(((const hvl_t *)((const void *)memb1))->len
+                            != ((const hvl_t *)((const void *)memb2))->len)
                         TEST_ERROR
 
                     /* Check vlen data */
                     if(!compare_data(parent1, parent2, pid, base_id,
-                            ((const hvl_t *)memb1)->len,
-                            ((const hvl_t *)memb1)->p,
-                            ((const hvl_t *)memb2)->p, obj_owner))
+                            ((const hvl_t *)((const void *)memb1))->len,
+                            ((const hvl_t *)((const void *)memb1))->p,
+                            ((const hvl_t *)((const void *)memb2))->p, obj_owner))
                         TEST_ERROR
 
                     /* Update member pointers */
@@ -1146,13 +1132,13 @@ error:
     return FALSE;
 } /* end compare_data() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    compare_datasets
  *
  * Purpose:     Compare two datasets to check that they are equal
  *
- * Return:	TRUE if datasets are equal/FALSE if they are different
+ * Return:    TRUE if datasets are equal/FALSE if they are different
  *
  * Programmer:  Quincey Koziol
  *              Tuesday, October 25, 2005
@@ -1173,8 +1159,8 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf)
     hssize_t nelmts;                            /* # of elements in dataspace */
     void *rbuf = NULL;                          /* Buffer for reading raw data */
     void *rbuf2 = NULL;                         /* Buffer for reading raw data */
-    H5D_space_status_t space_status;            /* Dataset's raw data space status */
-    H5D_space_status_t space_status2;           /* Dataset's raw data space status */
+    H5D_space_status_t space_status;            /* Dataset's raw dataspace status */
+    H5D_space_status_t space_status2;           /* Dataset's raw dataspace status */
 
     /* Check the datatypes are equal */
 
@@ -1352,23 +1338,23 @@ error:
             HDfree(rbuf);
         if(rbuf2)
             HDfree(rbuf2);
-    	H5Pclose(dcpl2);
-    	H5Pclose(dcpl);
-    	H5Sclose(sid2);
-    	H5Sclose(sid);
-    	H5Tclose(tid2);
-    	H5Tclose(tid);
+        H5Pclose(dcpl2);
+        H5Pclose(dcpl);
+        H5Sclose(sid2);
+        H5Sclose(sid);
+        H5Tclose(tid2);
+        H5Tclose(tid);
     } H5E_END_TRY;
     return FALSE;
 } /* end compare_datasets() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    compare_groups
  *
  * Purpose:     Compare two groups to check that they are "equal"
  *
- * Return:	TRUE if group are equal/FALSE if they are different
+ * Return:    TRUE if group are equal/FALSE if they are different
  *
  * Programmer:  Quincey Koziol
  *              Monday, October 31, 2005
@@ -1518,7 +1504,7 @@ error:
     return FALSE;
 } /* end compare_groups() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_named_datatype
  *
@@ -1530,8 +1516,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1539,8 +1523,8 @@ test_copy_named_datatype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
 {
     hid_t fid_src = -1, fid_dst = -1;   /* File IDs */
     hid_t tid = -1, tid2 = -1;          /* Datatype IDs */
-    char		src_filename[NAME_BUF_SIZE];
-    char		dst_filename[NAME_BUF_SIZE];
+    char        src_filename[NAME_BUF_SIZE];
+    char        dst_filename[NAME_BUF_SIZE];
 
     TESTING("H5Ocopy(): named datatype");
 
@@ -1605,15 +1589,15 @@ test_copy_named_datatype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
 
 error:
     H5E_BEGIN_TRY {
-    	H5Tclose(tid2);
-    	H5Tclose(tid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid2);
+        H5Tclose(tid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_named_datatype */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_named_datatype_vl
  *
@@ -1632,8 +1616,8 @@ test_copy_named_datatype_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_
 {
     hid_t fid_src = -1, fid_dst = -1;   /* File IDs */
     hid_t tid = -1, tid2 = -1;          /* Datatype IDs */
-    char		src_filename[NAME_BUF_SIZE];
-    char		dst_filename[NAME_BUF_SIZE];
+    char        src_filename[NAME_BUF_SIZE];
+    char        dst_filename[NAME_BUF_SIZE];
 
     TESTING("H5Ocopy(): named vlen datatype");
 
@@ -1698,15 +1682,15 @@ test_copy_named_datatype_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_
 
 error:
     H5E_BEGIN_TRY {
-    	H5Tclose(tid2);
-    	H5Tclose(tid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid2);
+        H5Tclose(tid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_named_datatype_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_named_datatype_vl_vl
  *
@@ -1725,8 +1709,8 @@ test_copy_named_datatype_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h
 {
     hid_t fid_src = -1, fid_dst = -1;   /* File IDs */
     hid_t tid = -1, tid2 = -1;          /* Datatype IDs */
-    char		src_filename[NAME_BUF_SIZE];
-    char		dst_filename[NAME_BUF_SIZE];
+    char        src_filename[NAME_BUF_SIZE];
+    char        dst_filename[NAME_BUF_SIZE];
 
     TESTING("H5Ocopy(): named nested vlen datatype");
 
@@ -1797,15 +1781,15 @@ test_copy_named_datatype_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h
 
 error:
     H5E_BEGIN_TRY {
-    	H5Tclose(tid2);
-    	H5Tclose(tid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid2);
+        H5Tclose(tid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_named_datatype_vl_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_named_datatype_attr_self
  *
@@ -1819,8 +1803,6 @@ error:
  * Programmer:  Neil
  *              Friday, March 11, 2011
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1948,7 +1930,7 @@ error:
     return 1;
 } /* end test_copy_named_datatype_attr_self */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_simple
  *
@@ -1960,8 +1942,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2057,16 +2037,16 @@ test_copy_dataset_simple(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_simple */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_simple_samefile
  *
@@ -2074,12 +2054,6 @@ error:
  *
  * Return:      Success:        0
  *              Failure:        number of errors
- *
- * Programmer:  Neil Fortner
- *              Thursday, January 15, 2009
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2437,8 +2411,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2594,17 +2566,17 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Pclose(pid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_chunked */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_chunked_empty
  *
@@ -2756,12 +2728,12 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Pclose(pid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_chunked_empty */
@@ -2952,17 +2924,17 @@ test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Pclose(pid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_chunked_sparse */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compressed
  *
@@ -3087,18 +3059,18 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid
 #ifdef H5_HAVE_FILTER_DEFLATE
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Pclose(pid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 #endif /* H5_HAVE_FILTER_DEFLATE */
 } /* end test_copy_dataset_compressed */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compact
  *
@@ -3137,7 +3109,7 @@ test_copy_dataset_compact(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
     /* set initial data values */
     for (i=0; i<DIM_SIZE_1; i++)
         for (j=0; j<DIM_SIZE_2; j++)
-            buf[i][j] = (float)(i+j/100.0F);
+            buf[i][j] = (float)i + (float)j / 100.0F;
 
     /* Initialize the filenames */
     h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename);
@@ -3224,17 +3196,17 @@ test_copy_dataset_compact(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Pclose(pid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_compact */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_external
  *
@@ -3246,8 +3218,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -3351,17 +3321,17 @@ test_copy_dataset_external(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Pclose(pid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_external */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_named_dtype
  *
@@ -3472,17 +3442,17 @@ test_copy_dataset_named_dtype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hi
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_named_dtype */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_named_dtype_hier
  *
@@ -3609,18 +3579,18 @@ test_copy_dataset_named_dtype_hier(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_named_dtype_hier */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_named_dtype_hier_outside
  *
@@ -3748,18 +3718,18 @@ test_copy_dataset_named_dtype_hier_outside(hid_t fcpl_src, hid_t fcpl_dst, hid_t
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_named_dtype_hier_outside */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_multi_ohdr_chunks
  *
@@ -3792,8 +3762,8 @@ test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fa
     char dst_filename[NAME_BUF_SIZE];
 
     if(test_open) {
-        TESTING("H5Ocopy(): openend datasets that have multiple ohdr chunks");
-    } else{
+        TESTING("H5Ocopy(): opened datasets that have multiple ohdr chunks");
+    } else {
         TESTING("H5Ocopy(): datasets that have multiple ohdr chunks");
     }
 
@@ -3867,7 +3837,6 @@ test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fa
     if(H5Ocopy(fid_src, NAME_GROUP_TOP, fid_dst, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
 
     if(test_open) {
-
         /* close the second dataset */
         if(H5Dclose(did2) < 0) TEST_ERROR
 
@@ -3898,18 +3867,18 @@ test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fa
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Sclose(sid);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_multi_ohdr_chunks */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_attr_named_dtype
  *
@@ -4039,19 +4008,19 @@ test_copy_dataset_attr_named_dtype(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_attr_named_dtype */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_contig_vl
  *
@@ -4169,18 +4138,18 @@ test_copy_dataset_contig_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_contig_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_chunked_vl
  *
@@ -4255,6 +4224,7 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid
     /* close the dataset */
     if(H5Dclose(did) < 0) TEST_ERROR
 
+
     /* close the SRC file */
     if(H5Fclose(fid_src) < 0) TEST_ERROR
 
@@ -4307,18 +4277,19 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Pclose(pid);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_chunked_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compact_vl
  *
@@ -4444,18 +4415,18 @@ test_copy_dataset_compact_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_compact_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_attribute_vl
  *
@@ -4561,11 +4532,11 @@ error:
     H5E_BEGIN_TRY {
         H5Aclose(aid2);
         H5Aclose(aid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_simple_empty */
@@ -4584,18 +4555,18 @@ error:
 static int
 attach_attribute_compound_vlstr(hid_t loc_id)
 {
-    hid_t aid = -1; 		/* Attribute ID */
-    hid_t sid = -1; 		/* Dataspace ID */
-    hid_t tid = -1;		/* Datatype ID */
-    hid_t vl_str_tid = -1;	/* Variable length string datatype ID */
-    hid_t cmpd_tid = -1;	/* Compound datatype ID */
-    hsize_t dim1 = 1;		/* Dimension size */
-    typedef struct { 		/* Compound structure for the attribute */
+    hid_t aid = -1;         /* Attribute ID */
+    hid_t sid = -1;         /* Dataspace ID */
+    hid_t tid = -1;        /* Datatype ID */
+    hid_t vl_str_tid = -1;    /* Variable length string datatype ID */
+    hid_t cmpd_tid = -1;    /* Compound datatype ID */
+    hsize_t dim1 = 1;        /* Dimension size */
+    typedef struct {         /* Compound structure for the attribute */
         int i;
         char *v;
     } s1;
     s1 buf;                     /* Buffer */
-    int ret_value = -1;		/* Return value */
+    int ret_value = -1;        /* Return value */
 
     /* Create dataspace */
     if((sid = H5Screate_simple(1, &dim1, NULL)) < 0 )
@@ -4649,7 +4620,7 @@ done:
  * Function:    compare_attribute_compound_vlstr
  *
  * Purpose:     Compare data of the attributes attached to the two objects.
- *		The attribute is a  compound datatype with a variable length string.
+ *        The attribute is a  compound datatype with a variable length string.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -4660,52 +4631,73 @@ done:
 static int
 compare_attribute_compound_vlstr(hid_t loc, hid_t loc2)
 {
-    hid_t aid = -1, aid2 = -1;	/* Attribute IDs */
-    hid_t tid = -1, tid2 = -1;	/* Datatype IDs */
-    typedef struct {		/* Compound structure for the attribute */
-	int i;
-	char *v;
+    hid_t aid = -1, aid2 = -1;    /* Attribute IDs */
+    hid_t tid = -1, tid2 = -1;    /* Datatype IDs */
+    hid_t sid = -1, sid2 = -1;    /* Dataspace IDs */
+    typedef struct {        /* Compound structure for the attribute */
+    int i;
+    char *v;
     } s1;
-    s1 rbuf;			/* Buffer for data read */
-    s1 rbuf2;			/* Buffer for data read */
-    
+    s1 rbuf;            /* Buffer for data read */
+    s1 rbuf2;           /* Buffer for data read */
+
     /* Open the attributes attached to the objects */
     if((aid = H5Aopen_by_idx(loc, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        TEST_ERROR	
+    FAIL_STACK_ERROR
     if((aid2 = H5Aopen_by_idx(loc2, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        TEST_ERROR	
+    FAIL_STACK_ERROR
 
     /* Get the attributes' datatypes */
-    if((tid = H5Aget_type(aid)) < 0) 
-        TEST_ERROR	
+    if((tid = H5Aget_type(aid)) < 0)
+    FAIL_STACK_ERROR
     if((tid2 = H5Aget_type(aid2)) < 0)
-        TEST_ERROR	
+    FAIL_STACK_ERROR
+
+    /* Get the attributes' dataspaces */
+    if((sid = H5Aget_space(aid)) < 0)
+    FAIL_STACK_ERROR
+    if((sid2 = H5Aget_space(aid2)) < 0)
+    FAIL_STACK_ERROR
 
     /* Read the attributes */
     if(H5Aread(aid, tid, &rbuf) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
     if(H5Aread(aid2, tid2, &rbuf2) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* Compare the attributes' data */
     if(rbuf.i != rbuf2.i)
-        TEST_ERROR
-    if(HDstrlen(rbuf.v) != HDstrlen(rbuf2.v)) 
-        TEST_ERROR
-    if(HDmemcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v))) 
-        TEST_ERROR
+    FAIL_STACK_ERROR
+    if(HDstrlen(rbuf.v) != HDstrlen(rbuf2.v))
+    FAIL_STACK_ERROR
+    if(HDmemcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v)))
+    FAIL_STACK_ERROR
+
+    /* Reclaim vlen buffer */
+    if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, &rbuf) < 0) TEST_ERROR
+    if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, &rbuf2) < 0) TEST_ERROR
+
+    /* Close the dataspaces */
+    if(H5Sclose(sid) < 0)
+    FAIL_STACK_ERROR
+    if(H5Sclose(sid2) < 0)
+    FAIL_STACK_ERROR
 
     /* Close the attributes */
     if(H5Aclose(aid) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
     if(H5Aclose(aid2) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
     return TRUE;
 
 error:
     H5E_BEGIN_TRY {
         H5Aclose(aid);
         H5Aclose(aid2);
+        H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, &rbuf);
+        H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, &rbuf2);
+        H5Sclose(sid);
+        H5Sclose(sid2);
         H5Tclose(tid);
         H5Tclose(tid2);
     } H5E_END_TRY;
@@ -4717,15 +4709,15 @@ error:
  * Function:    test_copy_attribute_compound_vlstr
  *
  * Purpose:     Create a simple dataset and a group in SRC file.
- *		Both has an attribute with a compound datatype consisting
+ *        Both has an attribute with a compound datatype consisting
  *              of a variable length string
  *              Copy the dataset and the group to DST file
- *		This is for HDFFV-7991
+ *        This is for HDFFV-7991
  *
  * Return:      Success:        0
  *              Failure:        number of errors
  *
- * Programmer:  
+ * Programmer:
  *
  *-------------------------------------------------------------------------
  */
@@ -4736,10 +4728,10 @@ test_copy_attribute_compound_vlstr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     hid_t sid = -1;                             /* Dataspace ID */
     hid_t did = -1, did2 = -1;                  /* Dataset IDs */
     hid_t aid = -1, aid2 = -1;                  /* Attribute IDs */
-    hid_t gid = -1, gid2 = -1;			/* Group IDs */
+    hid_t gid = -1, gid2 = -1;            /* Group IDs */
     hsize_t dim2d[2];                           /* Dataset dimensions */
-    char src_filename[NAME_BUF_SIZE];		/* Source file name */
-    char dst_filename[NAME_BUF_SIZE];		/* Destination file name */
+    char src_filename[NAME_BUF_SIZE];        /* Source file name */
+    char dst_filename[NAME_BUF_SIZE];        /* Destination file name */
 
     TESTING("H5Ocopy(): attribute with compound datatype consisting of variable length string");
 
@@ -4752,7 +4744,7 @@ test_copy_attribute_compound_vlstr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
     /* create source file */
     if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* set dataspace dimensions */
     dim2d[0] = DIM_SIZE_1;
@@ -4760,48 +4752,48 @@ test_copy_attribute_compound_vlstr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
     /* create 2D dataspace */
     if((sid = H5Screate_simple(2, dim2d, NULL)) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* create 2D int dataset at SRC file */
     if((did = H5Dcreate2(fid_src, NAME_DATASET_SIMPLE, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* close dataspace */
     if(H5Sclose(sid) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* attach an attribute to the dataset */
     if(attach_attribute_compound_vlstr(did) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* close the dataset */
     if(H5Dclose(did) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* create a group */
     if((gid = H5Gcreate2(fid_src, NAME_GROUP_EMPTY, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* attach attribute to the group */
     if(attach_attribute_compound_vlstr(gid) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* close the group */
     if(H5Gclose(gid) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* close the SRC file */
     if(H5Fclose(fid_src) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
 
     /* open the source file with read-only */
     if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* create destination file */
     if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0)
-        TEST_ERROR
+    FAIL_STACK_ERROR
 
     /* Create an uncopied object in destination file so that addresses in source and destination files aren't the same */
     if(H5Gclose(H5Gcreate2(fid_dst, NAME_GROUP_UNCOPIED, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -4845,9 +4837,9 @@ test_copy_attribute_compound_vlstr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
         TEST_ERROR
 
     /* close the groups */
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         TEST_ERROR
-    if(H5Gclose(gid2) < 0) 
+    if(H5Gclose(gid2) < 0)
         TEST_ERROR
 
     /* close the SRC file */
@@ -4865,18 +4857,18 @@ error:
     H5E_BEGIN_TRY {
         H5Aclose(aid2);
         H5Aclose(aid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Gclose(gid);
-    	H5Gclose(gid2);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Gclose(gid);
+        H5Gclose(gid2);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_attribute_compound_vlstr() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compressed_vl
  *
@@ -4999,7 +4991,9 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid) < 0) TEST_ERROR
@@ -5014,20 +5008,20 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 #ifdef H5_HAVE_FILTER_DEFLATE
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Pclose(pid);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Pclose(pid);
         H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 #endif /* H5_HAVE_FILTER_DEFLATE */
 } /* end test_copy_dataset_compressed_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_group_empty
  *
@@ -5039,8 +5033,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -5114,15 +5106,15 @@ test_copy_group_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_group_empty */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_root_group
  *
@@ -5134,8 +5126,6 @@ error:
  * Programmer:  Peter Cao
  *              August 8, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -5255,7 +5245,7 @@ error:
     return 1;
 } /* end test_copy_root_group */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_group
  *
@@ -5267,8 +5257,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -5378,18 +5366,18 @@ test_copy_group(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Sclose(sid);
-    	H5Dclose(did);
-    	H5Gclose(gid_sub);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Gclose(gid_sub);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_group */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_group_deep
  *
@@ -5520,18 +5508,18 @@ test_copy_group_deep(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_f
 
 error:
     H5E_BEGIN_TRY {
-    	H5Sclose(sid);
-    	H5Dclose(did);
-    	H5Gclose(gid_sub);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Gclose(gid_sub);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_group_deep */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_group_loop
  *
@@ -5631,17 +5619,17 @@ test_copy_group_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_f
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gid_sub2);
-    	H5Gclose(gid_sub);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Gclose(gid_sub2);
+        H5Gclose(gid_sub);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_group_loop */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_group_wide_loop
  *
@@ -5760,17 +5748,17 @@ test_copy_group_wide_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gid_sub2);
-    	H5Gclose(gid_sub);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Gclose(gid_sub2);
+        H5Gclose(gid_sub);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_group_wide_loop */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_group_links
  *
@@ -5782,12 +5770,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *              Neil Fortner
- *              Tuesday, February 16, 2010
- *              Modified test to test flags for expanding soft and external
- *              links.
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -6018,20 +6000,20 @@ test_copy_group_links(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_
 
 error:
     H5E_BEGIN_TRY {
-    	H5Sclose(sid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_ext);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
-    	H5Pclose(plid);
+        H5Sclose(sid);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_ext);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
+        H5Pclose(plid);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_group_links */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_soft_link
  *
@@ -6157,17 +6139,17 @@ test_copy_soft_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fa
 
 error:
     H5E_BEGIN_TRY {
-    	H5Sclose(sid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Sclose(sid);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_soft_link */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_ext_link
  *
@@ -6291,17 +6273,17 @@ test_copy_ext_link(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap
 
 error:
     H5E_BEGIN_TRY {
-    	H5Sclose(sid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Sclose(sid);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_ext_link */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_exist
  *
@@ -6401,15 +6383,15 @@ test_copy_exist(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_exist */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_path
  *
@@ -6535,17 +6517,17 @@ test_copy_path(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Sclose(sid);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_path */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_same_file_named_datatype
  *
@@ -6607,26 +6589,23 @@ test_copy_same_file_named_datatype(hid_t fcpl_src, hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Tclose(tid2);
-    	H5Tclose(tid);
-    	H5Fclose(fid);
+        H5Tclose(tid2);
+        H5Tclose(tid);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_same_file_named_datatype */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_old_layout
  *
  * Purpose:     Copy dataset that uses the "old" layout version (pre version 3)
  *              format.
  *
- *              Note: This test uses the "fill_old.h5" file for convenience, since it
+ * Note:    This test uses the "fill_old.h5" file for convenience, since it
  *              has a dataset with the old layout format.
  *
- *              Note: The parameter "test_open" is added to test for H5Ocopy when
- *                    the dataset is open in the file (HDFFV-7853).
- *
  * Return:      Success:        0
  *              Failure:        number of errors
  *
@@ -6708,15 +6687,15 @@ test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did2);
+        H5Dclose(did);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_old_layout */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compact_named_vl
  *
@@ -6777,7 +6756,7 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     /* make a copy of the datatype for later use */
     if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create and set compact plist */
@@ -6838,7 +6817,9 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid_copy) < 0) TEST_ERROR
@@ -6851,20 +6832,20 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 error:
     H5E_BEGIN_TRY {
-    	H5Pclose(pid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Pclose(pid);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid_copy);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Tclose(tid_copy);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_compact_named_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_contig_named_vl
  *
@@ -6924,7 +6905,7 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* make a copy of the datatype for later use */
     if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -6978,7 +6959,9 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid_copy) < 0) TEST_ERROR
@@ -6991,19 +6974,19 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid_copy);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Tclose(tid_copy);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_contig_named_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_chunked_named_vl
  *
@@ -7072,7 +7055,7 @@ test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     /* make a copy of the datatype for later use */
     if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
      /* create and set chunk plist */
@@ -7138,7 +7121,9 @@ test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid_copy) < 0) TEST_ERROR
@@ -7151,20 +7136,20 @@ test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 error:
     H5E_BEGIN_TRY {
-    	H5Pclose(pid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Pclose(pid);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid_copy);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Tclose(tid_copy);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_chunked_named_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compressed_named_vl
  *
@@ -7226,7 +7211,7 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_
     /* make a copy of the datatype for later use */
     if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
      /* create and set chunk plist */
@@ -7288,7 +7273,9 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid_copy, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid_copy) < 0) TEST_ERROR
@@ -7301,20 +7288,20 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_
 
 error:
     H5E_BEGIN_TRY {
-    	H5Pclose(pid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Pclose(pid);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid_copy, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid_copy);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Tclose(tid_copy);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_compressed_named_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compact_vl_vl
  *
@@ -7443,7 +7430,9 @@ test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid2, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid) < 0) TEST_ERROR
@@ -7457,19 +7446,20 @@ test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid2);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Pclose(pid);
+        H5Tclose(tid);
+        H5Tclose(tid2);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_compact_vl_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_contig_vl_vl
  *
@@ -7608,7 +7598,9 @@ test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid2, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid) < 0) TEST_ERROR
@@ -7622,19 +7614,20 @@ test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid2);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Pclose(pid);
+        H5Tclose(tid);
+        H5Tclose(tid2);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_contig_vl_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_chunked_vl_vl
  *
@@ -7653,7 +7646,7 @@ static int
 test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl)
 {
     hid_t fid_src = -1, fid_dst = -1;           /* File IDs */
-    hid_t tid = -1, tid2=-1;       /* Datatype ID */
+    hid_t tid = -1, tid2=-1;               /* Datatype ID */
     hid_t sid = -1;                             /* Dataspace ID */
     hid_t pid = -1;                             /* Dataset creation property list ID */
     hid_t did = -1, did2 = -1;                  /* Dataset IDs */
@@ -7709,7 +7702,7 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create nested VL datatype */
     if((tid2 = H5Tvlen_create(tid)) < 0) TEST_ERROR
 
-     /* create and set chunk plist */
+    /* create and set chunk plist */
     if((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
     if(H5Pset_chunk(pid, 1, chunk_dim1d) < 0) TEST_ERROR
 
@@ -7725,6 +7718,7 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the dataset */
     if(H5Dclose(did) < 0) TEST_ERROR
 
+
     /* close the SRC file */
     if(H5Fclose(fid_src) < 0) TEST_ERROR
 
@@ -7763,7 +7757,9 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid2, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid) < 0) TEST_ERROR
@@ -7777,20 +7773,20 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
 error:
     H5E_BEGIN_TRY {
-    	H5Pclose(pid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Pclose(pid);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid2);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Tclose(tid2);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_chunked_vl_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compressed_vl_vl
  *
@@ -7887,6 +7883,7 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     if(H5Pclose(pid) < 0) TEST_ERROR
 
     if(!test_open) {
+
         /* close the dataset */
         if(H5Dclose(did) < 0) TEST_ERROR
 
@@ -7931,7 +7928,9 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid2, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid) < 0) TEST_ERROR
@@ -7945,15 +7944,15 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
 
 error:
     H5E_BEGIN_TRY {
-    	H5Pclose(pid);
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Pclose(pid);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid2, sid, H5P_DEFAULT, buf);
-    	H5Tclose(tid);
-    	H5Tclose(tid2);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Tclose(tid2);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_compressed_vl_vl */
@@ -7967,7 +7966,7 @@ typedef struct cmpd_vl_t {
     double c;
 } cmpd_vl_t;
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_contig_cmpd_vl
  *
@@ -8001,12 +8000,12 @@ test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
     /* set initial data values */
     for(i = 0; i < DIM_SIZE_1; i++) {
-        buf[i].a = i * (i - 1);
+        buf[i].a = (int)(i * (i - 1));
         buf[i].b.len = i+1;
         buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int));
         for(j = 0; j < buf[i].b.len; j++)
             ((int *)buf[i].b.p)[j] = (int)(i * 10 + j);
-        buf[i].c = 1.0F / (i + 1.0F);
+        buf[i].c = 1.0F / ((float)i + 1.0F);
     } /* end for */
 
     /* Initialize the filenames */
@@ -8080,7 +8079,9 @@ test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid2) < 0) TEST_ERROR
@@ -8094,19 +8095,19 @@ test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf);
         H5Tclose(tid2);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_contig_cmpd_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_chunked_cmpd_vl
  *
@@ -8140,12 +8141,12 @@ test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
     /* set initial data values */
     for(i = 0; i < DIM_SIZE_1; i++) {
-        buf[i].a = i * (i - 1);
+        buf[i].a = (int)(i * (i - 1));
         buf[i].b.len = i+1;
         buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int));
         for(j = 0; j < buf[i].b.len; j++)
             ((int *)buf[i].b.p)[j] = (int)(i * 10 + j);
-        buf[i].c = 1.0F / (i + 1.0F);
+        buf[i].c = 1.0F / ((float)i + 1.0F);
     } /* end for */
 
     /* Initialize the filenames */
@@ -8226,7 +8227,9 @@ test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid2) < 0) TEST_ERROR
@@ -8240,19 +8243,20 @@ test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf);
+        H5Pclose(pid);
         H5Tclose(tid2);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_chunked_cmpd_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_compact_cmpd_vl
  *
@@ -8285,12 +8289,12 @@ test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
     /* set initial data values */
     for(i = 0; i < DIM_SIZE_1; i++) {
-        buf[i].a = i * (i - 1);
+        buf[i].a = (int)(i * (i - 1));
         buf[i].b.len = i+1;
         buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int));
         for(j = 0; j < buf[i].b.len; j++)
             ((int *)buf[i].b.p)[j] = (int)(i * 10 + j);
-        buf[i].c = 1.0F / (i + 1.0F);
+        buf[i].c = 1.0F / ((float)i + 1.0F);
     } /* end for */
 
     /* Initialize the filenames */
@@ -8371,7 +8375,9 @@ test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
 
     /* Reclaim vlen buffer */
-    if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    if(H5Tdetect_class(tid, H5T_VLEN) == TRUE) {
+        if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) TEST_ERROR
+    }
 
     /* close datatype */
     if(H5Tclose(tid2) < 0) TEST_ERROR
@@ -8385,19 +8391,20 @@ test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did2);
-    	H5Dclose(did);
+        H5Dclose(did2);
+        H5Dclose(did);
         H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf);
+        H5Pclose(pid);
         H5Tclose(tid2);
-    	H5Tclose(tid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_compact_cmpd_vl */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_null_ref
  *
@@ -8559,7 +8566,7 @@ error:
     return 1;
 } /* end test_copy_null_ref */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_null_ref_open
  *
@@ -8741,7 +8748,7 @@ error:
     return 1;
 } /* end test_copy_null_ref_open */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_attr_crt_order
  *
@@ -8863,7 +8870,7 @@ error:
     return 1;
 } /* end test_copy_attr_crt_order */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_committed_datatype_merge
  *
@@ -8929,7 +8936,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src1, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -8953,7 +8960,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src2, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -9100,7 +9107,7 @@ error:
     return 1;
 } /* end test_copy_committed_datatype_merge */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_committed_datatype_merge_same_file
  *
@@ -9164,7 +9171,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset */
@@ -9191,7 +9198,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset */
@@ -9372,7 +9379,7 @@ error:
 } /* end test_copy_committed_datatype_merge_same_file */
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_committed_dt_merge_sugg
  *
@@ -9436,7 +9443,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -9463,7 +9470,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "a" */
+    /* committed datatype "a" */
     if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -9472,7 +9479,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "b" */
+    /* committed datatype "b" */
     if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -9601,7 +9608,7 @@ error:
     return 1;
 } /* end test_copy_committed_dt_merge_sugg */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_committed_dt_merge_attr
  *
@@ -9667,7 +9674,7 @@ test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -9697,7 +9704,7 @@ test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* create anonymous committed data type */
+    /* create anonymous committed datatype */
     if((H5Tcommit_anon(fid_dst, tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create attribute at SRC file */
@@ -9794,27 +9801,27 @@ error:
 #define ROOT_NDT_INT "root_ndt_int"
 #define GROUP_NDT_SHORT "group_ndt_short"
 
-#define SRC_GRP 	"src_grp"
-#define DST_GRP 	"dst_grp"
-#define DST_GRP2 	"dst_grp2"
+#define SRC_GRP     "src_grp"
+#define DST_GRP     "dst_grp"
+#define DST_GRP2     "dst_grp2"
 
-#define SRC_NDT_SHORT	"src_ndt_short"
-#define SRC_NDT_INT	"src_ndt_int"
-#define SRC_NDT_INT2	"src_ndt_int2"
-#define SRC_NDT_FLOAT	"src_ndt_float"
-#define SRC_NDT_DOUBLE	"src_ndt_double"
+#define SRC_NDT_SHORT    "src_ndt_short"
+#define SRC_NDT_INT    "src_ndt_int"
+#define SRC_NDT_INT2    "src_ndt_int2"
+#define SRC_NDT_FLOAT    "src_ndt_float"
+#define SRC_NDT_DOUBLE    "src_ndt_double"
 
-#define DST_NDT_SHORT	"dst_ndt_short"
-#define DST_NDT_INT	"dst_ndt_int"
-#define DST_NDT_FLOAT	"dst_ndt_float"
-#define DST_NDT_DOUBLE	"dst_ndt_double"
+#define DST_NDT_SHORT    "dst_ndt_short"
+#define DST_NDT_INT    "dst_ndt_int"
+#define DST_NDT_FLOAT    "dst_ndt_float"
+#define DST_NDT_DOUBLE    "dst_ndt_double"
 
-#define SRC_NDT_DSET	"src_ndt_dset"
-#define SRC_NDT_DSET2	"src_ndt_dset2"
-#define SRC_NDT_DSET3	"src_ndt_dset3"
+#define SRC_NDT_DSET    "src_ndt_dset"
+#define SRC_NDT_DSET2    "src_ndt_dset2"
+#define SRC_NDT_DSET3    "src_ndt_dset3"
 
-#define SRC_DSET	"src_dset"
-#define SRC_DSET1	"src_dset1"
+#define SRC_DSET    "src_dset"
+#define SRC_DSET1    "src_dset1"
 
 #define SRC_ATTR  "src_attr"
 
@@ -9823,21 +9830,21 @@ error:
 
 #define DST_ATTR  "dst_attr"
 #define DST_ATTR2  "dst_attr2"
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_cdt_hier_merge
  *
  * Purpose:     Tests the "merge committed datatypes" feature of H5Ocopy:
- *		SRC file:
- *		  Create committed datatypes at / and /g0
- *		  Create datasets with native type and committed datatypes at /g0
- *		DST file:
- *		  Create attributes with anonymous committed datatypes at /uncopied
+ *        SRC file:
+ *          Create committed datatypes at / and /g0
+ *          Create datasets with native type and committed datatypes at /g0
+ *        DST file:
+ *          Create attributes with anonymous committed datatypes at /uncopied
  *
- *		Copy / at SRC to DST
- *		Copy /g0 at SRC to DST
- *		Copy the datasets in /g0 at SRC to DST /uncopied
- *		Verify that committed datatypes are copied and merged correctly
+ *        Copy / at SRC to DST
+ *        Copy /g0 at SRC to DST
+ *        Copy the datasets in /g0 at SRC to DST /uncopied
+ *        Verify that committed datatypes are copied and merged correctly
  *
  * Return:      Success:        0
  *              Failure:        number of errors
@@ -9853,19 +9860,19 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
     hid_t tid = -1;                             /* Datatype ID */
     hid_t sid = -1;                             /* Dataspace ID */
     hid_t did = -1;                             /* Dataset ID */
-    hid_t gid = -1; 	                 	/* Group IDs */
-    hid_t f_tid = -1;				/* Datatype ID for root group */
-    hid_t g_tid = -1;				/* Datatype ID for group */
-    hid_t anon_tid = -1;			/* Anonymous datatype */
-    hid_t aid = -1;				/* Attribute ID */
+    hid_t gid = -1;                          /* Group IDs */
+    hid_t f_tid = -1;                /* Datatype ID for root group */
+    hid_t g_tid = -1;                /* Datatype ID for group */
+    hid_t anon_tid = -1;            /* Anonymous datatype */
+    hid_t aid = -1;                /* Attribute ID */
     hid_t ocpypl_id = -1;                       /* Object copy plist ID */
-    int i;					/* Local index variable */
-    hsize_t dim1d[1];				/* dimension sizes */
-    int buf[DIM_SIZE_1];			/* Buffer for data */
-    haddr_t exp_addr_int, exp_addr_short;     	/* Expected object addresses */
+    int i;                    /* Local index variable */
+    hsize_t dim1d[1];                /* dimension sizes */
+    int buf[DIM_SIZE_1];            /* Buffer for data */
+    haddr_t exp_addr_int, exp_addr_short;         /* Expected object addresses */
     H5O_info_t oinfo;                           /* Object info */
-    char src_filename[NAME_BUF_SIZE];		/* Source file name */
-    char dst_filename[NAME_BUF_SIZE];		/* Destination file name */
+    char src_filename[NAME_BUF_SIZE];        /* Source file name */
+    char dst_filename[NAME_BUF_SIZE];        /* Destination file name */
 
     if(reopen)
         TESTING("H5Ocopy(): hier. of committed datatypes and merging with reopen")
@@ -9883,8 +9890,8 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
     /* Reset file address checking info */
     addr_reset();
 
-    /* 
-     * Populate source file 
+    /*
+     * Populate source file
      */
     if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR
 
@@ -9942,8 +9949,8 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
     /* close the SRC file */
     if(H5Fclose(fid_src) < 0) TEST_ERROR
 
-    /* 
-     * Populate destination file 
+    /*
+     * Populate destination file
      */
     if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR
 
@@ -9956,7 +9963,7 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
 
     /* create attribute of anon ndt (short) in /uncopied */
     if((aid = H5Acreate2(gid, DST_ATTR_ANON_SHORT, anon_tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	TEST_ERROR
+    TEST_ERROR
 
     /* close the attribute */
     if(H5Aclose(aid) < 0) TEST_ERROR
@@ -9970,7 +9977,7 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
 
     /* create attribute of anon ndt (int) in /uncopied */
     if((aid = H5Acreate2(gid, DST_ATTR_ANON_INT, anon_tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	TEST_ERROR
+    TEST_ERROR
 
     /* close the attribute */
     if(H5Aclose(aid) < 0) TEST_ERROR
@@ -10131,17 +10138,17 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d
 
 error:
     H5E_BEGIN_TRY {
-    	H5Tclose(tid);
-    	H5Tclose(f_tid);
-    	H5Tclose(g_tid);
-    	H5Tclose(anon_tid);
-	H5Pclose(ocpypl_id);
-	H5Aclose(aid);
-    	H5Dclose(did);
-    	H5Sclose(sid);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Tclose(tid);
+        H5Tclose(f_tid);
+        H5Tclose(g_tid);
+        H5Tclose(anon_tid);
+    H5Pclose(ocpypl_id);
+    H5Aclose(aid);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_cdt_hier_merge */
@@ -10151,22 +10158,22 @@ error:
  * Function:    test_copy_cdt_merge_cdt
  *
  * Purpose:     Tests the "merge committed datatypes" feature of H5Ocopy:
- *		SRC file:
- *			Create committed datatype (short)
- *			Create committed datatype (float)
- *			Create committed datatype (int), with attribute of ndt int
- *			Create committed datatype (double), with attribute of anon ndt short
- *		DST file:
- *			Create committed datatype (int)
- *			Create committed datatype (float), with attribute of native int
- *			Create committed datatype (double), with attribute of anon ndt short 
- *
- *		Copy / at SRC to DST
- *		Verify that committed datatypes are copied and merged correctly
- *
- *		NOTE: 
- *		  Comparison of attributes are not implemented yet.
- *		  Further tests will be added in the future.
+ *        SRC file:
+ *            Create committed datatype (short)
+ *            Create committed datatype (float)
+ *            Create committed datatype (int), with attribute of ndt int
+ *            Create committed datatype (double), with attribute of anon ndt short
+ *        DST file:
+ *            Create committed datatype (int)
+ *            Create committed datatype (float), with attribute of native int
+ *            Create committed datatype (double), with attribute of anon ndt short
+ *
+ *        Copy / at SRC to DST
+ *        Verify that committed datatypes are copied and merged correctly
+ *
+ *        NOTE:
+ *          Comparison of attributes are not implemented yet.
+ *          Further tests will be added in the future.
  *
  * Return:      Success:        0
  *              Failure:        number of errors
@@ -10181,15 +10188,15 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds
     hid_t fid_src = -1, fid_dst = -1;           /* File IDs */
     hid_t tid1 = -1, tid2 = -1;                 /* Datatype IDs */
     hid_t tid3 = -1, tid4 = -1;                 /* Datatype IDs */
-    hid_t tid5 = -1, tid = -1;                 	/* Datatype IDs */
+    hid_t tid5 = -1, tid = -1;                     /* Datatype IDs */
     hid_t sid = -1;                             /* Dataspace ID */
-    hid_t aid = -1;				/* Attribute ID */
+    hid_t aid = -1;                /* Attribute ID */
     hid_t ocpypl_id = -1;                       /* Object copy plist ID */
-    hsize_t dim1d[1];				/* dimension sizes */
+    hsize_t dim1d[1];                /* dimension sizes */
     H5O_info_t oinfo;                           /* Object info */
-    haddr_t exp_addr;      			/* Expected object addresses */
-    char src_filename[NAME_BUF_SIZE];		/* Source file name */
-    char dst_filename[NAME_BUF_SIZE];		/* Destination file name */
+    haddr_t exp_addr;                  /* Expected object addresses */
+    char src_filename[NAME_BUF_SIZE];        /* Source file name */
+    char dst_filename[NAME_BUF_SIZE];        /* Destination file name */
 
     if(reopen)
         TESTING("H5Ocopy(): merging various committed datatypes with reopen")
@@ -10203,8 +10210,8 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds
     /* Reset file address checking info */
     addr_reset();
 
-    /* 
-     * Populate source file 
+    /*
+     * Populate source file
      */
     if((fid_src = H5Fcreate(src_filename, H5F_ACC_TRUNC, fcpl_src, src_fapl)) < 0) TEST_ERROR
 
@@ -10254,8 +10261,8 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds
     /* close the SRC file */
     if(H5Fclose(fid_src) < 0) TEST_ERROR
 
-    /* 
-     * Populate destination file 
+    /*
+     * Populate destination file
      */
     if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, dst_fapl)) < 0) TEST_ERROR
 
@@ -10310,8 +10317,8 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds
     /* copy everything in SRC to DST */
     if(H5Ocopy(fid_src, "/", fid_dst, SRC_ROOT_GROUP, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR
 
-    /* 
-     * Verification 
+    /*
+     * Verification
      */
     /* get address of committed datatype: /src_root/src_ndt_double */
     if((tid = H5Topen2(fid_dst, "/" SRC_ROOT_GROUP "/" SRC_NDT_DOUBLE, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -10375,29 +10382,29 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds
 
 error:
     H5E_BEGIN_TRY {
-	H5Pclose(ocpypl_id);
-	H5Tclose(tid);
-	H5Tclose(tid1);
-	H5Tclose(tid2);
-	H5Tclose(tid3);
-	H5Tclose(tid4);
-	H5Tclose(tid5);
-	H5Aclose(aid);
-    	H5Sclose(sid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+    H5Pclose(ocpypl_id);
+    H5Tclose(tid);
+    H5Tclose(tid1);
+    H5Tclose(tid2);
+    H5Tclose(tid3);
+    H5Tclose(tid4);
+    H5Tclose(tid5);
+    H5Aclose(aid);
+        H5Sclose(sid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_cdt_merge_cdt */
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_cdt_merge_suggs
  *
  * Purpose:     Tests the suggested searching paths feature (H5Padd_merge_committed_dtype_path)
- *		is correctly applied in merging the committed datatypes.
- *		
+ *        is correctly applied in merging the committed datatypes.
+ *
  * Return:      Success:        0
  *              Failure:        number of errors
  *
@@ -10466,7 +10473,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
     /*
-     * Test 1 
+     * Test 1
      */
     /* open the source file with read-only */
     if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR
@@ -10502,8 +10509,8 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
-     * Test 2 
+    /*
+     * Test 2
      */
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -10535,8 +10542,8 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
-     * Test 3 
+    /*
+     * Test 3
      */
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -10551,7 +10558,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* copy "/src_ndt_int" from SRC file to "/src_ndt_int2" at DST file */
     /* copy with merging and search suggestion: "/uncopied/src_ndt_int" */
     if(H5Ocopy(fid_src, SRC_NDT_INT, fid_dst, SRC_NDT_INT2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR
-    
+
     if(reopen) {
         /* Reopen file */
         if(H5Fclose(fid_dst) < 0) TEST_ERROR
@@ -10573,8 +10580,8 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
-     * Test 4 
+    /*
+     * Test 4
      */
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -10626,13 +10633,13 @@ error:
     return 1;
 } /* end test_copy_cdt_merge_suggs */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_cdt_merge_dset_suggs
  *
  * Purpose:     Tests the suggested searching paths feature (H5Padd_merge_committed_dtype_path)
- *		is correctly applied in merging the committed datatypes of datasets.
- *		
+ *        is correctly applied in merging the committed datatypes of datasets.
+ *
  * Return:      Success:        0
  *              Failure:        number of errors
  *
@@ -10727,7 +10734,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if(H5Sclose(sid) < 0) TEST_ERROR
 
     /*
-     * Test 1 
+     * Test 1
      */
     /* open the source file with read-only */
     if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR
@@ -10765,8 +10772,8 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
-     * Test 2 
+    /*
+     * Test 2
      */
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -10802,8 +10809,8 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
-     * Test 3 
+    /*
+     * Test 3
      */
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -10818,7 +10825,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* copy "src_ndt_dset" from SRC file to "/src_ndt_dset2" at DST file */
     /* use merging and suggested searching path: "/uncopied/src_ndt_dset" */
     if(H5Ocopy(fid_src, SRC_NDT_DSET, fid_dst, SRC_NDT_DSET2, ocpypl_id, H5P_DEFAULT) < 0) TEST_ERROR
-    
+
     if(reopen) {
         /* Reopen file */
         if(H5Fclose(fid_dst) < 0) TEST_ERROR
@@ -10844,8 +10851,8 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
-     * Test 4 
+    /*
+     * Test 4
      */
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -10903,12 +10910,12 @@ error:
     return 1;
 } /* end test_copy_cdt_merge_dset_suggs */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_cdt_merge_all_suggs
  *
  * Purpose:     Tests the merging committed datatype + search suggestion feature.
- *		
+ *
  * Return:      Success:        0
  *              Failure:        number of errors
  *
@@ -10927,8 +10934,8 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     hid_t aid = -1;                             /* Attribute ID */
     hid_t did = -1;                             /* Dataset ID */
     hid_t exp_did = -1;                          /* Dataset ID */
-    hid_t tid_short = -1; 			/* Datatype ID */
-    hid_t exp_tid = -1;				/* Expected datatype ID */
+    hid_t tid_short = -1;             /* Datatype ID */
+    hid_t exp_tid = -1;                /* Expected datatype ID */
     hid_t ocpypl_id = -1;                       /* Object copy plist ID */
     hsize_t dim1d[1];                           /* Dataset dimensions */
     char src_filename[NAME_BUF_SIZE];
@@ -10984,7 +10991,7 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
     /* create third dataset in group */
     if((did = H5Dcreate2(gid, SRC_DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    
+
     /* get datatype */
     if((tid_short = H5Topen2(fid_src, "/" SRC_GRP "/" SRC_NDT_SHORT, H5P_DEFAULT)) < 0) TEST_ERROR
 
@@ -11113,7 +11120,7 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Test 1
      */
     /* open the source file with read-only */
@@ -11154,7 +11161,7 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Test 2
      */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -11191,7 +11198,7 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Test 3
      */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -11226,7 +11233,7 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Test 4
      */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -11279,7 +11286,7 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Test 5
      */
     /* open destination file */
@@ -11317,7 +11324,7 @@ test_copy_cdt_merge_all_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* close the DST file */
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Test 6
      */
     /* open destination file */
@@ -11378,7 +11385,7 @@ error:
     return 1;
 } /* end test_copy_cdt_merge_all_suggs */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_set_mcdt_search_cb
  *
@@ -11457,7 +11464,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -11487,7 +11494,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "a" */
+    /* committed datatype "a" */
     if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -11496,7 +11503,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "b" */
+    /* committed datatype "b" */
     if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -11563,7 +11570,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
     /* Continue the global search */
     if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cb, &cb_udata) < 0)
-	TEST_ERROR
+    TEST_ERROR
 
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -11598,7 +11605,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if(H5Fclose(fid_dst) < 0) TEST_ERROR
 
 
-    /* 
+    /*
      * Stop the search, default action is to create an anonymous committed datatype
      */
     cb_udata.search_action = H5O_MCDT_SEARCH_STOP;
@@ -11734,7 +11741,7 @@ error:
     return 1;
 } /* end test_copy_set_mcdt_search_cb */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_set_get_mcdt_cb
  *
@@ -11780,10 +11787,10 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     int buf[DIM_SIZE_1];                        /* Buffer for writing data */
     char src_filename[NAME_BUF_SIZE];
     char dst_filename[NAME_BUF_SIZE];
-    H5O_mcdt_search_cb_t mcdt_cb = NULL;	/* The callback function */
-    H5O_mcdt_search_ret_t mcdt_udataA;		/* User data for callback */
-    H5O_mcdt_search_ret_t mcdt_udataB;		/* User data for callback */
-    H5O_mcdt_search_ret_t *mcdt_udata_p = NULL;	/* Pointer to user data for callback */
+    H5O_mcdt_search_cb_t mcdt_cb = NULL;    /* The callback function */
+    H5O_mcdt_search_ret_t mcdt_udataA;        /* User data for callback */
+    H5O_mcdt_search_ret_t mcdt_udataB;        /* User data for callback */
+    H5O_mcdt_search_ret_t *mcdt_udata_p = NULL;    /* Pointer to user data for callback */
 
     if(reopen)
         TESTING("H5Ocopy(): H5Pset/get_mcdt_search_cb and reopen")
@@ -11816,7 +11823,7 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -11846,7 +11853,7 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "a" */
+    /* committed datatype "a" */
     if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -11855,7 +11862,7 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "b" */
+    /* committed datatype "b" */
     if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -11913,7 +11920,7 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
 
     /* Continue the global search */
     if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbA, &mcdt_udataA) < 0)
-	TEST_ERROR
+    TEST_ERROR
 
     /* open the destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -11946,7 +11953,7 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     mcdt_udataB = H5O_MCDT_SEARCH_STOP;
 
     if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbA, &mcdt_udataB) < 0)
-	TEST_ERROR
+    TEST_ERROR
 
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -11976,7 +11983,7 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if(H5Pfree_merge_committed_dtype_paths(ocpypl_id) < 0) TEST_ERROR
 
     if(H5Pset_mcdt_search_cb(ocpypl_id, mcdt_search_cbB, &mcdt_udataB) < 0)
-	TEST_ERROR
+    TEST_ERROR
 
     /* open destination file */
     if((fid_dst = H5Fopen(dst_filename, H5F_ACC_RDWR, dst_fapl)) < 0) TEST_ERROR
@@ -12029,7 +12036,7 @@ error:
     return 1;
 } /* end test_copy_set_get_mcdt_search_cb */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_iterate
  *
@@ -12065,7 +12072,7 @@ test_copy_iterate(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl
     hid_t fid1 = -1, fid2 = -1;                 /* File IDs */
     hid_t gid = -1;                             /* Group ID */
     int i;
-    char grp_name[8];
+    char grp_name[16];
     char src_filename[NAME_BUF_SIZE];
     char dst_filename[NAME_BUF_SIZE];
 
@@ -12127,7 +12134,7 @@ error:
     return 1;
 } /* end test_copy_iterate */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_option
  *
@@ -12139,8 +12146,6 @@ error:
  * Programmer:  Peter Cao
  *               March 11, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -12152,7 +12157,7 @@ test_copy_option(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl,
     hid_t did = -1;                             /* Dataset ID */
     hid_t gid=-1, gid2=-1, gid_ref=-1;          /* Group IDs */
     hid_t gid_sub=-1, gid_sub_sub=-1;           /* Sub-group ID */
-    hid_t pid=-1, lcpl_id=-1;			/* Property IDs */
+    hid_t pid=-1, lcpl_id=-1;            /* Property IDs */
     unsigned cpy_flags;                         /* Object copy flags */
     int depth = -1;                             /* Copy depth */
     hsize_t dim2d[2];
@@ -12405,51 +12410,51 @@ error:
     H5E_BEGIN_TRY {
         H5Pclose(lcpl_id);
         H5Pclose(pid);
-    	H5Sclose(sid);
-    	H5Dclose(did);
-    	H5Gclose(gid_ref);
-    	H5Gclose(gid_sub);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
-    	H5Fclose(fid_ext);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Gclose(gid_ref);
+        H5Gclose(gid_sub);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
+        H5Fclose(fid_ext);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_option */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy_dataset_open
  *
  * Purpose:     To ensure that H5Ocopy() copies data of opened dataset correctly.
- *		This is for bug fix HDFFV-7853.
- *
- *		Test Case 1:
- *		Create a dataset with attributes in SRC file
- *		Copy the opened dataset to another location in the same file
- *		Copy the opened dataset to DST file
- *		Close the dataset
- *
- *		Test Case 2:
- *		Reopen the dataset, write new data to the dataset
- *		Copy the opened dataset to another location in the same file
- *		Copy the opened dataset to to DST file
- *		Close the dataset
- *
- *		Test Case 3:
- *		Create a committed datatype
- *		Create a dataset with the committed datatype in SRC file
- *		Open the committed datatype
- *		Copy the opened dataset (with the opened committed datatype) to another location in the same file
- *		Copy the opened dataset (with the opened committed datatype) to DST file
- *		Close the dataset and the committed datatype
- *
- *		Test Case 4:
- *		Create a group with attributes, create a dataset in the group
- *		Copy the opened group (together with the opened dataset) to another location in the same file
- *		Copy the opened group (together with the opened dataset) to DST file
- *		Close the group and the dataset
+ *        This is for bug fix HDFFV-7853.
+ *
+ *        Test Case 1:
+ *        Create a dataset with attributes in SRC file
+ *        Copy the opened dataset to another location in the same file
+ *        Copy the opened dataset to DST file
+ *        Close the dataset
+ *
+ *        Test Case 2:
+ *        Reopen the dataset, write new data to the dataset
+ *        Copy the opened dataset to another location in the same file
+ *        Copy the opened dataset to to DST file
+ *        Close the dataset
+ *
+ *        Test Case 3:
+ *        Create a committed datatype
+ *        Create a dataset with the committed datatype in SRC file
+ *        Open the committed datatype
+ *        Copy the opened dataset (with the opened committed datatype) to another location in the same file
+ *        Copy the opened dataset (with the opened committed datatype) to DST file
+ *        Close the dataset and the committed datatype
+ *
+ *        Test Case 4:
+ *        Create a group with attributes, create a dataset in the group
+ *        Copy the opened group (together with the opened dataset) to another location in the same file
+ *        Copy the opened group (together with the opened dataset) to DST file
+ *        Close the group and the dataset
  *
  * Return:      Success:        0
  *              Failure:        number of errors
@@ -12457,8 +12462,6 @@ error:
  * Programmer:  Vailin Choi
  *              Feb 7, 2012
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -12470,10 +12473,10 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     hid_t did = -1, did2 = -1;                  /* Dataset IDs */
     hid_t did3 = -1, did4 = -1;                 /* Dataset IDs */
     hid_t gid = -1, gid2 = -1;                  /* Group IDs */
+    hid_t pid = -1;                             /* Dataset creation property list */
+    hsize_t chunk_dim2d[2] = {CHUNK_SIZE_1, CHUNK_SIZE_2};   /* Chunk dimension sizes */
     int buf[DIM_SIZE_1][DIM_SIZE_2];            /* Buffer for writing data */
     int newbuf[DIM_SIZE_1][DIM_SIZE_2];         /* Buffer for writing data */
-    hid_t pid = -1;                             /* Dataset creation property list */
-    hsize_t chunk_dim2d[2] ={CHUNK_SIZE_1, CHUNK_SIZE_2};   /* Chunk dimension sizes */
     hsize_t dim2d[2];                           /* Dataset dimensions */
     int i, j;                                   /* local index variables */
     char src_filename[NAME_BUF_SIZE];
@@ -12532,18 +12535,18 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     if(test_copy_attach_attributes(did, H5T_NATIVE_INT) < 0) TEST_ERROR
     if(test_copy_attach_attributes(did2, H5T_NATIVE_INT) < 0) TEST_ERROR
 
-    /* 
-     * Test case 1 
+    /*
+     * Test case 1
      */
 
-    /* 
+    /*
      * Copy within the same file
      */
     /* copy the opened dataset to another location in SRC file */
     if(H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_src, NAME_DATASET_SIMPLE2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
     if(H5Ocopy(fid_src, NAME_DATASET_CHUNKED, fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
 
-    /* open the copied datasets */
+    /* open the copied dataset */
     if((did3 = H5Dopen2(fid_src, NAME_DATASET_SIMPLE2, H5P_DEFAULT)) < 0) TEST_ERROR
     if((did4 = H5Dopen2(fid_src, NAME_DATASET_CHUNKED2, H5P_DEFAULT)) < 0) TEST_ERROR
 
@@ -12555,7 +12558,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     if(H5Dclose(did3) < 0) TEST_ERROR
     if(H5Dclose(did4) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Copy to another file
      */
     /* copy the opened dataset from SRC to DST */
@@ -12578,8 +12581,8 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     if(H5Dclose(did) < 0) TEST_ERROR
     if(H5Dclose(did2) < 0) TEST_ERROR
 
-    /* 
-     * Test case 2 
+    /*
+     * Test case 2
      */
     /* reopen the dataset in SRC file */
     if((did = H5Dopen2(fid_src, NAME_DATASET_SIMPLE, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -12589,7 +12592,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, newbuf) < 0) TEST_ERROR
     if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, newbuf) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Copy within the same file
      */
     /* copy the opened dataset to another location in SRC file */
@@ -12607,7 +12610,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     /* close the copied dataset in SRC file */
     if(H5Dclose(did3) < 0) TEST_ERROR
     if(H5Dclose(did4) < 0) TEST_ERROR
-    /* 
+    /*
      * Copy to another file
      */
     /* copy the opened dataset from SRC to DST */
@@ -12630,8 +12633,8 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     if(H5Dclose(did) < 0) TEST_ERROR
     if(H5Dclose(did2) < 0) TEST_ERROR
 
-    /* 
-     * Test case 3 
+    /*
+     * Test case 3
      */
 
     /* make a copy of the datatype */
@@ -12652,7 +12655,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     /* write data to the dataset */
     if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Copy within the same file
      */
     /* copy the opened dataset (with the opened committed datatype) to another location in SRC file */
@@ -12667,7 +12670,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     /* close the copied dataset in SRC file */
     if(H5Dclose(did2) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Copy to another file
      */
     /* copy the opened dataset (with the opened committed datatype) from SRC to DST */
@@ -12688,8 +12691,8 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     /* close the committed datatype at SRC file */
     if(H5Tclose(tid) < 0) TEST_ERROR
 
-    /* 
-     * Test case 4 
+    /*
+     * Test case 4
      */
     /* create a group in SRC file */
     if((gid = H5Gcreate2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -12702,7 +12705,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
 
     /* write data to the dataset */
     if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR
-    /* 
+    /*
      * Copy within the same file
      */
     /* copy the opened group (together with opened dataset) to another location in SRC file */
@@ -12717,7 +12720,7 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
     /* close the DST dataset */
     if(H5Gclose(gid2) < 0) TEST_ERROR
 
-    /* 
+    /*
      * Copy to another file
      */
     /* copy the opened group (together with opened dataset) to DST file */
@@ -12752,20 +12755,20 @@ test_copy_dataset_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did);
-    	H5Dclose(did2);
-    	H5Sclose(sid);
-    	H5Gclose(gid);
-    	H5Gclose(gid2);
-    	H5Fclose(fid_dst);
-    	H5Fclose(fid_src);
+        H5Dclose(did);
+        H5Dclose(did2);
+        H5Sclose(sid);
+        H5Gclose(gid);
+        H5Gclose(gid2);
+        H5Fclose(fid_dst);
+        H5Fclose(fid_src);
     } H5E_END_TRY;
     return 1;
 } /* end test_copy_dataset_open */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:   	main
+ * Function:       main
  *
  * Purpose:     Test H5Ocopy()
  *
@@ -12778,19 +12781,17 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
     int     nerrors = 0;
-    hid_t	fapl, fapl2;
+    hid_t    fapl, fapl2;
     hid_t   fcpl_shared, ocpl;
     unsigned    max_compact, min_dense;
     int     configuration;  /* Configuration of tests. */
-    int	ExpressMode;
+    int    ExpressMode;
     hbool_t same_file;  /* Whether to run tests that only use one file */
 
     /* Setup */
@@ -12799,7 +12800,7 @@ main(void)
 
     ExpressMode = GetTestExpress();
     if (ExpressMode > 1)
-        printf("***Express test mode on.  Some tests may be skipped\n");
+        HDprintf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Copy the file access property list */
     if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
@@ -12835,52 +12836,52 @@ main(void)
 
         /* Test with and without shared messages */
         if(configuration & CONFIG_SHARE_SRC) {
-            puts("\nTesting with shared src messages:");
+            HDputs("\nTesting with shared src messages:");
             fcpl_src = fcpl_shared;
         }
         else {
-            puts("\nTesting without shared src messages:");
+            HDputs("\nTesting without shared src messages:");
             fcpl_src = H5P_DEFAULT;
         }
         if(configuration & CONFIG_SHARE_DST) {
-            puts("Testing with shared dst messages:");
+            HDputs("Testing with shared dst messages:");
             fcpl_dst = fcpl_shared;
             same_file = FALSE;
         }
         else {
-            puts("Testing without shared dst messages:");
+            HDputs("Testing without shared dst messages:");
             fcpl_dst = H5P_DEFAULT;
         }
 
         /* Set the FAPL for the source file's type of format */
         if(configuration & CONFIG_SRC_NEW_FORMAT) {
-            puts("Testing with latest format for source file:");
+            HDputs("Testing with latest format for source file:");
             src_fapl = fapl2;
 
             /* Test with and without dense attributes */
             if(configuration & CONFIG_DENSE) {
-                puts("Testing with dense attributes:");
+                HDputs("Testing with dense attributes:");
                 num_attributes_g = max_compact + 1;
             }
             else {
-                puts("Testing without dense attributes:");
+                HDputs("Testing without dense attributes:");
                 num_attributes_g = MAX(min_dense, 2) - 2;
             }
         } /* end if */
         else {
-	    puts("Testing with oldest file format for source file:");
+            HDputs("Testing with oldest file format for source file:");
             src_fapl = fapl;
             num_attributes_g = 4;
         } /* end else */
 
         /* Set the FAPL for the destination file's type of format */
         if(configuration & CONFIG_DST_NEW_FORMAT) {
-            puts("Testing with latest format for destination file:");
+            HDputs("Testing with latest format for destination file:");
             dst_fapl = fapl2;
             same_file = FALSE;
         } /* end if */
         else {
-            puts("Testing with oldest file format for destination file:");
+            HDputs("Testing with oldest file format for destination file:");
             dst_fapl = fapl;
         } /* end else */
 
@@ -12939,10 +12940,10 @@ main(void)
                     FALSE, "H5Ocopy(): expand soft link");
         nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl,
                     H5O_COPY_EXPAND_EXT_LINK_FLAG,
-                    FALSE, "H5Ocopy: expand external link");
+                    FALSE, "H5Ocopy(): expand external link");
         nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl,
                     H5O_COPY_EXPAND_SOFT_LINK_FLAG | H5O_COPY_EXPAND_EXT_LINK_FLAG,
-                    FALSE, "H5Ocopy: expand soft and external links");
+                    FALSE, "H5Ocopy(): expand soft and external links");
         nerrors += test_copy_option(fcpl_src, fcpl_dst, src_fapl, dst_fapl,
                     H5O_COPY_SHALLOW_HIERARCHY_FLAG,
                     FALSE, "H5Ocopy(): shallow group copy");
@@ -13007,7 +13008,6 @@ main(void)
             nerrors += test_copy_dataset_compressed_named_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
             nerrors += test_copy_dataset_compact_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
 
-
             /* Test with dataset opened in the file or not */
             nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, FALSE);
             nerrors += test_copy_dataset_contig_vl_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl, TRUE);
@@ -13023,7 +13023,7 @@ main(void)
             nerrors += test_copy_dataset_compact_cmpd_vl(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
 
             nerrors += test_copy_same_file_named_datatype(fcpl_src, src_fapl);
-            
+
             /* Test with dataset opened in the file or not */
             nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, FALSE);
             nerrors += test_copy_old_layout(fcpl_dst, dst_fapl, TRUE);
@@ -13033,7 +13033,7 @@ main(void)
             nerrors += test_copy_null_ref_open(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
 
             nerrors += test_copy_iterate(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
-        }
+        } /* end if */
 
 /* TODO: not implemented
         nerrors += test_copy_mount(src_fapl);
@@ -13048,12 +13048,12 @@ main(void)
 
     /* Results */
     if(nerrors) {
-        printf("***** %d OBJECT COPY TEST%s FAILED! *****\n",
+        HDprintf("***** %d OBJECT COPY TEST%s FAILED! *****\n",
                 nerrors, (1 == nerrors ? "" : "S"));
-        exit(1);
+        exit(EXIT_FAILURE);
     } /* end if */
 
-    puts ("All object copying tests passed.");
+    HDputs ("All object copying tests passed.");
 
     h5_cleanup(FILENAME, fapl);
 
diff --git a/test/ohdr.c b/test/ohdr.c
index 9c43774..9033bfd 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -45,24 +45,24 @@ const char *FILENAME[] = {
 
 /*
  *  Verify that messages are moved forward into a "continuation message":
- *	Create an object header with several continuation chunks
- *	Remove a message in the last chunk
- *	The remaining message(s) in the last chunk should be moved forward into the continuation message
- *	The process will repeat when the continuation message is big enough to hold all the
- *		messages in the last chunk.
- *	Result: the number of chunks should be reduced
+ *    Create an object header with several continuation chunks
+ *    Remove a message in the last chunk
+ *    The remaining message(s) in the last chunk should be moved forward into the continuation message
+ *    The process will repeat when the continuation message is big enough to hold all the
+ *        messages in the last chunk.
+ *    Result: the number of chunks should be reduced
  */
 static herr_t
 test_cont(char *filename, hid_t fapl)
 {
-    hid_t	file=-1;
-    H5F_t	*f = NULL;
+    hid_t    file=-1;
+    H5F_t    *f = NULL;
     H5O_hdr_info_t hdr_info;
-    H5O_loc_t	oh_locA, oh_locB;
-    time_t	time_new;
-    const char	*short_name = "T";
-    const char	*long_name = "This is the message";
-    size_t	nchunks;
+    H5O_loc_t    oh_locA, oh_locB;
+    time_t    time_new;
+    const char    *short_name = "T";
+    const char    *long_name = "This is the message";
+    size_t    nchunks;
 
     TESTING("object header continuation block");
 
@@ -82,58 +82,57 @@ test_cont(char *filename, hid_t fapl)
     time_new = 11111111;
 
     if(H5O_msg_create(&oh_locA, H5O_NAME_ID, 0, 0, &long_name, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(H5O_msg_create(&oh_locA, H5O_MTIME_NEW_ID, 0, 0, &time_new, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(H5O_msg_create(&oh_locB, H5O_MTIME_ID, 0, 0, &time_new, H5P_DATASET_XFER_DEFAULT) < 0)
         FAIL_STACK_ERROR
 
     if(H5O_msg_create(&oh_locA, H5O_NAME_ID, 0, 0, &short_name, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(1 != H5O_link(&oh_locA, 1, H5P_DATASET_XFER_DEFAULT))
         FAIL_STACK_ERROR
     if(1 != H5O_link(&oh_locB, 1, H5P_DATASET_XFER_DEFAULT))
         FAIL_STACK_ERROR
     if(H5AC_flush(f, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(H5O_expunge_chunks_test(&oh_locA, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(H5O_get_hdr_info(&oh_locA, H5P_DATASET_XFER_DEFAULT, &hdr_info) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     nchunks = hdr_info.nchunks;
 
     /* remove the 1st H5O_NAME_ID message */
     if(H5O_msg_remove(&oh_locA, H5O_NAME_ID, 0, FALSE, H5P_DATASET_XFER_DEFAULT) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(H5O_get_hdr_info(&oh_locA, H5P_DATASET_XFER_DEFAULT, &hdr_info) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(hdr_info.nchunks >= nchunks)
-	TEST_ERROR
+        TEST_ERROR
 
     if(H5O_close(&oh_locA) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(H5O_close(&oh_locB) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(H5Fclose(file) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     PASSED();
 
-
-    return 0;
+    return SUCCEED;
 
 error:
     H5E_BEGIN_TRY {
@@ -142,8 +141,8 @@ error:
         H5Fclose(file);
     } H5E_END_TRY;
 
-    return -1;
-} /* test_cont() */
+    return FAIL;
+} /* end test_cont() */
 
 /*
  *  Verify that object headers are held in the cache until they are linked
@@ -156,15 +155,15 @@ error:
 static herr_t
 test_ohdr_cache(char *filename, hid_t fapl)
 {
-    hid_t	file = -1;              /* File ID */
+    hid_t    file = -1;              /* File ID */
     hid_t       my_fapl;                /* FAPL ID */
     hid_t       my_dxpl;                /* DXPL ID */
     H5AC_cache_config_t mdc_config;     /* Metadata cache configuration info */
-    H5F_t	*f = NULL;              /* File handle */
+    H5F_t    *f = NULL;              /* File handle */
     H5HL_t      *lheap, *lheap2, *lheap3; /* Pointer to local heaps */
     haddr_t     lheap_addr, lheap_addr2, lheap_addr3; /* Local heap addresses */
-    H5O_loc_t	oh_loc;                 /* Object header location */
-    time_t	time_new;               /* Time value for modification time message */
+    H5O_loc_t    oh_loc;                 /* Object header location */
+    time_t    time_new;               /* Time value for modification time message */
     unsigned    rc;                     /* Refcount for object */
 
     TESTING("object header creation in cache");
@@ -192,7 +191,7 @@ test_ohdr_cache(char *filename, hid_t fapl)
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0)
         FAIL_STACK_ERROR
     if(H5Pclose(my_fapl) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
@@ -270,28 +269,28 @@ test_ohdr_cache(char *filename, hid_t fapl)
         FAIL_STACK_ERROR
 
     if(H5Pclose(my_dxpl) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(H5Fclose(file) < 0)
-	FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     PASSED();
 
-    return 0;
+    return SUCCEED;
 
 error:
     H5E_BEGIN_TRY {
         H5Fclose(file);
     } H5E_END_TRY;
 
-    return -1;
+    return FAIL;
 } /* test_ohdr_cache() */
 
 /*
  *  To test objects with unknown messages in a file with:
- *  	a) H5O_BOGUS_VALID_ID:
- *	   --the bogus_id is within the range of H5O_msg_class_g[]
- *  	b) H5O_BOGUS_INVALID_ID:
- *  	   --the bogus_id is outside the range of H5O_msg_class_g[]
+ *      a) H5O_BOGUS_VALID_ID:
+ *       --the bogus_id is within the range of H5O_msg_class_g[]
+ *      b) H5O_BOGUS_INVALID_ID:
+ *         --the bogus_id is outside the range of H5O_msg_class_g[]
  *
  *   The test file is FILE_BOGUS: "tbogus.h5" generated with gen_bogus.c
  *   --objects that have unknown header messages with H5O_BOGUS_VALID_ID in "/"
@@ -302,22 +301,22 @@ error:
 static herr_t
 test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 {
-    hid_t fid = -1;	/* file ID */
-    hid_t gid = -1;	/* group ID */
-    hid_t did = -1;	/* Dataset ID */
+    hid_t fid = -1;    /* file ID */
+    hid_t gid = -1;    /* group ID */
+    hid_t did = -1;    /* Dataset ID */
     hid_t sid = -1;     /* Dataspace ID */
     hid_t aid = -1;     /* Attribute ID */
-    hid_t loc = -1;	/* location: file or group ID */
-    hid_t fid_bogus = -1;	/* bogus file ID */
-    hid_t gid_bogus = -1;	/* bogus group ID */
-    hid_t loc_bogus = -1;	/* location: bogus file or group ID */
+    hid_t loc = -1;    /* location: file or group ID */
+    hid_t fid_bogus = -1;    /* bogus file ID */
+    hid_t gid_bogus = -1;    /* bogus group ID */
+    hid_t loc_bogus = -1;    /* location: bogus file or group ID */
     char testfile[256];
 
     /* create a different name for a local copy of the data file to be
        opened with rd/wr file permissions in case build and test are
        done in the source directory. */
-    HDstrncpy(testfile, FILE_BOGUS, strlen(FILE_BOGUS));
-    testfile[strlen(FILE_BOGUS)]='\0';
+    HDstrncpy(testfile, FILE_BOGUS, HDstrlen(FILE_BOGUS));
+    testfile[HDstrlen(FILE_BOGUS)]='\0';
     HDstrncat(testfile, ".copy", 5);
 
     /* Make a copy of the data file from svn. */
@@ -337,7 +336,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     /* Set up location ID depending on bogus_id */
     if(bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in FILE_BOGUS */
-        if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0) 
+        if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR
         loc_bogus = gid_bogus;
 
@@ -402,7 +401,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     /* Set up location ID depending on bogus_id */
     if(bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in filename */
-        if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+        if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR
         loc = gid;
     } else
@@ -436,7 +435,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     /* Set up location ID depending on bogus_id */
     if(bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in filename */
-        if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+        if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR
         loc = gid;
     } else
@@ -482,7 +481,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     /* Set up location ID depending on bogus_id */
     if(bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in filename */
-        if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+        if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR
         loc = gid;
     } else
@@ -500,7 +499,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     if(H5Dclose(did) < 0)
         FAIL_STACK_ERROR
 
-    /* Closing: filename */ 
+    /* Closing: filename */
     if(bogus_id == H5O_BOGUS_INVALID_ID)
         if(H5Gclose(gid) < 0)
             FAIL_STACK_ERROR
@@ -525,7 +524,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     /* Set up location ID */
     if(bogus_id == H5O_BOGUS_INVALID_ID) {
         /* Open "group" in FILE_BOGUS */
-        if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0) 
+        if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR
         loc_bogus = gid_bogus;
     } else
@@ -548,7 +547,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
     /* Closing: FILE_BOGUS */
     if(bogus_id == H5O_BOGUS_INVALID_ID)
         if(H5Gclose(gid_bogus) < 0)
-	        FAIL_STACK_ERROR
+            FAIL_STACK_ERROR
     if(H5Fclose(fid_bogus) < 0)
         FAIL_STACK_ERROR
 
@@ -572,14 +571,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
  * Purpose:     Exercise private object header behavior and routines
  *
- * Return:	Success:        0
- *		Failure:        1
+ * Return:      Success: 0
+ *              Failure: 1
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Tuesday, November 24, 1998
  *
  *-------------------------------------------------------------------------
@@ -637,7 +636,6 @@ main(void)
             FAIL_STACK_ERROR
         PASSED();
 
-
         /* create a new message */
         TESTING("message creation");
         time_new = 11111111;
@@ -655,7 +653,6 @@ main(void)
             TEST_ERROR
         PASSED();
 
-
         /*
          * Test modification of an existing message.
          */
@@ -954,16 +951,16 @@ main(void)
     /* Verify symbol table messages are cached */
     if(h5_verify_cached_stabs(FILENAME, fapl) < 0) TEST_ERROR
 
-    puts("All object header tests passed.");
+    HDputs("All object header tests passed.");
     h5_cleanup(FILENAME, fapl);
-    return(0);
+    return 0;
 
 error:
-    puts("*** TESTS FAILED ***");
+    HDputs("*** TESTS FAILED ***");
     H5E_BEGIN_TRY {
         H5Fclose(file);
     } H5E_END_TRY;
 
-    return(1);
+    return 1;
 } /* end main() */
 
diff --git a/test/set_extent.c b/test/set_extent.c
index 16a283d..39a100f 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -48,11 +48,11 @@ const char *FILENAME[] = {
                                 + CONFIG_EARLY_ALLOC)
 #define FILL_VALUE -1
 #define DO_RANKS_PRINT_CONFIG(TEST) {                                          \
-    printf("  Config:\n");                                                     \
-    printf("   Test: %s\n", TEST);                                             \
-    printf("   Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \
-    printf("   Fill value: %s\n", (do_fillvalue ? "yes" : "no"));              \
-    printf("   Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes"   \
+    HDprintf("  Config:\n");                                                     \
+    HDprintf("   Test: %s\n", TEST);                                             \
+    HDprintf("   Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \
+    HDprintf("   Fill value: %s\n", (do_fillvalue ? "yes" : "no"));              \
+    HDprintf("   Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes"   \
             : "no"));                                                          \
 } /* end DO_RANKS_PRINT_CONFIG */
 
@@ -141,17 +141,17 @@ int main( void )
         for(chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) {
             /* Output message about the type of format */
             if(new_format)
-                printf("Testing with new file format");
+                HDprintf("Testing with new file format");
             else
-                printf("Testing with old file format");
+                HDprintf("Testing with old file format");
 
             /* Set the FAPL for the chunk cache settings */
             if(chunk_cache) {
-                puts(" and chunk cache enabled:");
+                HDputs(" and chunk cache enabled:");
                 my_fapl = fapl;
             } /* end if */
             else {
-                puts(" and chunk cache disabled:");
+                HDputs(" and chunk cache disabled:");
                 my_fapl = fapl2;
             } /* end else */
 
@@ -190,13 +190,13 @@ int main( void )
 
     if(nerrors)
         goto error;
-    puts("All H5Dset_extent tests passed.");
+    HDputs("All H5Dset_extent tests passed.");
 
     return 0;
 
 error:
     nerrors = MAX(1, nerrors);
-    printf("***** %d H5Dset_extent TEST%s FAILED! *****\n",
+    HDprintf("***** %d H5Dset_extent TEST%s FAILED! *****\n",
             nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
@@ -261,25 +261,25 @@ static int do_ranks( hid_t fapl )
 
                 if(test_rank1(fapl, dcpl, do_fillvalue, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 1")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if(test_rank2(fapl, dcpl, do_fillvalue, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 2")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if(test_rank3(fapl, dcpl, do_fillvalue, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 3")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if(test_rank2(fapl, dcpl, do_fillvalue, TRUE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
@@ -396,468 +396,299 @@ static int test_rank1( hid_t fapl,
     int     comp_value;
     char    filename[NAME_BUF_SIZE];
 
-    if ( do_fill_value )
-    {
+    if(do_fill_value)
         comp_value = FILL_VALUE;
-    }
     else
-    {
         comp_value = 0;
-    }
-
-
-    for( i = 0; i < DIM0; i++ )
-    {
 
+    for(i = 0; i < DIM0; i++ )
         buf_o[i] = 2;
-    }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-    {
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
         TEST_ERROR
-    }
 
-    if  ( set_istore_k )
-    {
-        /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
-        {
+    /* set non-default indexed storage B-tree internal 'K' value */
+    if(set_istore_k)
+        if(H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
             TEST_ERROR
-        }
 
-    }
     /* create a new file */
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-    {
+    if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
         TEST_ERROR
-    }
 
     /* close property list */
     if(H5Pclose(fcpl) < 0)
-    {
         TEST_ERROR
-    }
 
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
-    {
+    if((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
         TEST_ERROR
-    }
 
     /* modify dataset creation properties, i.e. enable chunking. */
-    if ((my_dcpl = H5Pcopy (dcpl)) < 0)
-    {
+    if((my_dcpl = H5Pcopy (dcpl)) < 0)
         TEST_ERROR
-    }
-    if (H5Pset_chunk(my_dcpl, RANK1, dims_c) < 0)
-    {
+    if(H5Pset_chunk(my_dcpl, RANK1, dims_c) < 0)
         TEST_ERROR
-    }
 
     /*-------------------------------------------------------------------------
-    * create, write dataset
-    *-------------------------------------------------------------------------
-    */
+     * create, write dataset
+     *-------------------------------------------------------------------------
+     */
 
     /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+    if((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    }
 
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
-    {
+    if(H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
         TEST_ERROR
-    }
-
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
+    HDprintf("\n");
     for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-
-        printf("%d ", buf_o[i]);
-
-    }
-    printf("\n");
+        HDprintf("%d ", buf_o[i]);
+    HDprintf("\n");
 #endif
 
-
-
-    if (H5Sclose(sid) < 0)
-    {
+    if(H5Sclose(sid) < 0)
         TEST_ERROR
-    }
 
     /*-------------------------------------------------------------------------
-    * set new dimensions for the array; expand it
-    *-------------------------------------------------------------------------
-    */
+     * set new dimensions for the array; expand it
+     *-------------------------------------------------------------------------
+     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_e) < 0)
-    {
+    if(H5Dset_extent(did , dims_e) < 0)
         TEST_ERROR
-    }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if((sid = H5Dget_space(did)) < 0)
         TEST_ERROR
-    }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         TEST_ERROR
-    }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if(H5Sclose(sid) < 0)
         TEST_ERROR
-    }
-
 
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
-    {
         if (dims_r[i] != dims_e[i])
             TEST_ERROR
-    }
 
     /* read */
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         TEST_ERROR
 
 
-
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
+    HDprintf("\n buf_e: ");
     for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-
-        printf("%d ", buf_e[i]);
-
-    }
-    printf("\n");
+        HDprintf("%d ", buf_e[i]);
+    HDprintf("\n");
 #endif
 
-
-
-
     /* compare the read array with the expanded array */
     for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-
-        if ( i >= DIM0  )
-        {
-            if(buf_e[i] != comp_value)
-            {
-                printf("buf_e[%d] = %d\n", i, buf_e[i]);
-                printf("value = %d\n", comp_value);
+        if(i >= DIM0) {
+            if(buf_e[i] != comp_value) {
+                HDprintf("buf_e[%d] = %d\n", i, buf_e[i]);
+                HDprintf("value = %d\n", comp_value);
                 TEST_ERROR
-            }
-        }
-        else
-        {
+            } /* end if */
+        } /* end if */
+        else {
             if(buf_e[i] != buf_o[i])
                 TEST_ERROR
-        }
-    }
-
+        } /* end else */
 
 
 
     /*-------------------------------------------------------------------------
-    * shrink
-    *
-    *-------------------------------------------------------------------------
-    */
+     * shrink
+     *-------------------------------------------------------------------------
+     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if(H5Dset_extent(did , dims_s) < 0)
         TEST_ERROR
-    }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if((sid = H5Dget_space(did)) < 0)
         TEST_ERROR
-    }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         TEST_ERROR
-    }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if(H5Sclose(sid) < 0)
         TEST_ERROR
-    }
 
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
-    {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
-    }
-
-
 
     /* for this case we close and reopen file */
-    if ( set_istore_k )
-    {
-
-        if (H5Dclose(did) < 0)
-        {
+    if(set_istore_k) {
+        if(H5Dclose(did) < 0)
             TEST_ERROR
-        }
-        if (H5Fclose(fid) < 0)
-        {
+        if(H5Fclose(fid) < 0)
             TEST_ERROR
-        }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
-        {
+        if((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
             TEST_ERROR
-        }
 
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
-        {
+        if((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
             TEST_ERROR
-        }
-
-
-
-    }
+    } /* end if */
 
 
     /*-------------------------------------------------------------------------
-    * read
-    *-------------------------------------------------------------------------
-    */
+     * read
+     *-------------------------------------------------------------------------
+     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
-    {
+    if(H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
         TEST_ERROR
-    }
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
+    HDprintf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-
-        printf("%d ", buf_s[i]);
-    }
-    printf("\n");
-
+        HDprintf("%d ", buf_s[i]);
+    HDprintf("\n");
 #endif
 
-
-
-
     /* compare the read array with the shrinked array */
     for( i = 0; i < (int)dims_r[0]; i++ )
-    {
-
-        if (  buf_s[i] != buf_o[i] )
-        {
-            printf("buf_s[%d] = %d\n", i, buf_s[i]);
-            printf("buf_o[%d] = %d\n", i, buf_o[i]);
+        if(buf_s[i] != buf_o[i]) {
+            HDprintf("buf_s[%d] = %d\n", i, buf_s[i]);
+            HDprintf("buf_o[%d] = %d\n", i, buf_o[i]);
             TEST_ERROR
-        }
-    }
-
+        } /* end if */
 
     /*-------------------------------------------------------------------------
-    * expand it back to original size
-    *-------------------------------------------------------------------------
-    */
+     * expand it back to original size
+     *-------------------------------------------------------------------------
+     */
 
     /* set new dimensions for the array */
-    if (H5Dset_extent(did, dims_o) < 0)
-    {
+    if(H5Dset_extent(did, dims_o) < 0)
         TEST_ERROR
-    }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if((sid = H5Dget_space(did)) < 0)
         TEST_ERROR
-    }
 
     /* get dimensions. */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         TEST_ERROR
-    }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if(H5Sclose(sid) < 0)
         TEST_ERROR
-    }
-
 
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
-    {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
-    }
-
 
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
+    if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
+    HDprintf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-
-        printf("%d ", buf_r[i]);
-
-    }
-    printf("\n");
+        HDprintf("%d ", buf_r[i]);
+    HDprintf("\n");
 #endif
 
-
-
     /* compare the read array with the original array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-
-        if (i >= DIMS0 )
-        {
-            if(buf_r[i] != comp_value)
-            {
-                printf("buf_r[%d] = %d\n", i, buf_r[i] );
-                printf("value = %d\n", comp_value);
+    for(i = 0; i < (int)dims_r[0]; i++ )
+        if(i >= DIMS0 ) {
+            if(buf_r[i] != comp_value) {
+                HDprintf("buf_r[%d] = %d\n", i, buf_r[i] );
+                HDprintf("value = %d\n", comp_value);
                 TEST_ERROR
-            }
-        }
-        else
-        {
+            } /* end if */
+        } /* end if */
+        else {
             if(buf_r[i] != buf_o[i])
                 TEST_ERROR
-        }
-    }
+        } /* end else */
 
 
     /*-------------------------------------------------------------------------
-    * shrink to 0
-    *
-    *-------------------------------------------------------------------------
-    */
+     * shrink to 0
+     *-------------------------------------------------------------------------
+     */
 
     dims_s[0] = 0;
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if(H5Dset_extent(did , dims_s) < 0)
         TEST_ERROR
-    }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if((sid = H5Dget_space(did)) < 0)
         TEST_ERROR
-    }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         TEST_ERROR
-    }
-
-    if (H5Sclose(sid) < 0)
-    {
+    if(H5Sclose(sid) < 0)
         TEST_ERROR
-    }
 
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
-    {
-        if (dims_r[i] != dims_s[i])
+        if(dims_r[i] != dims_s[i])
             TEST_ERROR
-    }
 
     /*-------------------------------------------------------------------------
-    * close dataset
-    *-------------------------------------------------------------------------
-    */
+     * close dataset
+     *-------------------------------------------------------------------------
+     */
 
-    if (H5Dclose(did) < 0)
-    {
+    if(H5Dclose(did) < 0)
         TEST_ERROR
-    }
-
-
 
+    /*-------------------------------------------------------------------------
+     * test a dataset with non initialized chunks
+     *-------------------------------------------------------------------------
+     */
 
 
-     /*-------------------------------------------------------------------------
-    * test a dataset with non initialized chunks
-    *-------------------------------------------------------------------------
-    */
-
-
-    if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
-    {
+    if((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
         TEST_ERROR
-    }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+    if((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    }
+
     /* set new dimensions for the array */
     dims_o[ 0 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0)
-    {
+    if(H5Dset_extent( did , dims_o ) < 0)
         TEST_ERROR
-    }
-
-
 
-    if (H5Dclose(did) < 0)
-    {
+    if(H5Dclose(did) < 0)
         TEST_ERROR
-    }
-    if (H5Sclose(sid) < 0)
-    {
+    if(H5Sclose(sid) < 0)
         TEST_ERROR
-    }
-
-
-
 
     /*-------------------------------------------------------------------------
-    * close property list
-    *-------------------------------------------------------------------------
-    */
-
-
-    if (H5Pclose(my_dcpl) < 0)
-    {
+     * close property list
+     *-------------------------------------------------------------------------
+     */
+    if(H5Pclose(my_dcpl) < 0)
         TEST_ERROR
-    }
-
-    if (H5Fclose( fid ) < 0)
-    {
+    if(H5Fclose(fid) < 0)
         TEST_ERROR
-    }
-
 
     return 0;
 
-
-
 error:
 
     H5E_BEGIN_TRY
@@ -870,67 +701,54 @@ error:
     } H5E_END_TRY;
     return -1;
 
-}
+} /* end test_rank1() */
 
 /*-------------------------------------------------------------------------
  * test usage with a 2D rank
  *-------------------------------------------------------------------------
  */
 
-static int test_rank2( hid_t fapl,
-                       hid_t dcpl,
-                       hbool_t do_fill_value,
-                       hbool_t set_istore_k)
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   my_dcpl=-1;
-    hid_t   fcpl;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
-    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */
-    hsize_t dims_c[RANK2] = {2,2};          /* chunk dimensions */
-    hsize_t dims_r[RANK2];                  /* read dimensions */
-    hsize_t maxdims[RANK2] = {H5S_UNLIMITED,H5S_UNLIMITED};
-    int     buf_o[DIM0][DIM1];
-    int     buf_s[DIMS0][DIMS1];
-    int     buf_e[DIME0][DIME1];
-    int     buf_r[DIM0][DIM1];
-    int     i, j;
-    int     comp_value;
-    char    filename[NAME_BUF_SIZE];
-
-    if ( do_fill_value )
-    {
+static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t set_istore_k) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t my_dcpl = -1;
+    hid_t fcpl;
+    hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */
+    hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = { DIME0, DIME1 }; /* extended dimensions */
+    hsize_t dims_c[RANK2] = { 2, 2 }; /* chunk dimensions */
+    hsize_t dims_r[RANK2]; /* read dimensions */
+    hsize_t maxdims[RANK2] = { H5S_UNLIMITED, H5S_UNLIMITED };
+    int buf_o[DIM0][DIM1];
+    int buf_s[DIMS0][DIMS1];
+    int buf_e[DIME0][DIME1];
+    int buf_r[DIM0][DIM1];
+    int i, j;
+    int comp_value;
+    char filename[NAME_BUF_SIZE];
+
+    if (do_fill_value) {
         comp_value = FILL_VALUE;
-    }
-    else
-    {
+    } else {
         comp_value = 0;
     }
 
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
             buf_o[i][j] = 2;
         }
     }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-    {
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
         TEST_ERROR
     }
 
-    if  ( set_istore_k )
-    {
+    if (set_istore_k) {
         /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
-        {
+        if (H5Pset_istore_k(fcpl, ISTORE_IK) < 0) {
             TEST_ERROR
         }
 
@@ -938,76 +756,62 @@ static int test_rank2( hid_t fapl,
 
     /* create a new file */
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-    {
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
         TEST_ERROR
     }
 
-
-
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
 
     /* modify dataset creation properties, i.e. enable chunking. */
-    if ((my_dcpl = H5Pcopy (dcpl)) < 0)
-    {
+    if ((my_dcpl = H5Pcopy(dcpl)) < 0) {
         TEST_ERROR
     }
-    if (H5Pset_chunk(my_dcpl, RANK2, dims_c) < 0)
-    {
+    if (H5Pset_chunk(my_dcpl, RANK2, dims_c) < 0) {
         TEST_ERROR
     }
 
-    /*-------------------------------------------------------------------------
-    * Procedure 1
-    * a.	Write an array AxB. These are the dimensions for creating the dataset
-    * b.	Define a greater array CxD where C > A and D > B
-    * c.	Read data back
-    * d.	Verify if new dimensions are C and D
-    * e.	Verify if data from A to C and B to D is what it is to be expected
-    *
-    * original data is
-    *
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *
-    *-------------------------------------------------------------------------
-    */
+                    /*-------------------------------------------------------------------------
+                    * Procedure 1
+                    * a.    Write an array AxB. These are the dimensions for creating the dataset
+                    * b.    Define a greater array CxD where C > A and D > B
+                    * c.    Read data back
+                    * d.    Verify if new dimensions are C and D
+                    * e.    Verify if data from A to C and B to D is what it is to be expected
+                    *
+                    * original data is
+                    *
+                    *  2 2 2 2
+                    *  2 2 2 2
+                    *  2 2 2 2
+                    *  2 2 2 2
+                    *
+                    *-------------------------------------------------------------------------
+                    */
 
-    /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+                    /* create a dataset */
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
 
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
-    {
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) {
         TEST_ERROR
     }
 
-
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            printf("%d ", buf_o[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            HDprintf("%d ", buf_o[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
@@ -1027,32 +831,26 @@ static int test_rank2( hid_t fapl,
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_e) < 0)
-    {
+    if (H5Dset_extent(did, dims_e) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_e[i])
             TEST_ERROR
     }
@@ -1061,55 +859,39 @@ static int test_rank2( hid_t fapl,
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         TEST_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_e[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_e[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
-    /* compare the read array with the expanded array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if ( i >= DIM0 || j >= DIM1 )
-            {
-                if(buf_e[i][j] != comp_value)
-                {
-                    printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
-                    printf("value = %d\n", comp_value);
+                /* compare the read array with the expanded array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (i >= DIM0 || j >= DIM1) {
+                if (buf_e[i][j] != comp_value) {
+                    HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
+                    HDprintf("value = %d\n", comp_value);
                     TEST_ERROR
                 }
-            }
-            else
-            {
-                if(buf_e[i][j] != buf_o[i][j])
+            } else {
+                if (buf_e[i][j] != buf_o[i][j])
                     TEST_ERROR
             }
         }
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     *
     * Procedure 2
-    * a.	Define a smaller array ExF where E < A and F < B
-    * b.	Read data back
-    * c.	Verify if new dimensions are E and F
-    * d.	Verify if data up until E and F is what to be expected
+    * a.    Define a smaller array ExF where E < A and F < B
+    * b.    Read data back
+    * c.    Verify if new dimensions are E and F
+    * d.    Verify if data up until E and F is what to be expected
     *
     * data is now
     *
@@ -1120,106 +902,81 @@ static int test_rank2( hid_t fapl,
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
     /* for this case we close and reopen file */
-    if ( set_istore_k )
-    {
+    if (set_istore_k) {
 
-        if (H5Dclose(did) < 0)
-        {
+        if (H5Dclose(did) < 0) {
             TEST_ERROR
         }
-        if (H5Fclose(fid) < 0)
-        {
+        if (H5Fclose(fid) < 0) {
             TEST_ERROR
         }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
-        {
+        if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) {
             TEST_ERROR
         }
 
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
-        {
+        if ((did = H5Dopen2(fid, "dset1", H5P_DEFAULT)) < 0) {
             TEST_ERROR
         }
 
-
-
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
-    {
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) {
         TEST_ERROR
     }
 
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_s[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_s[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
     /* compare the read array with the shrinked array */
-    for( i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for( j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if (  buf_s[i][j] != buf_o[i][j] )
-            {
-                printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
-                printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (buf_s[i][j] != buf_o[i][j]) {
+                HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
+                HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 TEST_ERROR
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it back to original size
     * data is now, extended space was initialized with fill value or default value
@@ -1233,36 +990,30 @@ static int test_rank2( hid_t fapl,
     */
 
     /* set new dimensions for the array */
-    if (H5Dset_extent(did, dims_o) < 0)
-    {
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions. */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
@@ -1273,36 +1024,26 @@ static int test_rank2( hid_t fapl,
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_r[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_r[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    /* compare the read array with the original array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if (i >= DIMS0 || j >= DIMS1)
-            {
-                if(buf_r[i][j] != comp_value)
-                {
-                    printf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
-                    printf("value = %d\n", comp_value);
+                /* compare the read array with the original array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (i >= DIMS0 || j >= DIMS1) {
+                if (buf_r[i][j] != comp_value) {
+                    HDprintf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
+                    HDprintf("value = %d\n", comp_value);
                     TEST_ERROR
                 }
-            }
-            else
-            {
-                if(buf_r[i][j] != buf_o[i][j])
+            } else {
+                if (buf_r[i][j] != buf_o[i][j])
                     TEST_ERROR
             }
         }
@@ -1318,36 +1059,30 @@ static int test_rank2( hid_t fapl,
     dims_s[1] = 0;
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * expand then shrink to 0 in dimension 1 while expanding again in
     * dimension 0
@@ -1355,10 +1090,8 @@ static int test_rank2( hid_t fapl,
     *-------------------------------------------------------------------------
     */
 
-
     /* expand to original dimensions for the array. */
-    if (H5Dset_extent(did , dims_o) < 0)
-    {
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
@@ -1366,262 +1099,206 @@ static int test_rank2( hid_t fapl,
     dims_s[1] = 0;
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * close dataset
     *-------------------------------------------------------------------------
     */
 
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
 
-
-     /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * test a dataset with non initialized chunks
     *-------------------------------------------------------------------------
     */
 
-
-    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+    if ((did = H5Dcreate2(fid, "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
     /* set new dimensions for the array */
-    dims_o[ 0 ] = 0;
-    dims_o[ 1 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0)
-    {
+    dims_o[0] = 0;
+    dims_o[1] = 0;
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
-
-
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
 
-
-    if (H5Pclose(my_dcpl) < 0)
-    {
+    if (H5Pclose(my_dcpl) < 0) {
         TEST_ERROR
     }
 
     /* close file creation property list */
-    if(H5Pclose(fcpl) < 0)
-    {
+    if (H5Pclose(fcpl) < 0) {
         TEST_ERROR
     }
 
-    if (H5Fclose( fid ) < 0)
-    {
+    if (H5Fclose(fid) < 0) {
         TEST_ERROR
     }
 
-
     return 0;
 
-
-
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( my_dcpl  );
-        H5Pclose( fcpl  );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(my_dcpl);
+            H5Pclose(fcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 
 }
 
-
-
-
 /*-------------------------------------------------------------------------
  * test usage with a 3D rank
  *-------------------------------------------------------------------------
  */
 
-static int test_rank3( hid_t fapl,
-                       hid_t dcpl,
-                       hbool_t do_fill_value,
-                       hbool_t set_istore_k)
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   my_dcpl=-1;
-    hid_t   fcpl;
-    hsize_t dims_o[RANK3] = {DIM0,DIM1,DIM2};    /* original dimensions */
-    hsize_t dims_s[RANK3] = {DIMS0,DIMS1,DIMS2}; /* shrinking dimensions */
-    hsize_t dims_e[RANK3] = {DIME0,DIME1,DIME2}; /* extended dimensions */
-    hsize_t dims_c[RANK3] = {2,2,2};             /* chunk dimensions */
-    hsize_t dims_r[RANK3];                       /* read dimensions */
-    hsize_t maxdims[RANK3] = {H5S_UNLIMITED,H5S_UNLIMITED,H5S_UNLIMITED};
-    int     buf_o[DIM0][DIM1][DIM2];
-    int     buf_s[DIMS0][DIMS1][DIMS2];
-    int     buf_e[DIME0][DIME1][DIME2];
-    int     buf_r[DIM0][DIM1][DIM2];
-    int     i, j, k;
-    int     comp_value;
-    char	filename[NAME_BUF_SIZE];
-
-    if ( do_fill_value )
-    {
+static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t set_istore_k) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t my_dcpl = -1;
+    hid_t fcpl;
+    hsize_t dims_o[RANK3] = { DIM0, DIM1, DIM2 }; /* original dimensions */
+    hsize_t dims_s[RANK3] = { DIMS0, DIMS1, DIMS2 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK3] = { DIME0, DIME1, DIME2 }; /* extended dimensions */
+    hsize_t dims_c[RANK3] = { 2, 2, 2 }; /* chunk dimensions */
+    hsize_t dims_r[RANK3]; /* read dimensions */
+    hsize_t maxdims[RANK3] = { H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED };
+    int buf_o[DIM0][DIM1][DIM2];
+    int buf_s[DIMS0][DIMS1][DIMS2];
+    int buf_e[DIME0][DIME1][DIME2];
+    int buf_r[DIM0][DIM1][DIM2];
+    int i, j, k;
+    int comp_value;
+    char filename[NAME_BUF_SIZE];
+
+    if (do_fill_value) {
         comp_value = FILL_VALUE;
-    }
-    else
-    {
+    } else {
         comp_value = 0;
     }
 
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
-            for( k = 0; k < DIM2; k++ )
-            {
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
+            for (k = 0; k < DIM2; k++) {
                 buf_o[i][j][k] = 2;
             }
         }
     }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-    {
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
         TEST_ERROR
     }
 
-    if  ( set_istore_k )
-    {
+    if (set_istore_k) {
         /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
-        {
+        if (H5Pset_istore_k(fcpl, ISTORE_IK) < 0) {
             TEST_ERROR
         }
 
     }
     /* create a new file */
     h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-    {
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
         TEST_ERROR
     }
 
     /* close property list */
-    if(H5Pclose(fcpl) < 0)
-    {
+    if (H5Pclose(fcpl) < 0) {
         TEST_ERROR
     }
 
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
 
     /* modify dataset creation properties, i.e. enable chunking. */
-    if ((my_dcpl = H5Pcopy (dcpl)) < 0)
-    {
+    if ((my_dcpl = H5Pcopy(dcpl)) < 0) {
         TEST_ERROR
     }
-    if (H5Pset_chunk(my_dcpl, RANK3, dims_c) < 0)
-    {
+    if (H5Pset_chunk(my_dcpl, RANK3, dims_c) < 0) {
         TEST_ERROR
     }
 
-    /*-------------------------------------------------------------------------
-    * create, write array
-    *-------------------------------------------------------------------------
-    */
+                    /*-------------------------------------------------------------------------
+                    * create, write array
+                    *-------------------------------------------------------------------------
+                    */
 
-    /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+                    /* create a dataset */
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
 
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
-    {
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) {
         TEST_ERROR
     }
 
 
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_o[2]; k++ )
-            {
-                printf("%d ", buf_o[i][j][k]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            for( k = 0; k < (int)dims_o[2]; k++ ) {
+                HDprintf("%d ", buf_o[i][j][k]);
             }
-            printf("[%d] ", j);
+            HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
@@ -1632,32 +1309,26 @@ static int test_rank3( hid_t fapl,
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_e) < 0)
-    {
+    if (H5Dset_extent(did, dims_e) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_e[i])
             TEST_ERROR
     }
@@ -1666,203 +1337,153 @@ static int test_rank3( hid_t fapl,
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         TEST_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                printf("%d ", buf_e[i][j][k]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            for( k = 0; k < (int)dims_r[2]; k++ ) {
+                HDprintf("%d ", buf_e[i][j][k]);
             }
-            printf("[%d] ", j);
+            HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-
-    /* compare the read array with the expanded array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                if ( i >= DIM0 || j >= DIM1 || k >= DIM2 )
-                {
-                    if(buf_e[i][j][k] != comp_value)
-                    {
-                        printf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k] );
-                        printf("value = %d\n", comp_value);
+                /* compare the read array with the expanded array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            for (k = 0; k < (int) dims_r[2]; k++) {
+                if (i >= DIM0 || j >= DIM1 || k >= DIM2) {
+                    if (buf_e[i][j][k] != comp_value) {
+                        HDprintf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k]);
+                        HDprintf("value = %d\n", comp_value);
                         TEST_ERROR
                     }
-                }
-                else
-                {
-                    if(buf_e[i][j][k] != buf_o[i][j][k] )
+                } else {
+                    if (buf_e[i][j][k] != buf_o[i][j][k])
                         TEST_ERROR
                 }
             }
         }
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * shrink
     *-------------------------------------------------------------------------
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
     /* for this case we close and reopen file */
-    if ( set_istore_k )
-    {
+    if (set_istore_k) {
 
-        if (H5Dclose(did) < 0)
-        {
+        if (H5Dclose(did) < 0) {
             TEST_ERROR
         }
-        if (H5Fclose(fid) < 0)
-        {
+        if (H5Fclose(fid) < 0) {
             TEST_ERROR
         }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
-        {
+        if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) {
             TEST_ERROR
         }
 
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
-        {
+        if ((did = H5Dopen2(fid, "dset1", H5P_DEFAULT)) < 0) {
             TEST_ERROR
         }
 
-
-
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
-    {
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) {
         TEST_ERROR
     }
 
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                printf("%d ", buf_s[i][j][k]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            for( k = 0; k < (int)dims_r[2]; k++ ) {
+                HDprintf("%d ", buf_s[i][j][k]);
             }
-             printf("[%d] ", j);
+             HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-
     /* compare the read array with the shrinked array */
-    for( i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for( j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                if (  buf_s[i][j][k] != buf_o[i][j][k] )
-                {
-                    printf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k] );
-                    printf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k] );
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            for (k = 0; k < (int) dims_r[2]; k++) {
+                if (buf_s[i][j][k] != buf_o[i][j][k]) {
+                    HDprintf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k]);
+                    HDprintf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k]);
                     TEST_ERROR
                 }
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it back to original size
     *-------------------------------------------------------------------------
     */
 
     /* set new dimensions for the array */
-    if (H5Dset_extent(did, dims_o) < 0)
-    {
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions. */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
@@ -1872,52 +1493,39 @@ static int test_rank3( hid_t fapl,
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            for( k = 0; k < (int)dims_r[2]; k++ ) {
 
-                printf("%d ", buf_r[i][j][k]);
+                HDprintf("%d ", buf_r[i][j][k]);
             }
-             printf("[%d] ", j);
+             HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-    /* compare the read array with the original array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2 )
-                {
-                    if( buf_r[i][j][k] != comp_value )
-                    {
-                        printf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k] );
-                        printf("value = %d\n", comp_value);
+                /* compare the read array with the original array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            for (k = 0; k < (int) dims_r[2]; k++) {
+                if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2) {
+                    if (buf_r[i][j][k] != comp_value) {
+                        HDprintf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k]);
+                        HDprintf("value = %d\n", comp_value);
                         TEST_ERROR
                     }
-                }
-                else
-                {
-                    if(buf_r[i][j][k] != buf_o[i][j][k])
+                } else {
+                    if (buf_r[i][j][k] != buf_o[i][j][k])
                         TEST_ERROR
                 }
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * shrink to 0
     *
@@ -1929,158 +1537,126 @@ static int test_rank3( hid_t fapl,
     dims_s[2] = 0;
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
     /*-------------------------------------------------------------------------
     * close dataset
     *-------------------------------------------------------------------------
     */
 
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * test a dataset with non initialized chunks
     *-------------------------------------------------------------------------
     */
 
-
-    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+    if ((did = H5Dcreate2(fid, "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
     /* set new dimensions for the array */
-    dims_o[ 0 ] = 0;
-    dims_o[ 1 ] = 0;
-    dims_o[ 2 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0)
-    {
+    dims_o[0] = 0;
+    dims_o[1] = 0;
+    dims_o[2] = 0;
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
-
-
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
 
-
-    if (H5Pclose(my_dcpl) < 0)
-    {
+    if (H5Pclose(my_dcpl) < 0) {
         TEST_ERROR
     }
 
-    if (H5Fclose( fid ) < 0)
-    {
+    if (H5Fclose(fid) < 0) {
         TEST_ERROR
     }
 
-
     return 0;
 
-
-
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( my_dcpl  );
-        H5Pclose( fcpl  );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(my_dcpl);
+            H5Pclose(fcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 
 }
 
-
 /*-------------------------------------------------------------------------
  * test usage with external storage
  *-------------------------------------------------------------------------
  */
-static int test_external( hid_t fapl )
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   dcpl=-1;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
-    hsize_t dims_e[RANK2] = {DIME0,DIM1};   /* extended dimensions, dimension 1 is the original */
-    hsize_t dims_r[RANK2];                  /* read dimensions */
-    hsize_t maxdims[RANK2] = {DIME0,DIM1};  /* only the first dimension can be extendible */
-    int     buf_o[DIM0][DIM1];              /* original buffer, for writing */
-    int     buf_s[DIMS0][DIMS1];            /* shrinked buffer, for reading */
-    int     buf_e[DIME0][DIM1];             /* extended buffer, for writing, dimension 1 is the original */
-    int     buf_ro[DIM0][DIM1];             /* original buffer for reading */
-    int     i, j;
-    int     comp_value = 0;
-    char	filename[NAME_BUF_SIZE];
-
-
-    hsize_t size;        /* number of bytes reserved in the file for the data */
+static int test_external(hid_t fapl) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t dcpl = -1;
+    hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */
+    hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = { DIME0, DIM1 }; /* extended dimensions, dimension 1 is the original */
+    hsize_t dims_r[RANK2]; /* read dimensions */
+    hsize_t maxdims[RANK2] = { DIME0, DIM1 }; /* only the first dimension can be extendible */
+    int buf_o[DIM0][DIM1]; /* original buffer, for writing */
+    int buf_s[DIMS0][DIMS1]; /* shrinked buffer, for reading */
+    int buf_e[DIME0][DIM1]; /* extended buffer, for writing, dimension 1 is the original */
+    int buf_ro[DIM0][DIM1]; /* original buffer for reading */
+    int i, j;
+    int comp_value = 0;
+    char filename[NAME_BUF_SIZE];
+
+    hsize_t size; /* number of bytes reserved in the file for the data */
     hsize_t max_size[2];
 
     max_size[0] = dims_e[0];
     max_size[1] = dims_e[1];
     size = max_size[0] * max_size[1] * sizeof(int) / 2;
 
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
             buf_o[i][j] = 2;
         }
     }
@@ -2092,30 +1668,27 @@ static int test_external( hid_t fapl )
     if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
 
-    /* modify dataset creation properties */
-    if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
+                /* modify dataset creation properties */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
 
-    if(H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t)0, size) < 0)
+    if (H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t) 0, size) < 0)
         FAIL_STACK_ERROR
 
-    if(H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t)0, size) < 0)
+    if (H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t) 0, size) < 0)
         FAIL_STACK_ERROR
 
     {
 
-        char	name[256];		/*external file name		*/
-        off_t	file_offset;    /*external file offset		*/
-        hsize_t	file_size;		/*sizeof external file segment	*/
+        char name[256]; /*external file name        */
+        off_t file_offset; /*external file offset        */
+        hsize_t file_size; /*sizeof external file segment    */
 
-        if(H5Pget_external(dcpl, 0, sizeof(name), name, &file_offset,
-                &file_size) < 0)
+        if (H5Pget_external(dcpl, 0, sizeof(name), name, &file_offset, &file_size) < 0)
             FAIL_STACK_ERROR
 
     }
 
-
-
     /*-------------------------------------------------------------------------
     * Write an array AxB. These are the dimensions for creating the dataset
     *
@@ -2129,80 +1702,72 @@ static int test_external( hid_t fapl )
     *-------------------------------------------------------------------------
     */
 
-
     /* create the data space with unlimited dimensions. */
     if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
         FAIL_STACK_ERROR
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
         FAIL_STACK_ERROR
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
 
+                /*-------------------------------------------------------------------------
+                * read
+                *-------------------------------------------------------------------------
+                */
 
-    /*-------------------------------------------------------------------------
-    * read
-    *-------------------------------------------------------------------------
-    */
-
-     /* read */
+                /* read */
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_ro) < 0)
         FAIL_STACK_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            printf("%d ", buf_ro[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            HDprintf("%d ", buf_ro[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    /*-------------------------------------------------------------------------
-    * expand
-    *-------------------------------------------------------------------------
-    */
-
-     /*-------------------------------------------------------------------------
-    * set new dimensions for the array; expand it
-    * data is now, extended space was initialized with default value
-    *
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *  0 0 0 0
-    *  0 0 0 0
-    *  0 0 0 0
-    *
-    *-------------------------------------------------------------------------
-    */
-
-    /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_e) < 0)
+                /*-------------------------------------------------------------------------
+                * expand
+                *-------------------------------------------------------------------------
+                */
+
+                /*-------------------------------------------------------------------------
+                * set new dimensions for the array; expand it
+                * data is now, extended space was initialized with default value
+                *
+                *  2 2 2 2
+                *  2 2 2 2
+                *  2 2 2 2
+                *  2 2 2 2
+                *  0 0 0 0
+                *  0 0 0 0
+                *  0 0 0 0
+                *
+                *-------------------------------------------------------------------------
+                */
+
+                /* set new dimensions for the array. */
+    if (H5Dset_extent(did, dims_e) < 0)
         FAIL_STACK_ERROR
 
-     /* get the space */
+                /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
         FAIL_STACK_ERROR
 
-    /* get dimensions */
+                /* get dimensions */
     if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         FAIL_STACK_ERROR
 
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
 
-
-    /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+                /* check dimensions */
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_e[i])
             TEST_ERROR
     }
@@ -2211,48 +1776,33 @@ static int test_external( hid_t fapl )
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         FAIL_STACK_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_e[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_e[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
-    /* compare the read array with the expanded array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if ( i >= DIM0 || j >= DIM1 )
-            {
-                if(buf_e[i][j] != comp_value)
-                {
-                    printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
-                    printf("value = %d\n", comp_value);
+                /* compare the read array with the expanded array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (i >= DIM0 || j >= DIM1) {
+                if (buf_e[i][j] != comp_value) {
+                    HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
+                    HDprintf("value = %d\n", comp_value);
                     TEST_ERROR
                 }
-            }
-            else
-            {
-                if(buf_e[i][j] != buf_o[i][j])
+            } else {
+                if (buf_e[i][j] != buf_o[i][j])
                     TEST_ERROR
             }
         }
     }
 
-
-
-     /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * shrink
     *
     * data is now
@@ -2264,208 +1814,172 @@ static int test_external( hid_t fapl )
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
+    if (H5Dset_extent(did, dims_s) < 0)
         FAIL_STACK_ERROR
 
-    /* get the space */
+                /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
         FAIL_STACK_ERROR
 
-    /* get dimensions */
+                /* get dimensions */
     if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         FAIL_STACK_ERROR
 
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
 
-    /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+                /* check dimensions */
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0)
         FAIL_STACK_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_s[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_s[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
-    /* compare the read array with the shrinked array */
-    for( i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for( j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if (  buf_s[i][j] != buf_o[i][j] )
-            {
-                printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
-                printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
+                /* compare the read array with the shrinked array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (buf_s[i][j] != buf_o[i][j]) {
+                HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
+                HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 TEST_ERROR
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * negative test
     * try to extend dimension above maximum
     *-------------------------------------------------------------------------
     */
 
-
     dims_e[1] = DIME1;
 
-
     H5E_BEGIN_TRY
-    {
-
-
-        /* set new dimensions for the array. */
-        if (H5Dset_extent(did , dims_e) == SUCCEED)
         {
-            TEST_ERROR
-        }
-
-    } H5E_END_TRY;
 
+            /* set new dimensions for the array. */
+            if (H5Dset_extent(did, dims_e) == SUCCEED) {
+                TEST_ERROR
+            }
 
+        }H5E_END_TRY;
 
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
 
-
     if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR
 
-    if (H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR
 
-    if (H5Fclose( fid ) < 0)
+    if (H5Fclose(fid) < 0)
         FAIL_STACK_ERROR
 
-    PASSED();
+    PASSED()
+    ;
 
     return 0;
 
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( dcpl );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(dcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
  * test usage with layouts compact and contiguous
  *-------------------------------------------------------------------------
  */
-static int test_layouts( H5D_layout_t layout, hid_t fapl )
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   dcpl=-1;
-    herr_t  ret;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
-    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */
-    hsize_t dims_r[RANK2];                  /* read dimensions */
-    int     buf_o[DIM0][DIM1];
-    int     buf_r[DIM0][DIM1];
-    int     i, j;
-    char	filename[NAME_BUF_SIZE];
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
+static int test_layouts(H5D_layout_t layout, hid_t fapl) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t dcpl = -1;
+    herr_t ret;
+    hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */
+    hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = { DIME0, DIME1 }; /* extended dimensions */
+    hsize_t dims_r[RANK2]; /* read dimensions */
+    int buf_o[DIM0][DIM1];
+    int buf_r[DIM0][DIM1];
+    int i, j;
+    char filename[NAME_BUF_SIZE];
+
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
             buf_o[i][j] = 2;
         }
     }
 
-
     /* create a new file */
     h5_fixname(FILENAME[4], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-    {
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
         TEST_ERROR
     }
 
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK2, dims_o, NULL)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK2, dims_o, NULL)) < 0) {
         TEST_ERROR
     }
 
     /* modify dataset creation properties */
-    if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
-    {
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         TEST_ERROR
     }
 
-    if (H5Pset_layout (dcpl, layout) < 0)
-    {
+    if (H5Pset_layout(dcpl, layout) < 0) {
         TEST_ERROR
     }
 
     /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-    {
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
 
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
-    {
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) {
         TEST_ERROR
     }
 
-
 #if defined (H5_SET_EXTENT_DEBUG4)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            printf("%d ", buf_o[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            HDprintf("%d ", buf_o[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
@@ -2476,39 +1990,31 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
     */
 
     H5E_BEGIN_TRY
-    {
+        {
 
-        ret = H5Dset_extent(did , dims_e);
+            ret = H5Dset_extent(did, dims_e);
 
-    } H5E_END_TRY;
+        }H5E_END_TRY;
 
-    if(ret >= 0)
+    if (ret >= 0)
         TEST_ERROR
 
-
-
-
-    /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+                /* get the space */
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
@@ -2517,123 +2023,100 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
         TEST_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG4)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_r[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_r[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    /*-------------------------------------------------------------------------
-    * negative test
-    * try to shrink dimension
-    *-------------------------------------------------------------------------
-    */
+                /*-------------------------------------------------------------------------
+                * negative test
+                * try to shrink dimension
+                *-------------------------------------------------------------------------
+                */
 
     H5E_BEGIN_TRY
-    {
+        {
 
-        ret = H5Dset_extent(did , dims_s);
+            ret = H5Dset_extent(did, dims_s);
 
-    } H5E_END_TRY;
+        }H5E_END_TRY;
 
-    if(ret >= 0)
+    if (ret >= 0)
         TEST_ERROR
 
-
-    /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+                /* get the space */
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r ) < 0)
-    {
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) {
         TEST_ERROR
     }
 
 #if defined (H5_SET_EXTENT_DEBUG4)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_r[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_r[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
     /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
 
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
 
-    if (H5Pclose(dcpl) < 0)
-    {
+    if (H5Pclose(dcpl) < 0) {
         TEST_ERROR
     }
 
-    if (H5Fclose( fid ) < 0)
-    {
+    if (H5Fclose(fid) < 0) {
         TEST_ERROR
     }
 
-
     return 0;
 
-
-
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( dcpl  );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(dcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 
 }
@@ -2829,16 +2312,15 @@ static void test_random_rank4_dump( unsigned ndim_sets, hsize_t dim_log[][4],
 {
     unsigned i;
 
-    printf("  Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0],
+    HDprintf("  Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0],
             (unsigned)cdims[1], (unsigned)cdims[2], (unsigned)cdims[3]);
-    printf("  Log of dataset dimensions (oldest first):\n");
+    HDprintf("  Log of dataset dimensions (oldest first):\n");
     for(i=0; i<ndim_sets; i++)
-        printf("  Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i,
+        HDprintf("  Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i,
                 (unsigned)dim_log[i][0], (unsigned)dim_log[i][1],
                 (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]);
     if(j>=0)
-        printf("  First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l,
-                m);
+        HDprintf("  First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m);
 
     return;
 } /* end test_random_rank4_dump */