OESS-29 Fix shared MPI builds, more HD prefix

131 files changed, 7913 insertions, 7692 deletions

diff --git a/c++/src/H5AbstractDs.cpp b/c++/src/H5AbstractDs.cpp
index 92733ab..83373ac 100644
--- a/c++/src/H5AbstractDs.cpp
+++ b/c++/src/H5AbstractDs.cpp
@@ -62,7 +62,7 @@ H5T_class_t AbstractDs::getTypeClass() const
     // which object invokes getTypeClass
     hid_t datatype_id;
     try {
-      datatype_id = p_get_type();  // returned value is already validated
+        datatype_id = p_get_type();  // returned value is already validated
     }
     catch (DataSetIException& E) {
         throw DataTypeIException("DataSet::getTypeClass", E.getDetailMsg());
@@ -80,7 +80,7 @@ H5T_class_t AbstractDs::getTypeClass() const
     {
         if (fromClass() == "DataSet")
             throw DataTypeIException("DataSet::getTypeClass", "H5Tclose failed");
-    else if (fromClass() == "Attribute")
+        else if (fromClass() == "Attribute")
             throw DataTypeIException("Attribute::getTypeClass", "H5Tclose failed");
     }
 
@@ -88,9 +88,9 @@ H5T_class_t AbstractDs::getTypeClass() const
     if (type_class == H5T_NO_CLASS)
     {
         if (fromClass() == "DataSet")
-        throw DataTypeIException("DataSet::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
-    else if (fromClass() == "Attribute")
-        throw DataTypeIException("Attribute::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
+            throw DataTypeIException("DataSet::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
+        else if (fromClass() == "Attribute")
+            throw DataTypeIException("Attribute::getTypeClass", "H5Tget_class returns H5T_NO_CLASS");
     }
     return(type_class);
 }
diff --git a/c++/src/H5ArrayType.cpp b/c++/src/H5ArrayType.cpp
index 857729c..7d7d330 100644
--- a/c++/src/H5ArrayType.cpp
+++ b/c++/src/H5ArrayType.cpp
@@ -41,11 +41,11 @@ ArrayType::ArrayType() : DataType() {}
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
-ArrayType::ArrayType(const hid_t existing_id) : DataType( existing_id ) {}
+ArrayType::ArrayType(const hid_t existing_id) : DataType(existing_id) {}
 
 //--------------------------------------------------------------------------
 // Function:    ArrayType copy constructor
-///\brief       Copy constructor: makes a copy of the original ArrayType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
 ArrayType::ArrayType(const ArrayType& original) : DataType(original) {}
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 13bd4f7..5906f34 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -241,9 +241,6 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #cmakedefine H5_HAVE_PTHREAD_H @H5_HAVE_PTHREAD_H@
 
-/* Define to 1 if you have the 'InitOnceExecuteOnce' function. */
-#cmakedefine H5_HAVE_WIN_THREADS @H5_HAVE_WIN_THREADS@
-
 /* Define to 1 if you have the `random' function. */
 #cmakedefine H5_HAVE_RANDOM @H5_HAVE_RANDOM@
 
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 9389a0d..79e6f45 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -1049,7 +1049,7 @@ herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int id
                     ret_value = SUCCEED;
                 }
                 else if(H5DSis_attached(did, dsid, idx) == 0) {
-                    printf(" scale not attached ");
+                    HDprintf(" scale not attached ");
                 }
             }
         }
@@ -1153,14 +1153,14 @@ static int test_detachscales(void)
 
     /* make datasets; they are three dimensional*/
     for (i=0; i < 2; i++) {
-        sprintf(dname,"D%d", i);
+        HDsprintf(dname,"D%d", i);
         if(H5LTmake_dataset_int(fid, dname, rank3, dims, buf) < 0)
             goto out;
     }
     /* create datasets and make them dim. scales */
 
     for (i=0; i < 4; i++) {
-        sprintf(dname, "DS%d", i);
+        HDsprintf(dname, "DS%d", i);
         if(H5LTmake_dataset_int(fid, dname, rank1, dims, buf) < 0)
             goto out;
     }
@@ -2255,7 +2255,7 @@ static int test_simple(void)
     char snames[3];
     int i, j;
 
-    printf("Testing API functions\n");
+    HDprintf("Testing API functions\n");
 
     /*-------------------------------------------------------------------------
     * create a file for the test
@@ -2919,7 +2919,7 @@ static int test_simple(void)
         if((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
             goto out;
         for(j = 0; j < 5; j++) {
-            sprintf(sname, "ds_%d", j);
+            HDsprintf(sname, "ds_%d", j);
             if((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
                 goto out;
             if(H5DSdetach_scale(did, dsid, DIM0) < 0)
@@ -2942,7 +2942,7 @@ static int test_simple(void)
         if((did = H5Dopen2(gid,dname, H5P_DEFAULT)) < 0)
             goto out;
         for(j=0; j<5; j++) {
-            sprintf(sname,"ds_%d",j);
+            HDsprintf(sname,"ds_%d",j);
             if((dsid = H5Dopen2(gid,sname, H5P_DEFAULT)) < 0)
                 goto out;
             if(H5DSattach_scale(did,dsid,DIM0) < 0)
@@ -3740,7 +3740,7 @@ static int test_errors(void)
     hid_t   sidds = -1;                                       /* space ID */
     hsize_t pal_dims[] = {9,3};
 
-    printf("Testing error conditions\n");
+    HDprintf("Testing error conditions\n");
 
     /*-------------------------------------------------------------------------
     * create a file, spaces, dataset and group ids
@@ -4119,7 +4119,7 @@ static int test_iterators(void)
     char    dname[30];                                        /* dataset name */
     int     i;
 
-    printf("Testing iterators\n");
+    HDprintf("Testing iterators\n");
 
     /*-------------------------------------------------------------------------
     * create a file, spaces, dataset and group ids
@@ -4198,7 +4198,7 @@ static int test_iterators(void)
 
     for(i=0; i<100; i++) {
         /* make a DS */
-        sprintf(dname,"ds_%d",i);
+        HDsprintf(dname,"ds_%d",i);
         if(H5LTmake_dataset_int(fid,dname,rankds,s1_dim,NULL) < 0)
             goto out;
         /* open */
@@ -4311,7 +4311,7 @@ static int test_rank(void)
     float   buff[1]={1};
     int     i;
 
-    printf("Testing ranks\n");
+    HDprintf("Testing ranks\n");
 
     /*-------------------------------------------------------------------------
     * create a file, a dataset, scales
@@ -4349,7 +4349,7 @@ static int test_rank(void)
         goto out;
 
     for(i=0; i<3; i++) {
-        sprintf(name,"ds_a_%d",i);
+        HDsprintf(name,"ds_a_%d",i);
         if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
             goto out;
         if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
@@ -4377,7 +4377,7 @@ static int test_rank(void)
         goto out;
 
     for(i=0; i<3; i++) {
-        sprintf(name,"ds_a_%d",i);
+        HDsprintf(name,"ds_a_%d",i);
         if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
             goto out;
         if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
@@ -4403,7 +4403,7 @@ static int test_rank(void)
         goto out;
 
     for(i=0; i<3; i++) {
-        sprintf(name,"ds_a_%d",i);
+        HDsprintf(name,"ds_a_%d",i);
         if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
             goto out;
         if(H5DSset_scale(dsid,name) < 0)
@@ -4517,7 +4517,7 @@ static int test_types(void)
     const char     *s1_str = "ABC";
     const char     *s2_str = "ABCD";
 
-    printf("Testing scales with several datatypes\n");
+    HDprintf("Testing scales with several datatypes\n");
 
     /*-------------------------------------------------------------------------
     * create a file for the test
@@ -4694,7 +4694,7 @@ static int test_data(void)
     float   fill=-99;                    /* fill value */
 
 
-    printf("Testing reading ASCII data and generate HDF5 data with scales\n");
+    HDprintf("Testing reading ASCII data and generate HDF5 data with scales\n");
 
     /*-------------------------------------------------------------------------
     * create a file for the test
@@ -4870,7 +4870,7 @@ static int read_data( const char* fname,
     /* read first data file */
     f = HDfopen(data_file, "r");
     if( f == NULL ) {
-        printf( "Could not open file %s\n", data_file );
+        HDprintf( "Could not open file %s\n", data_file );
         return -1;
     }
 
@@ -4892,7 +4892,7 @@ static int read_data( const char* fname,
     *buf = (float*) HDmalloc (nelms * sizeof( float ));
 
     if ( *buf == NULL ) {
-        printf( "memory allocation failed\n" );
+        HDprintf( "memory allocation failed\n" );
         HDfclose(f);
         return -1;
     }
@@ -4930,7 +4930,7 @@ static int test_errors2(void)
     int     nscales;                          /* number of scales in DIM */
     int     count;                            /* visitor data */
 
-    printf("Testing parameter errors\n");
+    HDprintf("Testing parameter errors\n");
 
     /*-------------------------------------------------------------------------
     * create a file, a dataset, scales
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index f4183c8..e589756 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -2187,40 +2187,40 @@ int main( void )
             continue;
 
         /* Print configuration */
-        printf("Configuration: ");
+        HDprintf("Configuration: ");
         if(config == 0)
-            printf("<empty>");
+            HDprintf("<empty>");
         if(config & CONFIG_LATEST) {
             if(need_comma)
-                printf(", ");
-            printf("latest format");
+                HDprintf(", ");
+            HDprintf("latest format");
             need_comma = TRUE;
         } /* end if */
         if(config & CONFIG_REOPEN_FILE) {
             if(need_comma)
-                printf(", ");
-            printf("reopen file");
+                HDprintf(", ");
+            HDprintf("reopen file");
             need_comma = TRUE;
         } /* end if */
         else if(config & CONFIG_REOPEN_DSET) {
             if(need_comma)
-                printf(", ");
-            printf("reopen dataset");
+                HDprintf(", ");
+            HDprintf("reopen dataset");
             need_comma = TRUE;
         } /* end if */
         if(config & CONFIG_DIRECT_WRITE) {
             if(need_comma)
-                printf(", ");
-            printf("direct write");
+                HDprintf(", ");
+            HDprintf("direct write");
             need_comma = TRUE;
         } /* end if */
         if(config & CONFIG_DIRECT_READ) {
             if(need_comma)
-                printf(", ");
-            printf("direct read");
+                HDprintf(", ");
+            HDprintf("direct read");
             need_comma = TRUE;
         } /* end if */
-        printf(":\n");
+        HDprintf(":\n");
         fflush(stdout);
 
         nerrors += test_single_chunk(config);
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index 5297e61..f3a6c9b 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -41,7 +41,7 @@
    buffers if appropriate.                                                   */
 
 /*-------------------------------------------------------------------------
-* test file image operations 
+* test file image operations
 *-------------------------------------------------------------------------
 */
 static int
@@ -106,7 +106,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         filename[i] = (char *)HDmalloc(sizeof(char) * 32);
 
         /* create file name */
-        sprintf(filename[i], "image_file%d.h5", (int)i);
+        HDsprintf(filename[i], "image_file%d.h5", (int)i);
 
         /* create file */
         if ((file_id[i] = H5Fcreate(filename[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -506,11 +506,11 @@ int main( void )
     nerrors += test_file_image(open_images, nflags, flags) < 0? 1 : 0;
 
     if (nerrors) goto error;
-    printf("File image tests passed.\n");
+    HDprintf("File image tests passed.\n");
     return 0;
 
 error:
-    printf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index e350533..6d13419 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -75,11 +75,11 @@ int main(void)
     nerrors += test_generate()<0  ?1:0;
 
     if (nerrors) goto error;
-    printf("All image tests passed.\n");
+    HDprintf("All image tests passed.\n");
     return 0;
 
 error:
-    printf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
@@ -344,7 +344,7 @@ static int test_data(void)
     if ((fid=H5Fcreate(FILE2,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
         goto out;
 
-    printf("Testing read ascii image data and generate images\n");
+    HDprintf("Testing read ascii image data and generate images\n");
 
     /*-------------------------------------------------------------------------
     * read 8bit image data
@@ -551,7 +551,7 @@ static int test_generate(void)
     if ((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
         goto out;
 
-    printf("Testing read and process data and make indexed images\n");
+    HDprintf("Testing read and process data and make indexed images\n");
 
     /*-------------------------------------------------------------------------
     * read data; the file data format is described below
@@ -561,7 +561,7 @@ static int test_generate(void)
     f  = HDfopen( data_file, "r" ) ;
     if ( f == NULL )
     {
-        printf( "Could not find file %s. Try set $srcdir \n", data_file );
+        HDprintf( "Could not find file %s. Try set $srcdir \n", data_file );
         goto out;
     }
 
@@ -602,11 +602,11 @@ static int test_generate(void)
 
 
     if(fscanf( f, "%d %d %d", &imax, &jmax, &kmax ) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
     if(fscanf( f, "%f %f %f", &valex, &xmin, &xmax ) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
 
@@ -638,7 +638,7 @@ static int test_generate(void)
     for ( i = 0; i < n_elements; i++ )
     {
         if(fscanf( f, "%f ", &value ) < 0 && HDferror(f)) {
-            printf( "fscanf error in file %s.\n", data_file );
+            HDprintf( "fscanf error in file %s.\n", data_file );
             goto out;
         } /* end if */
         data[i] = value;
@@ -797,37 +797,37 @@ static int read_data(const char* fname, /*IN*/
     */
 
     if(NULL == (f = HDfopen(data_file, "r"))) {
-        printf( "Could not open file %s. Try set $srcdir \n", data_file );
+        HDprintf( "Could not open file %s. Try set $srcdir \n", data_file );
         goto out;
     }
 
     if(fscanf(f, "%s", str) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
 
     if(fscanf(f, "%d", &color_planes) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
 
     if(fscanf(f, "%s", str) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
 
     if(fscanf(f, "%d", &h) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
 
     if(fscanf(f, "%s", str) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
 
     if(fscanf(f, "%d", &w) < 0 && HDferror(f)) {
-        printf( "fscanf error in file %s.\n", data_file );
+        HDprintf( "fscanf error in file %s.\n", data_file );
         goto out;
     } /* end if */
 
@@ -861,7 +861,7 @@ static int read_data(const char* fname, /*IN*/
     /* Read data elements */
     for(i = 0; i < n_elements; i++) {
         if(fscanf(f, "%d", &n) < 0 && HDferror(f)) {
-            printf( "fscanf error in file %s.\n", data_file );
+            HDprintf( "fscanf error in file %s.\n", data_file );
             goto out;
         } /* end if */
         image_data[i] = (unsigned char)n;
@@ -917,7 +917,7 @@ static int read_palette(const char* fname,
     /* open the input file */
     if (!(file = HDfopen(data_file, "r")))
     {
-        printf( "Could not open file %s. Try set $srcdir \n", data_file );
+        HDprintf( "Could not open file %s. Try set $srcdir \n", data_file );
         return -1;
     }
 
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index d6999ff..917d343 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -2121,7 +2121,7 @@ static int test_valid_path(void)
 
   if( (group = H5Gopen2(file_id, "/", H5P_DEFAULT)) < 0)
     goto out;
-  
+
   if( (path_valid = H5LTpath_valid(group, "/", TRUE)) != FALSE) {
     goto out;
   }
diff --git a/hl/test/test_packet_vlen.c b/hl/test/test_packet_vlen.c
index 4d83ae6..b41e73d 100644
--- a/hl/test/test_packet_vlen.c
+++ b/hl/test/test_packet_vlen.c
@@ -69,7 +69,7 @@ static int test_VLof_atomic(void)
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(unsigned int));
         if (writeBuf[uu].p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
     }
         writeBuf[uu].len = uu + 1;
@@ -108,7 +108,7 @@ static int test_VLof_atomic(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
@@ -120,8 +120,8 @@ static int test_VLof_atomic(void)
         for (vv = 0; vv < (uu + 1); vv++)
         {
         if (((unsigned int *)readBuf[uu].p)[vv] != ((unsigned int *)writeBuf[uu].p)[vv]) {
-        printf("Packet %u's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
-        printf("Packet %u's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
+        HDprintf("Packet %u's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
+        HDprintf("Packet %u's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
         }
         }
 
@@ -186,7 +186,7 @@ static int test_VLof_comptype(void)
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(VLcomp_t));
         if(writeBuf[uu].p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
     }
         writeBuf[uu].len = uu + 1;
@@ -242,7 +242,7 @@ static int test_VLof_comptype(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
@@ -253,13 +253,13 @@ static int test_VLof_comptype(void)
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].len != readBuf[uu].len) {
-            fprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%d, readBuf[%u].len=%d\n", __LINE__, uu, (int)writeBuf[uu].len, uu, (int)readBuf[uu].len);
+            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%d, readBuf[%u].len=%d\n", __LINE__, uu, (int)writeBuf[uu].len, uu, (int)readBuf[uu].len);
         continue;
     } /* write len != read len */
 
         for (vv = 0; vv < (uu + 1); vv++) {
             if (((unsigned int *)writeBuf[uu].p)[vv] != ((unsigned int *)readBuf[uu].p)[vv] ) {
-                fprintf(stderr, "VL data values don't match!, writeBuf[uu].p[%d]=%d, readBuf[uu].p[%d]=%d\n", vv, (int)((unsigned int *)writeBuf[uu].p)[vv], vv, (int)((unsigned int *)readBuf[uu].p)[vv]);
+                HDfprintf(stderr, "VL data values don't match!, writeBuf[uu].p[%d]=%d, readBuf[uu].p[%d]=%d\n", vv, (int)((unsigned int *)writeBuf[uu].p)[vv], vv, (int)((unsigned int *)readBuf[uu].p)[vv]);
                 continue;
         } /* write value != read value */
     }
@@ -334,7 +334,7 @@ static int test_compound_VL_VLtype(void)
         writeBuf[uu].f = (float)(uu * 20) / 3.0F;
         writeBuf[uu].v.p = HDmalloc((uu + L1_INCM) * sizeof(hvl_t));
         if (writeBuf[uu].v.p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
     }
         writeBuf[uu].v.len = uu + L1_INCM;
@@ -342,7 +342,7 @@ static int test_compound_VL_VLtype(void)
     {
             t1->p = HDmalloc((vv + L2_INCM) * sizeof(unsigned int));
         if (t1->p == NULL) {
-        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
         goto error;
         }
             t1->len = vv + L2_INCM;
@@ -407,7 +407,7 @@ static int test_compound_VL_VLtype(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
@@ -418,27 +418,27 @@ static int test_compound_VL_VLtype(void)
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].u != readBuf[uu].u) {
-            fprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu, writeBuf[uu].u, uu, readBuf[uu].u);
+            HDfprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu, writeBuf[uu].u, uu, readBuf[uu].u);
             continue;
         } /* end if */
         if (!H5_FLT_ABS_EQUAL(writeBuf[uu].f,readBuf[uu].f)) {
-            fprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu, (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
+            HDfprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu, (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
             continue;
         } /* end if */
 
         if (writeBuf[uu].v.len != readBuf[uu].v.len) {
-            fprintf(stderr, "%d: VL data length don't match!, writeBuf[%d].v.len=%zu, readBuf[%d].v.len=%zu\n", __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
+            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%d].v.len=%zu, readBuf[%d].v.len=%zu\n", __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
             continue;
         } /* end if */
 
         for (t1 = (hvl_t *)(writeBuf[uu].v.p), t2 = (hvl_t *)(readBuf[uu].v.p), vv = 0; (size_t)vv < readBuf[uu].v.len; vv++, t1++, t2++) {
             if (t1->len != t2->len) {
-                fprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n", __LINE__, uu, vv, t1->len, t2->len);
+                HDfprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n", __LINE__, uu, vv, t1->len, t2->len);
                 continue;
             } /* end if */
             for (ww = 0; (size_t)ww < t2->len; ww++) {
                 if (((unsigned int *)t1->p)[ww] != ((unsigned int *)t2->p)[ww] ) {
-                    fprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww, ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
+                    HDfprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww, ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
                     continue;
                 } /* end if */
             } /* end for */
@@ -505,7 +505,7 @@ static int test_VLof_VLtype(void)
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(hvl_t));
         if (writeBuf[uu].p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
         } /* end if */
         writeBuf[uu].len = uu + 1;
@@ -513,7 +513,7 @@ static int test_VLof_VLtype(void)
     {
             t1->p = HDmalloc((vv + 1) * sizeof(unsigned int));
         if (t1->p == NULL) {
-        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
         goto error;
         }
             t1->len = vv * 1;
@@ -559,7 +559,7 @@ static int test_VLof_VLtype(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
@@ -628,7 +628,7 @@ static int verify_ptlengthtype(hid_t fid, const char *table_name, herr_t expecte
     HDstrcpy(lenthtype, "fixed-length");
     if (expected_value == 1)
         HDstrcpy(lenthtype, "variable-length");
-    fprintf(stderr, "\nPacket table '%s' should be %s but is not\n", table_name, lenthtype);
+    HDfprintf(stderr, "\nPacket table '%s' should be %s but is not\n", table_name, lenthtype);
     ret = FAIL;
     }
 
@@ -1062,7 +1062,7 @@ static int testfl_VLof_atomic(void)
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(unsigned int));
         if (writeBuf[uu].p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
     }
         writeBuf[uu].len = uu + 1;
@@ -1101,7 +1101,7 @@ static int testfl_VLof_atomic(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
@@ -1113,8 +1113,8 @@ static int testfl_VLof_atomic(void)
         for (vv = 0; vv < (uu + 1); vv++)
         {
         if (((unsigned int *)readBuf[uu].p)[vv] != ((unsigned int *)writeBuf[uu].p)[vv]) {
-        printf("Packet %d's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
-        printf("Packet %d's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
+        HDprintf("Packet %d's value should be %d\n", uu, ((unsigned int *)writeBuf[uu].p)[vv]);
+        HDprintf("Packet %d's value in readBuf is %d\n", uu, ((unsigned int *)readBuf[uu].p)[vv]);
         }
         }
 
@@ -1179,7 +1179,7 @@ static int testfl_VLof_comptype(void)
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(VLcomp_t));
         if(writeBuf[uu].p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
     }
         writeBuf[uu].len = uu + 1;
@@ -1235,7 +1235,7 @@ static int testfl_VLof_comptype(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
@@ -1246,13 +1246,13 @@ static int testfl_VLof_comptype(void)
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].len != readBuf[uu].len) {
-            fprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%zu, readBuf[%u].len=%zu\n",__LINE__, uu, writeBuf[uu].len, uu, readBuf[uu].len);
+            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].len=%zu, readBuf[%u].len=%zu\n",__LINE__, uu, writeBuf[uu].len, uu, readBuf[uu].len);
         continue;
     } /* write len != read len */
 
         for (vv = 0; vv < (uu + 1); vv++) {
             if (((unsigned int *)writeBuf[uu].p)[vv] != ((unsigned int *)readBuf[uu].p)[vv] ) {
-                fprintf(stderr, "VL data values don't match!, writeBuf[uu].p[%u]=%u, readBuf[uu].p[%u]=%u\n", vv, ((unsigned int *)writeBuf[uu].p)[vv], vv, ((unsigned int *)readBuf[uu].p)[vv]);
+                HDfprintf(stderr, "VL data values don't match!, writeBuf[uu].p[%u]=%u, readBuf[uu].p[%u]=%u\n", vv, ((unsigned int *)writeBuf[uu].p)[vv], vv, ((unsigned int *)readBuf[uu].p)[vv]);
                 continue;
         } /* write value != read value */
     }
@@ -1327,7 +1327,7 @@ static int testfl_compound_VL_VLtype(void)
         writeBuf[uu].f = (float)(uu * 20) / 3.0F;
         writeBuf[uu].v.p = HDmalloc((uu + L1_INCM) * sizeof(hvl_t));
         if (writeBuf[uu].v.p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
     }
         writeBuf[uu].v.len = uu + L1_INCM;
@@ -1335,7 +1335,7 @@ static int testfl_compound_VL_VLtype(void)
     {
             t1->p = HDmalloc((vv + L2_INCM) * sizeof(unsigned int));
         if (t1->p == NULL) {
-        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
         goto error;
         }
             t1->len = vv + L2_INCM;
@@ -1400,7 +1400,7 @@ static int testfl_compound_VL_VLtype(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
@@ -1411,27 +1411,27 @@ static int testfl_compound_VL_VLtype(void)
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
         if (writeBuf[uu].u != readBuf[uu].u) {
-            fprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu, writeBuf[uu].u, uu, readBuf[uu].u);
+            HDfprintf(stderr, "Integer components don't match!, writeBuf[%u].u=%u, readBuf[%u].u=%u\n", uu, writeBuf[uu].u, uu, readBuf[uu].u);
             continue;
         } /* end if */
         if (!H5_FLT_ABS_EQUAL(writeBuf[uu].f, readBuf[uu].f)) {
-            fprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu, (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
+            HDfprintf(stderr, "Float components don't match!, writeBuf[%u].f=%f, readBuf[%u].f=%f\n", uu, (double)writeBuf[uu].f, uu, (double)readBuf[uu].f);
             continue;
         } /* end if */
 
         if (writeBuf[uu].v.len != readBuf[uu].v.len) {
-            fprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].v.len=%zu, readBuf[%u].v.len=%zu\n", __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
+            HDfprintf(stderr, "%d: VL data length don't match!, writeBuf[%u].v.len=%zu, readBuf[%u].v.len=%zu\n", __LINE__, uu, writeBuf[uu].v.len, uu, readBuf[uu].v.len);
             continue;
         } /* end if */
 
         for (t1 = (hvl_t *)(writeBuf[uu].v.p), t2 = (hvl_t *)(readBuf[uu].v.p), vv = 0; (size_t)vv < readBuf[uu].v.len; vv++, t1++, t2++) {
             if (t1->len != t2->len) {
-                fprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n", __LINE__, uu, vv, t1->len, t2->len);
+                HDfprintf(stderr, "%d: VL data length don't match!, uu=%u, vv=%u, t1->len=%zu, t2->len=%zu\n", __LINE__, uu, vv, t1->len, t2->len);
                 continue;
             } /* end if */
             for (ww = 0; (size_t)ww < t2->len; ww++) {
                 if (((unsigned int *)t1->p)[ww] != ((unsigned int *)t2->p)[ww] ) {
-                    fprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww, ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
+                    HDfprintf(stderr, "VL data values don't match!, t1->p[%u]=%u, t2->p[%u]=%u\n", ww, ((unsigned int *)t1->p)[ww], ww, ((unsigned int *)t2->p)[ww]);
                     continue;
                 } /* end if */
             } /* end for */
@@ -1498,7 +1498,7 @@ static int testfl_VLof_VLtype(void)
     for (uu = 0; uu < NRECORDS; uu++) {
         writeBuf[uu].p = HDmalloc((uu + 1) * sizeof(hvl_t));
         if (writeBuf[uu].p == NULL) {
-            fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+            HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
         } /* end if */
         writeBuf[uu].len = uu + 1;
@@ -1506,7 +1506,7 @@ static int testfl_VLof_VLtype(void)
     {
             t1->p = HDmalloc((vv + 1) * sizeof(unsigned int));
         if (t1->p == NULL) {
-        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        HDfprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
         goto error;
         }
             t1->len = vv + 1;
@@ -1552,7 +1552,7 @@ static int testfl_VLof_VLtype(void)
     if (ret < 0)
     goto error;
 
-    sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
+    HDsprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
 
     /* Read all five packets back */
diff --git a/src/H5AC.c b/src/H5AC.c
index 32bacc5..ff37f43 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -27,24 +27,24 @@
 
 #define H5AC_PACKAGE            /*suppress error about including H5ACpkg  */
 #define H5C_PACKAGE             /*suppress error about including H5Cpkg   */
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5F_PACKAGE        /*suppress error about including H5Fpkg      */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5AC_init_interface
+#define H5_INTERFACE_INIT_FUNC    H5AC_init_interface
 
 #ifdef H5_HAVE_PARALLEL
 #include <mpi.h>
 #endif /* H5_HAVE_PARALLEL */
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACpkg.h"		/* Metadata cache			*/
+#include "H5private.h"        /* Generic Functions            */
+#include "H5ACpkg.h"        /* Metadata cache            */
 #include "H5Cpkg.h"             /* Cache                                */
-#include "H5Dprivate.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"		/* Files				*/
-#include "H5FDprivate.h"	/* File drivers				*/
+#include "H5Dprivate.h"        /* Dataset functions            */
+#include "H5Eprivate.h"        /* Error handling              */
+#include "H5Fpkg.h"        /* Files                */
+#include "H5FDprivate.h"    /* File drivers                */
 #include "H5FLprivate.h"        /* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5Iprivate.h"        /* IDs                      */
 #include "H5MMprivate.h"        /* Memory management                    */
 #include "H5Pprivate.h"         /* Property lists                       */
 
@@ -68,13 +68,13 @@ H5FL_DEFINE_STATIC(H5AC_aux_t);
  * that purpose.  Its fields are as follows:
  *
  * magic:       Unsigned 32 bit integer always set to
- *		H5AC__H5AC_SLIST_ENTRY_T_MAGIC.  This field is used to
- *		validate pointers to instances of H5AC_slist_entry_t.
+ *        H5AC__H5AC_SLIST_ENTRY_T_MAGIC.  This field is used to
+ *        validate pointers to instances of H5AC_slist_entry_t.
  *
- * addr:	file offset of a metadata entry.  Entries are added to this
- *		list (if they aren't there already) when they are marked
- *		dirty in an unprotect, inserted, or moved.  They are
- *		removed when they appear in a clean entries broadcast.
+ * addr:    file offset of a metadata entry.  Entries are added to this
+ *        list (if they aren't there already) when they are marked
+ *        dirty in an unprotect, inserted, or moved.  They are
+ *        removed when they appear in a clean entries broadcast.
  *
  ****************************************************************************/
 
@@ -136,7 +136,7 @@ static herr_t H5AC_construct_candidate_list(H5AC_t * cache_ptr,
 static herr_t H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
                                         int * num_entries_ptr,
                                         haddr_t ** haddr_buf_ptr_ptr,
-					size_t * MPI_Offset_buf_size_ptr,
+                    size_t * MPI_Offset_buf_size_ptr,
                                         MPI_Offset ** MPI_Offset_buf_ptr_ptr);
 
 static herr_t H5AC_flush_entries(H5F_t *f);
@@ -183,39 +183,39 @@ static herr_t H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
                                       int num_candidates,
                                       haddr_t * candidates_list_ptr);
 
-herr_t H5AC_rsp__dist_md_write__flush(H5F_t *f, 
-                                      hid_t dxpl_id, 
+herr_t H5AC_rsp__dist_md_write__flush(H5F_t *f,
+                                      hid_t dxpl_id,
                                       H5AC_t * cache_ptr);
 
-herr_t H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f, 
-                                                   hid_t dxpl_id, 
+herr_t H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
+                                                   hid_t dxpl_id,
                                                    H5AC_t * cache_ptr);
 
-herr_t H5AC_rsp__p0_only__flush(H5F_t *f, 
-                                hid_t dxpl_id, 
+herr_t H5AC_rsp__p0_only__flush(H5F_t *f,
+                                hid_t dxpl_id,
                                 H5AC_t * cache_ptr);
 
-herr_t H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f, 
-                                             hid_t dxpl_id, 
+herr_t H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
+                                             hid_t dxpl_id,
                                              H5AC_t * cache_ptr);
 
-static herr_t H5AC_run_sync_point(H5F_t *f, 
-                                  hid_t dxpl_id, 
-		                  int sync_point_op);
+static herr_t H5AC_run_sync_point(H5F_t *f,
+                                  hid_t dxpl_id,
+                        int sync_point_op);
 
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	H5AC_init
+ * Function:    H5AC_init
  *
- * Purpose:	Initialize the interface from some other layer.
+ * Purpose:    Initialize the interface from some other layer.
  *
- * Return:	Success:	non-negative
+ * Return:    Success:    non-negative
  *
- *		Failure:	negative
+ *        Failure:    negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, January 18, 2003
  *
  *-------------------------------------------------------------------------
@@ -232,15 +232,15 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	H5AC_init_interface
+ * Function:    H5AC_init_interface
  *
- * Purpose:	Initialize interface-specific information
+ * Purpose:    Initialize interface-specific information
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, July 18, 2002
  *
  *-------------------------------------------------------------------------
@@ -303,18 +303,18 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5AC_init_interface() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	H5AC_term_interface
+ * Function:    H5AC_term_interface
  *
- * Purpose:	Terminate this interface.
+ * Purpose:    Terminate this interface.
  *
- * Return:	Success:	Positive if anything was done that might
- *				affect other interfaces; zero otherwise.
+ * Return:    Success:    Positive if anything was done that might
+ *                affect other interfaces; zero otherwise.
  *
- * 		Failure:	Negative.
+ *         Failure:    Negative.
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, July 18, 2002
  *
  *-------------------------------------------------------------------------
@@ -322,7 +322,7 @@ done:
 int
 H5AC_term_interface(void)
 {
-    int	n = 0;
+    int    n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -378,10 +378,10 @@ static const char * H5AC_entry_type_names[H5AC_NTYPES] =
     "shared OH message master table",
     "shared OH message index",
     "superblock",
-    "test entry"	/* for testing only -- not used for actual files */
+    "test entry"    /* for testing only -- not used for actual files */
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_create
  *
@@ -405,7 +405,7 @@ H5AC_create(const H5F_t *f,
             H5AC_cache_config_t *config_ptr)
 {
 #ifdef H5_HAVE_PARALLEL
-    char 	 prefix[H5C__PREFIX_LEN] = "";
+    char      prefix[H5C__PREFIX_LEN] = "";
     H5AC_aux_t * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
     herr_t ret_value = SUCCEED;      /* Return value */
@@ -423,9 +423,9 @@ H5AC_create(const H5F_t *f,
 
 #ifdef H5_HAVE_PARALLEL
     if(H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) {
-        MPI_Comm	 mpi_comm;
-        int		 mpi_rank;
-        int	 	 mpi_size;
+        MPI_Comm     mpi_comm;
+        int         mpi_rank;
+        int          mpi_size;
 
         if(MPI_COMM_NULL == (mpi_comm = H5F_mpi_get_comm(f)))
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI communicator")
@@ -465,7 +465,7 @@ H5AC_create(const H5F_t *f,
         aux_ptr->write_done = NULL;
         aux_ptr->sync_point_done = NULL;
 
-        sprintf(prefix, "%d:", mpi_rank);
+        HDsprintf(prefix, "%d:", mpi_rank);
 
         if(mpi_rank == 0) {
             if(NULL == (aux_ptr->d_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
@@ -531,7 +531,7 @@ H5AC_create(const H5F_t *f,
 #endif /* H5_HAVE_PARALLEL */
 
     if(NULL == f->shared->cache)
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
 #ifdef H5_HAVE_PARALLEL
     if(aux_ptr != NULL) {
@@ -566,7 +566,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_create() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_dest
  *
@@ -639,13 +639,13 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_dest() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_expunge_entry
  *
- * Purpose:	Expunge the target entry from the cache without writing it
- * 		to disk even if it is dirty.  The entry must not be either
- * 		pinned or protected.
+ * Purpose:    Expunge the target entry from the cache without writing it
+ *         to disk even if it is dirty.  The entry must not be either
+ *         pinned or protected.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -656,9 +656,9 @@ done:
  */
 herr_t
 H5AC_expunge_entry(H5F_t *f,
-		   hid_t dxpl_id,
-		   const H5AC_class_t *type,
-		   haddr_t addr,
+        hid_t dxpl_id,
+        const H5AC_class_t *type,
+        haddr_t addr,
                    unsigned flags)
 {
     herr_t  result;
@@ -690,15 +690,15 @@ H5AC_expunge_entry(H5F_t *f,
          ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC_expunge_entry 0x%lx %d",
-	        (unsigned long)addr,
-		(int)(type->id));
+        HDsprintf(trace, "H5AC_expunge_entry 0x%lx %d",
+            (unsigned long)addr,
+        (int)(type->id));
     }
 }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     result = H5C_expunge_entry(f,
-		               dxpl_id,
+                    dxpl_id,
                                H5AC_dxpl_id,
                                type,
                                addr,
@@ -715,7 +715,7 @@ done:
 #if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
@@ -723,17 +723,17 @@ done:
 
 } /* H5AC_expunge_entry() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_flush
  *
- * Purpose:	Flush (and possibly destroy) the metadata cache associated
- *		with the specified file.
+ * Purpose:    Flush (and possibly destroy) the metadata cache associated
+ *        with the specified file.
  *
- *		If the cache contains protected entries, the function will
- *		fail, as protected entries cannot be flushed.  However
- *		all unprotected entries should be flushed before the
- *		function returns failure.
+ *        If the cache contains protected entries, the function will
+ *        fail, as protected entries cannot be flushed.  However
+ *        all unprotected entries should be flushed before the
+ *        function returns failure.
  *
  * Return:      Non-negative on success/Negative on failure if there was a
  *              request to flush all items and something was protected.
@@ -748,10 +748,10 @@ herr_t
 H5AC_flush(H5F_t *f, hid_t dxpl_id)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char 	  trace[128] = "";
-    FILE *	  trace_file_ptr = NULL;
+    char       trace[128] = "";
+    FILE *      trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
-    herr_t	  ret_value = SUCCEED;      /* Return value */
+    herr_t      ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -768,7 +768,7 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id)
             (f->shared->cache != NULL) &&
             (H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
             (trace_file_ptr != NULL))
-	sprintf(trace, "H5AC_flush");
+    HDsprintf(trace, "H5AC_flush");
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
@@ -790,20 +790,20 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_flush() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_entry_status
  *
  * Purpose:     Given a file address, determine whether the metadata
- * 		cache contains an entry at that location.  If it does,
- * 		also determine whether the entry is dirty, protected,
- * 		pinned, etc. and return that information to the caller
- * 		in *status_ptr.
+ *         cache contains an entry at that location.  If it does,
+ *         also determine whether the entry is dirty, protected,
+ *         pinned, etc. and return that information to the caller
+ *         in *status_ptr.
  *
- * 		If the specified entry doesn't exist, set *status_ptr
- * 		to zero.
+ *         If the specified entry doesn't exist, set *status_ptr
+ *         to zero.
  *
- * 		On error, the value of *status_ptr is undefined.
+ *         On error, the value of *status_ptr is undefined.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -815,14 +815,14 @@ done:
 herr_t
 H5AC_get_entry_status(const H5F_t *f,
                       haddr_t    addr,
-		      unsigned * status_ptr)
+            unsigned * status_ptr)
 {
-    hbool_t	in_cache;
-    hbool_t	is_dirty;
-    hbool_t	is_protected;
-    hbool_t	is_pinned;
-    size_t	entry_size;
-    unsigned	status = 0;
+    hbool_t    in_cache;
+    hbool_t    is_dirty;
+    hbool_t    is_protected;
+    hbool_t    is_pinned;
+    size_t    entry_size;
+    unsigned    status = 0;
     herr_t      ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -835,13 +835,13 @@ H5AC_get_entry_status(const H5F_t *f,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_entry_status() failed.")
 
     if(in_cache) {
-	status |= H5AC_ES__IN_CACHE;
-	if(is_dirty)
-	    status |= H5AC_ES__IS_DIRTY;
-	if(is_protected)
-	    status |= H5AC_ES__IS_PROTECTED;
-	if(is_pinned)
-	    status |= H5AC_ES__IS_PINNED;
+    status |= H5AC_ES__IN_CACHE;
+    if(is_dirty)
+        status |= H5AC_ES__IS_DIRTY;
+    if(is_protected)
+        status |= H5AC_ES__IS_PROTECTED;
+    if(is_pinned)
+        status |= H5AC_ES__IS_PINNED;
     } /* end if */
 
     *status_ptr = status;
@@ -850,7 +850,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_get_entry_status() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_insert_entry
  *
@@ -870,9 +870,9 @@ herr_t
 H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *thing, unsigned int flags)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char          	trace[128] = "";
+    char              trace[128] = "";
     size_t              trace_entry_size = 0;
-    FILE *        	trace_file_ptr = NULL;
+    FILE *            trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t ret_value = SUCCEED;      /* Return value */
 
@@ -889,7 +889,7 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
 
     /* Check for invalid access request */
     if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file")
+    HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file")
 
 #if H5AC__TRACE_FILE_ENABLED
     /* For the insert, only the addr, size, type id and flags are really
@@ -905,10 +905,10 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
          ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC_insert_entry 0x%lx %d 0x%x",
-	        (unsigned long)addr,
-		type->id,
-		flags);
+        HDsprintf(trace, "H5AC_insert_entry 0x%lx %d 0x%x",
+            (unsigned long)addr,
+        type->id,
+        flags);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
@@ -943,21 +943,21 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
 done:
 #if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr != NULL) {
-	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
+    HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
                   (int)trace_entry_size,
-		  (int)ret_value);
+        (int)ret_value);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_insert_entry() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_mark_entry_dirty
  *
- * Purpose:	Mark a pinned or protected entry as dirty.  The target
- * 		entry MUST be either pinned, protected, or both.
+ * Purpose:    Mark a pinned or protected entry as dirty.  The target
+ *         entry MUST be either pinned, protected, or both.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -970,8 +970,8 @@ herr_t
 H5AC_mark_entry_dirty(void *thing)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char          	trace[128] = "";
-    FILE *        	trace_file_ptr = NULL;
+    char              trace[128] = "";
+    FILE *            trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
@@ -987,8 +987,8 @@ H5AC_mark_entry_dirty(void *thing)
      */
     if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
             (NULL != trace_file_ptr))
-        sprintf(trace, "%s 0x%lx", FUNC,
-	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+        HDsprintf(trace, "%s 0x%lx", FUNC,
+            (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
@@ -1013,13 +1013,13 @@ H5AC_mark_entry_dirty(void *thing)
 done:
 #if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
-	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_mark_entry_dirty() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_move_entry
  *
@@ -1038,8 +1038,8 @@ herr_t
 H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char          	trace[128] = "";
-    FILE *        	trace_file_ptr = NULL;
+    char              trace[128] = "";
+    FILE *            trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
 #ifdef H5_HAVE_PARALLEL
     H5AC_aux_t        * aux_ptr;
@@ -1066,10 +1066,10 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
          ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC_move_entry 0x%lx 0x%lx %d",
-	        (unsigned long)old_addr,
-		(unsigned long)new_addr,
-		(int)(type->id));
+        HDsprintf(trace, "H5AC_move_entry 0x%lx 0x%lx %d",
+            (unsigned long)old_addr,
+        (unsigned long)new_addr,
+        (int)(type->id));
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
@@ -1095,17 +1095,17 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
 done:
 #if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr != NULL)
-	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_move_entry() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_pin_protected_entry()
  *
- * Purpose:	Pin a protected cache entry.  The entry must be protected
+ * Purpose:    Pin a protected cache entry.  The entry must be protected
  *              at the time of call, and must be unpinned.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -1135,8 +1135,8 @@ H5AC_pin_protected_entry(void *thing)
      */
     if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
             (NULL != trace_file_ptr))
-        sprintf(trace, "%s 0x%lx", FUNC,
-	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+        HDsprintf(trace, "%s 0x%lx", FUNC,
+            (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     if(H5C_pin_protected_entry(thing) < 0)
@@ -1145,27 +1145,27 @@ H5AC_pin_protected_entry(void *thing)
 done:
 #if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
-	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_pin_protected_entry() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_protect
  *
  * Purpose:     If the target entry is not in the cache, load it.  If
- *		necessary, attempt to evict one or more entries to keep
- *		the cache within its maximum size.
+ *        necessary, attempt to evict one or more entries to keep
+ *        the cache within its maximum size.
  *
- *		Mark the target entry as protected, and return its address
- *		to the caller.  The caller must call H5AC_unprotect() when
- *		finished with the entry.
+ *        Mark the target entry as protected, and return its address
+ *        to the caller.  The caller must call H5AC_unprotect() when
+ *        finished with the entry.
  *
- *		While it is protected, the entry may not be either evicted
- *		or flushed -- nor may it be accessed by another call to
- *		H5AC_protect.  Any attempt to do so will result in a failure.
+ *        While it is protected, the entry may not be either evicted
+ *        or flushed -- nor may it be accessed by another call to
+ *        H5AC_protect.  Any attempt to do so will result in a failure.
  *
  * Return:      Success:        Ptr to the object.
  *              Failure:        NULL
@@ -1181,17 +1181,17 @@ H5AC_protect(H5F_t *f,
              hid_t dxpl_id,
              const H5AC_class_t *type,
              haddr_t addr,
-	     void *udata,
+        void *udata,
              H5AC_protect_t rw)
 {
-    unsigned		protect_flags = H5C__NO_FLAGS_SET;
-    void *		thing = (void *)NULL;
+    unsigned        protect_flags = H5C__NO_FLAGS_SET;
+    void *        thing = (void *)NULL;
 #if H5AC__TRACE_FILE_ENABLED
     char                trace[128] = "";
-    size_t		trace_entry_size = 0;
+    size_t        trace_entry_size = 0;
     FILE *              trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
-    void *		ret_value;      /* Return value */
+    void *        ret_value;      /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1206,7 +1206,7 @@ H5AC_protect(H5F_t *f,
 
     /* Check for invalid access request */
     if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR) && rw == H5AC_WRITE)
-	HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file")
+    HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file")
 
 #if H5AC__TRACE_FILE_ENABLED
     /* For the protect call, only the addr and type id is really necessary
@@ -1220,40 +1220,40 @@ H5AC_protect(H5F_t *f,
          ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
-	const char * rw_string;
+    const char * rw_string;
 
         if ( rw == H5AC_WRITE ) {
 
-	    rw_string = "H5AC_WRITE";
+        rw_string = "H5AC_WRITE";
 
-	} else if ( rw == H5AC_READ ) {
+    } else if ( rw == H5AC_READ ) {
 
-	    rw_string = "H5AC_READ";
+        rw_string = "H5AC_READ";
 
-	} else {
+    } else {
 
-	    rw_string = "???";
-	}
+        rw_string = "???";
+    }
 
-        sprintf(trace, "H5AC_protect 0x%lx %d %s",
-	        (unsigned long)addr,
-		(int)(type->id),
-		rw_string);
+        HDsprintf(trace, "H5AC_protect 0x%lx %d %s",
+            (unsigned long)addr,
+        (int)(type->id),
+        rw_string);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     if ( rw == H5AC_READ ) {
 
-	protect_flags |= H5C__READ_ONLY_FLAG;
+    protect_flags |= H5C__READ_ONLY_FLAG;
     }
 
     thing = H5C_protect(f,
-		        dxpl_id,
+                dxpl_id,
                         H5AC_dxpl_id,
-			type,
-			addr,
-			udata,
-			protect_flags);
+            type,
+            addr,
+            udata,
+            protect_flags);
 
     if ( thing == NULL ) {
 
@@ -1276,7 +1276,7 @@ done:
 #if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
+    HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
                   (int)trace_entry_size,
                   (int)(ret_value != NULL));
     }
@@ -1286,11 +1286,11 @@ done:
 
 } /* H5AC_protect() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_resize_entry
  *
- * Purpose:	Resize a pinned or protected entry.
+ * Purpose:    Resize a pinned or protected entry.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -1303,8 +1303,8 @@ herr_t
 H5AC_resize_entry(void *thing, size_t new_size)
 {
 #if H5AC__TRACE_FILE_ENABLED
-    char          	trace[128] = "";
-    FILE *        	trace_file_ptr = NULL;
+    char              trace[128] = "";
+    FILE *            trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
@@ -1320,9 +1320,9 @@ H5AC_resize_entry(void *thing, size_t new_size)
      */
     if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
             (NULL != trace_file_ptr))
-        sprintf(trace, "%s 0x%lx %d", FUNC,
-	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr),
-		(int)new_size);
+        HDsprintf(trace, "%s 0x%lx %d", FUNC,
+            (unsigned long)(((H5C_cache_entry_t *)thing)->addr),
+        (int)new_size);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     if(H5C_resize_entry(thing, new_size) < 0)
@@ -1346,18 +1346,18 @@ H5AC_resize_entry(void *thing, size_t new_size)
 done:
 #if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
-	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_resize_entry() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_unpin_entry()
  *
- * Purpose:	Unpin a cache entry.  The entry must be unprotected at
- * 		the time of call, and must be pinned.
+ * Purpose:    Unpin a cache entry.  The entry must be unprotected at
+ *         the time of call, and must be pinned.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -1386,8 +1386,8 @@ H5AC_unpin_entry(void *thing)
      */
     if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
             (NULL != trace_file_ptr))
-        sprintf(trace, "%s 0x%lx", FUNC,
-	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+        HDsprintf(trace, "%s 0x%lx", FUNC,
+            (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     if(H5C_unpin_entry(thing) < 0)
@@ -1396,37 +1396,37 @@ H5AC_unpin_entry(void *thing)
 done:
 #if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
-	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
+    HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_unpin_entry() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_unprotect
  *
- * Purpose:	Undo an H5AC_protect() call -- specifically, mark the
- *		entry as unprotected, remove it from the protected list,
- *		and give it back to the replacement policy.
+ * Purpose:    Undo an H5AC_protect() call -- specifically, mark the
+ *        entry as unprotected, remove it from the protected list,
+ *        and give it back to the replacement policy.
  *
- *		The TYPE and ADDR arguments must be the same as those in
- *		the corresponding call to H5AC_protect() and the THING
- *		argument must be the value returned by that call to
- *		H5AC_protect().
+ *        The TYPE and ADDR arguments must be the same as those in
+ *        the corresponding call to H5AC_protect() and the THING
+ *        argument must be the value returned by that call to
+ *        H5AC_protect().
  *
- *		If the deleted flag is TRUE, simply remove the target entry
- *		from the cache, clear it, and free it without writing it to
- *		disk.
+ *        If the deleted flag is TRUE, simply remove the target entry
+ *        from the cache, clear it, and free it without writing it to
+ *        disk.
  *
- *		This version of the function is a complete re-write to
- *		use the new metadata cache.  While there isn't all that
- *		much difference between the old and new Purpose sections,
- *		the original version is given below.
+ *        This version of the function is a complete re-write to
+ *        use the new metadata cache.  While there isn't all that
+ *        much difference between the old and new Purpose sections,
+ *        the original version is given below.
  *
- *		Original purpose section:
+ *        Original purpose section:
  *
- *		This function should be called to undo the effect of
+ *        This function should be called to undo the effect of
  *              H5AC_protect().  The TYPE and ADDR arguments should be the
  *              same as the corresponding call to H5AC_protect() and the
  *              THING argument should be the value returned by H5AC_protect().
@@ -1445,8 +1445,8 @@ herr_t
 H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
     void *thing, unsigned flags)
 {
-    hbool_t		dirtied;
-    hbool_t		deleted;
+    hbool_t        dirtied;
+    hbool_t        deleted;
 #ifdef H5_HAVE_PARALLEL
     H5AC_aux_t        * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
@@ -1480,21 +1480,21 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
          ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC_unprotect 0x%lx %d",
-	        (unsigned long)addr,
-		(int)(type->id));
+        HDsprintf(trace, "H5AC_unprotect 0x%lx %d",
+            (unsigned long)addr,
+        (int)(type->id));
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     dirtied = (hbool_t)( ( (flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG ) ||
-		( ((H5AC_info_t *)thing)->dirtied ) );
+        ( ((H5AC_info_t *)thing)->dirtied ) );
     deleted = (hbool_t)( (flags & H5C__DELETED_FLAG) == H5C__DELETED_FLAG );
 
     /* Check if the size changed out from underneath us, if we're not deleting
      *  the entry.
      */
     if(dirtied && !deleted) {
-        size_t		curr_size = 0;
+        size_t        curr_size = 0;
 
         if((type->size)(f, thing, &curr_size) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, FAIL, "Can't get size of thing")
@@ -1532,21 +1532,21 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
 done:
 #if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr != NULL)
-	HDfprintf(trace_file_ptr, "%s %x %d\n",
-		  trace, (unsigned)flags, (int)ret_value);
+    HDfprintf(trace_file_ptr, "%s %x %d\n",
+        trace, (unsigned)flags, (int)ret_value);
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_unprotect() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    HA5C_set_sync_point_done_callback
  *
- * Purpose:     Set the value of the sync_point_done callback.  This 
- *		callback is used by the parallel test code to verify
- *		that the expected writes and only the expected writes
- *		take place during a sync point.
+ * Purpose:     Set the value of the sync_point_done callback.  This
+ *        callback is used by the parallel test code to verify
+ *        that the expected writes and only the expected writes
+ *        take place during a sync point.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -1577,7 +1577,7 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
 } /* H5AC_set_sync_point_done_callback() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    HA5C_set_write_done_callback
  *
@@ -1614,7 +1614,7 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
 } /* H5AC_set_write_done_callback() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_stats
  *
@@ -1630,7 +1630,7 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
 herr_t
 H5AC_stats(const H5F_t *f)
 {
-    herr_t		ret_value = SUCCEED;   /* Return value */
+    herr_t        ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1645,7 +1645,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_dump_cache
  *
@@ -1679,7 +1679,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_dump_cache() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_cache_auto_resize_config
  *
@@ -1726,7 +1726,7 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
     }
 
     result = H5C_get_cache_auto_resize_config((const H5C_t *)cache_ptr,
-					      &internal_config);
+                        &internal_config);
 
     if ( result < 0 ) {
 
@@ -1743,7 +1743,7 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
 
     } else {
 
-	config_ptr->rpt_fcn_enabled = TRUE;
+    config_ptr->rpt_fcn_enabled = TRUE;
     }
 
     config_ptr->open_trace_file        = FALSE;
@@ -1778,17 +1778,17 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
     if ( cache_ptr->aux_ptr != NULL ) {
 
         config_ptr->dirty_bytes_threshold =
-	    ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold;
-	config_ptr->metadata_write_strategy = 
-	    ((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy;
+        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold;
+    config_ptr->metadata_write_strategy =
+        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy;
 
     } else {
 #endif /* H5_HAVE_PARALLEL */
 
-        config_ptr->dirty_bytes_threshold = 
-		H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
-	config_ptr->metadata_write_strategy = 
-		H5AC__DEFAULT_METADATA_WRITE_STRATEGY;
+        config_ptr->dirty_bytes_threshold =
+        H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
+    config_ptr->metadata_write_strategy =
+        H5AC__DEFAULT_METADATA_WRITE_STRATEGY;
 
 #ifdef H5_HAVE_PARALLEL
     }
@@ -1800,7 +1800,7 @@ done:
 
 } /* H5AC_get_cache_auto_resize_config() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_cache_size
  *
@@ -1826,10 +1826,10 @@ H5AC_get_cache_size(H5AC_t * cache_ptr,
     FUNC_ENTER_NOAPI(FAIL)
 
     result = H5C_get_cache_size((H5C_t *)cache_ptr,
-				max_size_ptr,
-				min_clean_size_ptr,
-				cur_size_ptr,
-				cur_num_entries_ptr);
+                max_size_ptr,
+                min_clean_size_ptr,
+                cur_size_ptr,
+                cur_num_entries_ptr);
 
     if ( result < 0 ) {
 
@@ -1843,7 +1843,7 @@ done:
 
 } /* H5AC_get_cache_size() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_get_cache_hit_rate
  *
@@ -1870,7 +1870,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_get_cache_hit_rate() */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_reset_cache_hit_rate_stats()
@@ -1905,7 +1905,7 @@ done:
 
 } /* H5AC_reset_cache_hit_rate_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_set_cache_auto_resize_config
  *
@@ -1971,16 +1971,16 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr,
 
     if ( config_ptr->open_trace_file ) {
 
-	FILE * file_ptr = NULL;
+    FILE * file_ptr = NULL;
 
-	if ( H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
+    if ( H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
 
-	    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-			"H5C_get_trace_file_ptr() failed.")
-	}
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
+            "H5C_get_trace_file_ptr() failed.")
+    }
 
-	if ( ( ! ( config_ptr->close_trace_file ) ) &&
-	     ( file_ptr != NULL ) ) {
+    if ( ( ! ( config_ptr->close_trace_file ) ) &&
+        ( file_ptr != NULL ) ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                         "Trace file already open.")
@@ -1989,21 +1989,21 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr,
 
     if ( config_ptr->close_trace_file ) {
 
-	if ( H5AC_close_trace_file(cache_ptr) < 0 ) {
+    if ( H5AC_close_trace_file(cache_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "H5AC_close_trace_file() failed.")
-	}
+    }
     }
 
     if ( config_ptr->open_trace_file ) {
 
         if ( H5AC_open_trace_file(cache_ptr, config_ptr->trace_file_name) < 0 )
-	{
+    {
 
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                         "H5AC_open_trace_file() failed.")
-	}
+    }
     }
 
     if(H5AC_ext_config_2_int_config(config_ptr, &internal_config) < 0)
@@ -2037,40 +2037,40 @@ done:
          ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-	HDfprintf(trace_file_ptr,
+    HDfprintf(trace_file_ptr,
                   "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %f %f %d %d %d %f %f %d %d %d %d %f %d %d %d\n",
-		  "H5AC_set_cache_auto_resize_config",
-		  trace_config.version,
-		  (int)(trace_config.rpt_fcn_enabled),
-		  (int)(trace_config.open_trace_file),
-		  (int)(trace_config.close_trace_file),
-		  trace_config.trace_file_name,
-		  (int)(trace_config.evictions_enabled),
-		  (int)(trace_config.set_initial_size),
-		  (int)(trace_config.initial_size),
-		  trace_config.min_clean_fraction,
-		  (int)(trace_config.max_size),
-		  (int)(trace_config.min_size),
-		  trace_config.epoch_length,
-		  (int)(trace_config.incr_mode),
-		  trace_config.lower_hr_threshold,
-		  trace_config.increment,
-		  (int)(trace_config.flash_incr_mode),
-		  trace_config.flash_multiple,
-		  trace_config.flash_threshold,
-		  (int)(trace_config.apply_max_increment),
-		  (int)(trace_config.max_increment),
-		  (int)(trace_config.decr_mode),
-		  trace_config.upper_hr_threshold,
-		  trace_config.decrement,
-		  (int)(trace_config.apply_max_decrement),
-		  (int)(trace_config.max_decrement),
-		  trace_config.epochs_before_eviction,
-		  (int)(trace_config.apply_empty_reserve),
-		  trace_config.empty_reserve,
-		  trace_config.dirty_bytes_threshold,
-		  trace_config.metadata_write_strategy,
-		  (int)ret_value);
+        "H5AC_set_cache_auto_resize_config",
+        trace_config.version,
+        (int)(trace_config.rpt_fcn_enabled),
+        (int)(trace_config.open_trace_file),
+        (int)(trace_config.close_trace_file),
+        trace_config.trace_file_name,
+        (int)(trace_config.evictions_enabled),
+        (int)(trace_config.set_initial_size),
+        (int)(trace_config.initial_size),
+        trace_config.min_clean_fraction,
+        (int)(trace_config.max_size),
+        (int)(trace_config.min_size),
+        trace_config.epoch_length,
+        (int)(trace_config.incr_mode),
+        trace_config.lower_hr_threshold,
+        trace_config.increment,
+        (int)(trace_config.flash_incr_mode),
+        trace_config.flash_multiple,
+        trace_config.flash_threshold,
+        (int)(trace_config.apply_max_increment),
+        (int)(trace_config.max_increment),
+        (int)(trace_config.decr_mode),
+        trace_config.upper_hr_threshold,
+        trace_config.decrement,
+        (int)(trace_config.apply_max_decrement),
+        (int)(trace_config.max_decrement),
+        trace_config.epochs_before_eviction,
+        (int)(trace_config.apply_empty_reserve),
+        trace_config.empty_reserve,
+        trace_config.dirty_bytes_threshold,
+        trace_config.metadata_write_strategy,
+        (int)ret_value);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
 
@@ -2078,21 +2078,21 @@ done:
 
 } /* H5AC_set_cache_auto_resize_config() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_validate_config()
  *
  * Purpose:     Run a sanity check on the contents of the supplied
- *		instance of H5AC_cache_config_t.
+ *        instance of H5AC_cache_config_t.
  *
  *              Do nothing and return SUCCEED if no errors are detected,
  *              and flag an error and return FAIL otherwise.
  *
- *		At present, this function operates by packing the data
- *		from the instance of H5AC_cache_config_t into an instance
- *		of H5C_auto_size_ctl_t, and then calling
- *		H5C_validate_resize_config().  As H5AC_cache_config_t and
- *		H5C_auto_size_ctl_t diverge, we may have to change this.
+ *        At present, this function operates by packing the data
+ *        from the instance of H5AC_cache_config_t into an instance
+ *        of H5C_auto_size_ctl_t, and then calling
+ *        H5C_validate_resize_config().  As H5AC_cache_config_t and
+ *        H5C_auto_size_ctl_t diverge, we may have to change this.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -2126,19 +2126,19 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
 
     /* don't bother to test trace_file_name unless open_trace_file is TRUE */
     if(config_ptr->open_trace_file) {
-        size_t	        name_len;
+        size_t            name_len;
 
-	/* Can't really test the trace_file_name field without trying to
-	 * open the file, so we will content ourselves with a couple of
-	 * sanity checks on the length of the file name.
-	 */
-	name_len = HDstrlen(config_ptr->trace_file_name);
+    /* Can't really test the trace_file_name field without trying to
+    * open the file, so we will content ourselves with a couple of
+    * sanity checks on the length of the file name.
+    */
+    name_len = HDstrlen(config_ptr->trace_file_name);
 
-	if(name_len == 0) {
+    if(name_len == 0) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->trace_file_name is empty.")
         } else if(name_len > H5AC__MAX_TRACE_FILE_NAME_LEN) {
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->trace_file_name too long.")
-	}
+    }
     }
 
     if ( ( config_ptr->evictions_enabled != TRUE ) &&
@@ -2149,9 +2149,9 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
     }
 
     if ( ( config_ptr->evictions_enabled == FALSE ) &&
-	 ( ( config_ptr->incr_mode != H5C_incr__off ) ||
-	   ( config_ptr->flash_incr_mode != H5C_flash_incr__off ) ||
-	   ( config_ptr->decr_mode != H5C_decr__off ) ) ) {
+    ( ( config_ptr->incr_mode != H5C_incr__off ) ||
+    ( config_ptr->flash_incr_mode != H5C_flash_incr__off ) ||
+    ( config_ptr->decr_mode != H5C_decr__off ) ) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                     "Can't disable evictions while auto-resize is enabled.")
@@ -2177,7 +2177,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_validate_config() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_close_trace_file()
  *
@@ -2211,7 +2211,7 @@ H5AC_close_trace_file(H5AC_t * cache_ptr)
     if ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "H5C_get_trace_file_ptr() failed.")
+            "H5C_get_trace_file_ptr() failed.")
     }
 
     if ( trace_file_ptr != NULL ) {
@@ -2235,15 +2235,15 @@ done:
 
 } /* H5AC_close_trace_file() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_open_trace_file()
  *
  * Purpose:     Open a trace file, and start logging calls to the cache.
  *
- * 		This logging is done at the H5C level, and will only take
- * 		place if H5C_TRACE_FILE_ENABLED (defined in H5Cprivate.h)
- * 		is TRUE.
+ *         This logging is done at the H5C level, and will only take
+ *         place if H5C_TRACE_FILE_ENABLED (defined in H5Cprivate.h)
+ *         is TRUE.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -2254,7 +2254,7 @@ done:
  */
 herr_t
 H5AC_open_trace_file(H5AC_t * cache_ptr,
-		     const char * trace_file_name)
+            const char * trace_file_name)
 {
     herr_t   ret_value = SUCCEED;    /* Return value */
     char     file_name[H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 2];
@@ -2275,7 +2275,7 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
     if ( trace_file_name == NULL ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-		    "NULL trace_file_name on entry.")
+            "NULL trace_file_name on entry.")
     }
 
     if ( HDstrlen(trace_file_name) > H5AC__MAX_TRACE_FILE_NAME_LEN ) {
@@ -2286,7 +2286,7 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
     if ( H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "H5C_get_trace_file_ptr() failed.")
+            "H5C_get_trace_file_ptr() failed.")
     }
 
     if ( file_ptr != NULL ) {
@@ -2300,16 +2300,16 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
 
     if ( cache_ptr->aux_ptr == NULL ) {
 
-        sprintf(file_name, "%s", trace_file_name);
+        HDsprintf(file_name, "%s", trace_file_name);
 
     } else {
 
-	if ( aux_ptr->magic != H5AC__H5AC_AUX_T_MAGIC ) {
+    if ( aux_ptr->magic != H5AC__H5AC_AUX_T_MAGIC ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad aux_ptr->magic.")
-	}
+    }
 
-        sprintf(file_name, "%s.%d", trace_file_name, aux_ptr->mpi_rank);
+        HDsprintf(file_name, "%s.%d", trace_file_name, aux_ptr->mpi_rank);
 
     }
 
@@ -2317,20 +2317,20 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
          H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "cooked trace file name too long.")
+            "cooked trace file name too long.")
     }
 
 #else /* H5_HAVE_PARALLEL */
 
-    HDsnprintf(file_name, 
-               (size_t)(H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1), 
+    HDsnprintf(file_name,
+               (size_t)(H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1),
                "%s", trace_file_name);
 
 #endif /* H5_HAVE_PARALLEL */
 
     if ( (file_ptr = HDfopen(file_name, "w")) == NULL ) {
 
-	/* trace file open failed */
+    /* trace file open failed */
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "trace file open failed.")
     }
 
@@ -2339,7 +2339,7 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
     if ( H5C_set_trace_file_ptr(cache_ptr, file_ptr) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "H5C_set_trace_file_ptr() failed.")
+            "H5C_set_trace_file_ptr() failed.")
     }
 
 done:
@@ -2348,17 +2348,17 @@ done:
 
 } /* H5AC_open_trace_file() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_add_candidate()
  *
  * Purpose:     Add the supplied metadata entry address to the candidate
- *		list.  Verify that each entry added does not appear in 
- *		the list prior to its insertion.
+ *        list.  Verify that each entry added does not appear in
+ *        the list prior to its insertion.
  *
- *		This function is intended for used in constructing list
- *		of entried to be flushed during sync points.  It shouldn't
- *		be called anywhere else.
+ *        This function is intended for used in constructing list
+ *        of entried to be flushed during sync points.  It shouldn't
+ *        be called anywhere else.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -2412,7 +2412,7 @@ done:
 } /* H5AC_add_candidate() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*************************************************************************/
 /**************************** Private Functions: *************************/
 /*************************************************************************/
@@ -2422,18 +2422,18 @@ done:
  * Function:    H5AC_broadcast_candidate_list()
  *
  * Purpose:     Broadcast the contents of the process 0 candidate entry
- *		slist.  In passing, also remove all entries from said
- *		list.  As the application of this will be handled by 
- *		the same functions on all processes, construct and 
- *		return a copy of the list in the same format as that
- *		received by the other processes.  Note that if this
- *		copy is returned in *haddr_buf_ptr_ptr, the caller 
- *		must free it.
+ *        slist.  In passing, also remove all entries from said
+ *        list.  As the application of this will be handled by
+ *        the same functions on all processes, construct and
+ *        return a copy of the list in the same format as that
+ *        received by the other processes.  Note that if this
+ *        copy is returned in *haddr_buf_ptr_ptr, the caller
+ *        must free it.
  *
- *		This function must only be called by the process with
- *		MPI_rank 0.
+ *        This function must only be called by the process with
+ *        MPI_rank 0.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -2447,14 +2447,14 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
                               int * num_entries_ptr,
                               haddr_t ** haddr_buf_ptr_ptr)
 {
-    hbool_t		 success = FALSE;
+    hbool_t         success = FALSE;
     H5AC_aux_t         * aux_ptr = NULL;
     haddr_t            * haddr_buf_ptr = NULL;
     MPI_Offset         * MPI_Offset_buf_ptr = NULL;
-    size_t		 buf_size = 0;
+    size_t         buf_size = 0;
     int                  mpi_result;
-    int			 chk_num_entries = 0;
-    int			 num_entries = 0;
+    int             chk_num_entries = 0;
+    int             num_entries = 0;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -2471,7 +2471,7 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
     HDassert( aux_ptr->candidate_slist_ptr != NULL );
     HDassert( H5SL_count(aux_ptr->candidate_slist_ptr) ==
-		    (size_t)(aux_ptr->candidate_slist_len) );
+            (size_t)(aux_ptr->candidate_slist_len) );
     HDassert( num_entries_ptr != NULL );
     HDassert( *num_entries_ptr == 0 );
     HDassert( haddr_buf_ptr_ptr != NULL );
@@ -2487,7 +2487,7 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
 
     if(num_entries > 0) {
         /* convert the candidate list into the format we
-         * are used to receiving from process 0, and also load it 
+         * are used to receiving from process 0, and also load it
          * into a buffer for transmission.
          */
         if(H5AC_copy_candidate_list_to_buffer(cache_ptr, &chk_num_entries,
@@ -2517,7 +2517,7 @@ done:
         MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_xfree((void *)MPI_Offset_buf_ptr);
 
     if(success) {
-        /* Pass the number of entries and the buffer pointer 
+        /* Pass the number of entries and the buffer pointer
          * back to the caller.  Do this so that we can use the same code
          * to apply the candidate list to all the processes.
          */
@@ -2531,20 +2531,20 @@ done:
 } /* H5AC_broadcast_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_broadcast_clean_list()
  *
  * Purpose:     Broadcast the contents of the process 0 cleaned entry
- *		slist.  In passing, also remove all entries from said
- *		list, and also remove any matching entries from the dirtied
- *		slist.
+ *        slist.  In passing, also remove all entries from said
+ *        list, and also remove any matching entries from the dirtied
+ *        slist.
  *
- *		This function must only be called by the process with
- *		MPI_rank 0.
+ *        This function must only be called by the process with
+ *        MPI_rank 0.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -2557,16 +2557,16 @@ static herr_t
 H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    haddr_t		 addr;
-    haddr_t	       * addr_buf_ptr = NULL;
+    haddr_t         addr;
+    haddr_t           * addr_buf_ptr = NULL;
     H5AC_aux_t         * aux_ptr = NULL;
     H5SL_node_t        * slist_node_ptr = NULL;
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
     MPI_Offset         * buf_ptr = NULL;
-    size_t		 buf_size;
+    size_t         buf_size;
     int                  i = 0;
     int                  mpi_result;
-    int			 num_entries = 0;
+    int             num_entries = 0;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2580,7 +2580,7 @@ H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
     HDassert( aux_ptr->mpi_rank == 0 );
     HDassert( aux_ptr->c_slist_ptr != NULL );
     HDassert( H5SL_count(aux_ptr->c_slist_ptr) ==
-		    (size_t)(aux_ptr->c_slist_len) );
+            (size_t)(aux_ptr->c_slist_len) );
 
 
     /* First broadcast the number of entries in the list so that the
@@ -2718,19 +2718,19 @@ done:
 } /* H5AC_broadcast_clean_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_check_if_write_permitted
  *
  * Purpose:     Determine if a write is permitted under the current
- *		circumstances, and set *write_permitted_ptr accordingly.
- *		As a general rule it is, but when we are running in parallel
- *		mode with collective I/O, we must ensure that a read cannot
- *		cause a write.
+ *        circumstances, and set *write_permitted_ptr accordingly.
+ *        As a general rule it is, but when we are running in parallel
+ *        mode with collective I/O, we must ensure that a read cannot
+ *        cause a write.
  *
- *		In the event of failure, the value of *write_permitted_ptr
- *		is undefined.
+ *        In the event of failure, the value of *write_permitted_ptr
+ *        is undefined.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -2750,10 +2750,10 @@ H5AC_check_if_write_permitted(const H5F_t H5_ATTR_UNUSED * f,
                               hbool_t * write_permitted_ptr)
 #endif /* H5_HAVE_PARALLEL */
 {
-    hbool_t		write_permitted = TRUE;
-    herr_t		ret_value = SUCCEED;      /* Return value */
+    hbool_t        write_permitted = TRUE;
+    herr_t        ret_value = SUCCEED;      /* Return value */
 #ifdef H5_HAVE_PARALLEL
-    H5AC_aux_t *	aux_ptr = NULL;
+    H5AC_aux_t *    aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
 
@@ -2774,12 +2774,12 @@ H5AC_check_if_write_permitted(const H5F_t H5_ATTR_UNUSED * f,
              ( aux_ptr->metadata_write_strategy ==
                H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED ) ) {
 
-	    write_permitted = aux_ptr->write_permitted;
+        write_permitted = aux_ptr->write_permitted;
 
         } else {
 
-	    write_permitted = FALSE;
-	}
+        write_permitted = FALSE;
+    }
     }
 #endif /* H5_HAVE_PARALLEL */
 
@@ -2791,18 +2791,18 @@ done:
 
 } /* H5AC_check_if_write_permitted() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_construct_candidate_list()
  *
- * Purpose:     In the parallel case when the metadata_write_strategy is 
- *		H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED, process 0 uses
- *		this function to construct the list of cache entries to 
- *		be flushed.  This list is then propagated to the other 
- *		caches, and then flushed in a distributed fashion.
+ * Purpose:     In the parallel case when the metadata_write_strategy is
+ *        H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED, process 0 uses
+ *        this function to construct the list of cache entries to
+ *        be flushed.  This list is then propagated to the other
+ *        caches, and then flushed in a distributed fashion.
  *
- *		The sync_point_op parameter is used to determine the extent
- *		of the flush.
+ *        The sync_point_op parameter is used to determine the extent
+ *        of the flush.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -2838,19 +2838,19 @@ H5AC_construct_candidate_list(H5AC_t * cache_ptr,
               ( sync_point_op == H5AC_SYNC_POINT_OP__FLUSH_CACHE ) );
 
     switch(sync_point_op) {
-	case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
+    case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
             if(H5C_construct_candidate_list__min_clean((H5C_t *)cache_ptr) < 0)
-		HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_construct_candidate_list__min_clean() failed.")
-	    break;
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_construct_candidate_list__min_clean() failed.")
+        break;
 
-	case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
+    case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
             if(H5C_construct_candidate_list__clean_cache((H5C_t *)cache_ptr) < 0)
-		HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_construct_candidate_list__clean_cache() failed.")
-	    break;
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_construct_candidate_list__clean_cache() failed.")
+        break;
 
         default:
-	    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown sync point operation.")
-	    break;
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown sync point operation.")
+        break;
     } /* end switch */
 
 done:
@@ -2858,33 +2858,33 @@ done:
 } /* H5AC_construct_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_copy_candidate_list_to_buffer
  *
  * Purpose:     Allocate buffer(s) and copy the contents of the candidate
- *		entry slist into it (them).  In passing, remove all 
- *		entries from the candidate slist.  Note that the 
- *		candidate slist must not be empty.
+ *        entry slist into it (them).  In passing, remove all
+ *        entries from the candidate slist.  Note that the
+ *        candidate slist must not be empty.
  *
- *		If MPI_Offset_buf_ptr_ptr is not NULL, allocate a buffer
- *		of MPI_Offset, copy the contents of the candidate
- *		entry list into it with the appropriate conversions, 
- *		and return the base address of the buffer in 
- *		*MPI_Offset_buf_ptr.  Note that this is the buffer
- *		used by process 0 to transmit the list of entries to 
- *		be flushed to all other processes (in this file group).
+ *        If MPI_Offset_buf_ptr_ptr is not NULL, allocate a buffer
+ *        of MPI_Offset, copy the contents of the candidate
+ *        entry list into it with the appropriate conversions,
+ *        and return the base address of the buffer in
+ *        *MPI_Offset_buf_ptr.  Note that this is the buffer
+ *        used by process 0 to transmit the list of entries to
+ *        be flushed to all other processes (in this file group).
  *
- *		Similarly, allocate a buffer of haddr_t, load the contents
- *		of the candidate list into this buffer, and return its 
- *		base address in *haddr_buf_ptr_ptr.  Note that this 
- *		latter buffer is constructed unconditionally.  
+ *        Similarly, allocate a buffer of haddr_t, load the contents
+ *        of the candidate list into this buffer, and return its
+ *        base address in *haddr_buf_ptr_ptr.  Note that this
+ *        latter buffer is constructed unconditionally.
  *
- *		In passing, also remove all entries from the candidate
- *		entry slist.
+ *        In passing, also remove all entries from the candidate
+ *        entry slist.
  *
- * Return:	Return SUCCEED on success, and FAIL on failure.
+ * Return:    Return SUCCEED on success, and FAIL on failure.
  *
  * Programmer:  John Mainzer, 4/19/10
  *
@@ -2899,16 +2899,16 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
                                    MPI_Offset ** MPI_Offset_buf_ptr_ptr)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    hbool_t		 success = FALSE;
-    haddr_t		 addr;
+    hbool_t         success = FALSE;
+    haddr_t         addr;
     H5AC_aux_t         * aux_ptr = NULL;
     H5SL_node_t        * slist_node_ptr = NULL;
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
     MPI_Offset         * MPI_Offset_buf_ptr = NULL;
     haddr_t            * haddr_buf_ptr = NULL;
-    size_t		 buf_size;
+    size_t         buf_size;
     int                  i = 0;
-    int			 num_entries = 0;
+    int             num_entries = 0;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2923,7 +2923,7 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
     HDassert( aux_ptr->candidate_slist_ptr != NULL );
     HDassert( H5SL_count(aux_ptr->candidate_slist_ptr) ==
-		    (size_t)(aux_ptr->candidate_slist_len) );
+            (size_t)(aux_ptr->candidate_slist_len) );
     HDassert( aux_ptr->candidate_slist_len > 0 );
     HDassert( num_entries_ptr != NULL );
     HDassert( *num_entries_ptr == 0 );
@@ -2932,8 +2932,8 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
 
     num_entries = aux_ptr->candidate_slist_len;
 
-    /* allocate a buffer(s) to store the list of candidate entry 
-     * base addresses in 
+    /* allocate a buffer(s) to store the list of candidate entry
+     * base addresses in
      */
     if(MPI_Offset_buf_ptr_ptr != NULL) {
         HDassert( MPI_Offset_buf_size_ptr != NULL );
@@ -2983,7 +2983,7 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
 
 done:
     if(success) {
-        /* Pass the number of entries and the buffer pointer 
+        /* Pass the number of entries and the buffer pointer
          * back to the caller.
          */
         *num_entries_ptr = num_entries;
@@ -2991,8 +2991,8 @@ done:
 
         if(MPI_Offset_buf_ptr_ptr != NULL) {
             HDassert( MPI_Offset_buf_ptr != NULL);
-	    *MPI_Offset_buf_size_ptr = buf_size;
-	    *MPI_Offset_buf_ptr_ptr = MPI_Offset_buf_ptr;
+        *MPI_Offset_buf_size_ptr = buf_size;
+        *MPI_Offset_buf_ptr_ptr = MPI_Offset_buf_ptr;
         } /* end if */
     } /* end if */
     else {
@@ -3006,17 +3006,17 @@ done:
 } /* H5AC_copy_candidate_list_to_buffer() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_ext_config_2_int_config()
  *
  * Purpose:     Utility function to translate an instance of
- *		H5AC_cache_config_t to an instance of H5C_auto_size_ctl_t.
+ *        H5AC_cache_config_t to an instance of H5C_auto_size_ctl_t.
  *
- *		Places translation in *int_conf_ptr and returns SUCCEED
- *		if successful.  Returns FAIL on failure.
+ *        Places translation in *int_conf_ptr and returns SUCCEED
+ *        if successful.  Returns FAIL on failure.
  *
- *		Does only minimal sanity checking.
+ *        Does only minimal sanity checking.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -3080,18 +3080,18 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5AC_ext_config_2_int_config() */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_deleted_entry()
  *
  * Purpose:     Log an entry for which H5C__DELETED_FLAG has been set.
  *
- *		If mpi_rank is 0, we must make sure that the entry doesn't
- *		appear in the cleaned or dirty entry lists.  Otherwise,
- *		we have nothing to do.
+ *        If mpi_rank is 0, we must make sure that the entry doesn't
+ *        appear in the cleaned or dirty entry lists.  Otherwise,
+ *        we have nothing to do.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -3167,23 +3167,23 @@ done:
 } /* H5AC_log_deleted_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_dirtied_entry()
  *
  * Purpose:     Update the dirty_bytes count for a newly dirtied entry.
  *
- *		If mpi_rank isnt 0, this simply means adding the size
- *		of the entries to the dirty_bytes count.
+ *        If mpi_rank isnt 0, this simply means adding the size
+ *        of the entries to the dirty_bytes count.
  *
- *		If mpi_rank is 0, we must first check to see if the entry
- *		appears in the dirty entries slist.  If it is, do nothing.
- *		If it isn't, add the size to th dirty_bytes count, add the
- *		entry to the dirty entries slist, and remove it from the
- *		cleaned list (if it is present there).
+ *        If mpi_rank is 0, we must first check to see if the entry
+ *        appears in the dirty entries slist.  If it is, do nothing.
+ *        If it isn't, add the size to th dirty_bytes count, add the
+ *        entry to the dirty entries slist, and remove it from the
+ *        cleaned list (if it is present there).
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -3246,8 +3246,8 @@ H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
             aux_ptr->d_slist_len += 1;
             aux_ptr->dirty_bytes += entry_ptr->size;
 #if H5AC_DEBUG_DIRTY_BYTES_CREATION
-	    aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
-	    aux_ptr->unprotect_dirty_bytes_updates += 1;
+        aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
+        aux_ptr->unprotect_dirty_bytes_updates += 1;
 #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
         }
 
@@ -3286,21 +3286,21 @@ done:
 } /* H5AC_log_dirtied_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_flushed_entry()
  *
  * Purpose:     Update the clean entry slist for the flush of an entry --
- *		specifically, if the entry has been cleared, remove it
- * 		from both the cleaned and dirtied lists if it is present.
- *		Otherwise, if the entry was dirty, insert the indicated
- *		entry address in the clean slist if it isn't there already.
+ *        specifically, if the entry has been cleared, remove it
+ *         from both the cleaned and dirtied lists if it is present.
+ *        Otherwise, if the entry was dirty, insert the indicated
+ *        entry address in the clean slist if it isn't there already.
  *
- *		This function is only used in PHDF5, and should only
- *		be called for the process with mpi rank 0.
+ *        This function is only used in PHDF5, and should only
+ *        be called for the process with mpi rank 0.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -3317,7 +3317,7 @@ H5AC_log_flushed_entry(H5C_t * cache_ptr,
                        int H5_ATTR_UNUSED type_id)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    hbool_t		 cleared;
+    hbool_t         cleared;
     H5AC_aux_t         * aux_ptr;
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
 
@@ -3343,7 +3343,7 @@ H5AC_log_flushed_entry(H5C_t * cache_ptr,
          */
 
         if ( (slist_entry_ptr = (H5AC_slist_entry_t *)
-				H5SL_search(aux_ptr->c_slist_ptr,
+                H5SL_search(aux_ptr->c_slist_ptr,
                                             (void *)(&addr))) != NULL ) {
 
             HDassert( slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
@@ -3417,20 +3417,20 @@ done:
 } /* H5AC_log_flushed_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_inserted_entry()
  *
  * Purpose:     Update the dirty_bytes count for a newly inserted entry.
  *
- *		If mpi_rank isnt 0, this simply means adding the size
- *		of the entry to the dirty_bytes count.
+ *        If mpi_rank isnt 0, this simply means adding the size
+ *        of the entry to the dirty_bytes count.
  *
- *		If mpi_rank is 0, we must also add the entry to the
- *		dirty entries slist.
+ *        If mpi_rank is 0, we must also add the entry to the
+ *        dirty entries slist.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -3497,46 +3497,46 @@ done:
 } /* H5AC_log_inserted_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_log_moved_entry()
  *
  * Purpose:     Update the dirty_bytes count for a moved entry.
  *
- *		WARNING
+ *        WARNING
  *
- *		At present, the way that the move call is used ensures
- *		that the moved entry is present in all caches by
- *		moving in a collective operation and immediately after
- *		unprotecting the target entry.
+ *        At present, the way that the move call is used ensures
+ *        that the moved entry is present in all caches by
+ *        moving in a collective operation and immediately after
+ *        unprotecting the target entry.
  *
- *		This function uses this invarient, and will cause arcane
- *		failures if it is not met.  If maintaining this invarient
- *		becomes impossible, we will have to rework this function
- *		extensively, and likely include a bit of IPC for
- *		synchronization.  A better option might be to subsume
- *		move in the unprotect operation.
+ *        This function uses this invarient, and will cause arcane
+ *        failures if it is not met.  If maintaining this invarient
+ *        becomes impossible, we will have to rework this function
+ *        extensively, and likely include a bit of IPC for
+ *        synchronization.  A better option might be to subsume
+ *        move in the unprotect operation.
  *
- *		Given that the target entry is in all caches, the function
- *		proceeds as follows:
+ *        Given that the target entry is in all caches, the function
+ *        proceeds as follows:
  *
- *		For processes with mpi rank other 0, it simply checks to
- *		see if the entry was dirty prior to the move, and adds
- *		the entries size to the dirty bytes count.
+ *        For processes with mpi rank other 0, it simply checks to
+ *        see if the entry was dirty prior to the move, and adds
+ *        the entries size to the dirty bytes count.
  *
- *		In the process with mpi rank 0, the function first checks
- *		to see if the entry was dirty prior to the move.  If it
- *		was, and if the entry doesn't appear in the dirtied list
- *		under its old address, it adds the entry's size to the
- *		dirty bytes count.
+ *        In the process with mpi rank 0, the function first checks
+ *        to see if the entry was dirty prior to the move.  If it
+ *        was, and if the entry doesn't appear in the dirtied list
+ *        under its old address, it adds the entry's size to the
+ *        dirty bytes count.
  *
- *		The rank 0 process then removes any references to the
- *		entry under its old address from the cleands and dirtied
- *		lists, and inserts an entry in the dirtied list under the
- *		new address.
+ *        The rank 0 process then removes any references to the
+ *        entry under its old address from the cleands and dirtied
+ *        lists, and inserts an entry in the dirtied list under the
+ *        new address.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -3551,8 +3551,8 @@ H5AC_log_moved_entry(const H5F_t *f,
                        haddr_t new_addr)
 {
     H5AC_t *             cache_ptr;
-    hbool_t		 entry_in_cache;
-    hbool_t		 entry_dirty;
+    hbool_t         entry_in_cache;
+    hbool_t         entry_dirty;
     size_t               entry_size;
     H5AC_aux_t         * aux_ptr = NULL;
     H5AC_slist_entry_t * slist_entry_ptr = NULL;
@@ -3594,7 +3594,7 @@ H5AC_log_moved_entry(const H5F_t *f,
          * address, remove it.
          */
         if ( (slist_entry_ptr = (H5AC_slist_entry_t *)
-	      H5SL_search(aux_ptr->c_slist_ptr, (void *)(&old_addr))) != NULL ) {
+        H5SL_search(aux_ptr->c_slist_ptr, (void *)(&old_addr))) != NULL ) {
 
             HDassert( slist_entry_ptr->magic ==
                           H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
@@ -3619,7 +3619,7 @@ H5AC_log_moved_entry(const H5F_t *f,
          * address, remove it, but don't free it. Set addr to new_addr.
          */
         if ( (slist_entry_ptr = (H5AC_slist_entry_t *)
-	      H5SL_search(aux_ptr->d_slist_ptr, (void *)(&old_addr))) != NULL ) {
+        H5SL_search(aux_ptr->d_slist_ptr, (void *)(&old_addr))) != NULL ) {
 
             HDassert( slist_entry_ptr->magic ==
                       H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
@@ -3699,92 +3699,92 @@ done:
 } /* H5AC_log_moved_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_propagate_and_apply_candidate_list
  *
- * Purpose:     Prior to the addition of support for multiple metadata 
- *		write strategies, in PHDF5, only the metadata cache with 
- *		mpi rank 0 was allowed to write to file.  All other 
- *		metadata caches on processes with rank greater than 0 
- *		were required to retain dirty entries until they were 
- *		notified that the entry was clean.
- *
- *		This constraint is relaxed with the distributed 
- *		metadata write strategy, in which a list of candidate
- *		metadata cache entries is constructed by the process 0
- *		cache and then distributed to the caches of all the other
- *		processes.  Once the listed is distributed, many (if not 
- *		all) processes writing writing a unique subset of the 
- *		entries, and marking the remainder clean.  The subsets 
- *		are chosen so that each entry in the list of candidates 
- *		is written by exactly one cache, and all entries are 
- *		marked as being clean in all caches.
- *
- *		While the list of candidate cache entries is prepared 
- *		elsewhere, this function is the main routine for distributing
- *		and applying the list.  It must be run simultaniously on 
- *		all processes that have the relevant file open.  To ensure
- *		proper synchronization, there is a barrier at the beginning 
- *		of this function.
- *
- *		At present, this function is called under one of two 
- *		circumstances:
- *
- *		1) Dirty byte creation exceeds some user specified value.
- *
- *		   While metadata reads may occur independently, all
- *		   operations writing metadata must be collective.  Thus
- *		   all metadata caches see the same sequence of operations,
+ * Purpose:     Prior to the addition of support for multiple metadata
+ *        write strategies, in PHDF5, only the metadata cache with
+ *        mpi rank 0 was allowed to write to file.  All other
+ *        metadata caches on processes with rank greater than 0
+ *        were required to retain dirty entries until they were
+ *        notified that the entry was clean.
+ *
+ *        This constraint is relaxed with the distributed
+ *        metadata write strategy, in which a list of candidate
+ *        metadata cache entries is constructed by the process 0
+ *        cache and then distributed to the caches of all the other
+ *        processes.  Once the listed is distributed, many (if not
+ *        all) processes writing writing a unique subset of the
+ *        entries, and marking the remainder clean.  The subsets
+ *        are chosen so that each entry in the list of candidates
+ *        is written by exactly one cache, and all entries are
+ *        marked as being clean in all caches.
+ *
+ *        While the list of candidate cache entries is prepared
+ *        elsewhere, this function is the main routine for distributing
+ *        and applying the list.  It must be run simultaniously on
+ *        all processes that have the relevant file open.  To ensure
+ *        proper synchronization, there is a barrier at the beginning
+ *        of this function.
+ *
+ *        At present, this function is called under one of two
+ *        circumstances:
+ *
+ *        1) Dirty byte creation exceeds some user specified value.
+ *
+ *           While metadata reads may occur independently, all
+ *           operations writing metadata must be collective.  Thus
+ *           all metadata caches see the same sequence of operations,
  *                 and therefore the same dirty data creation.
  *
- *		   This fact is used to synchronize the caches for purposes
- *                 of propagating the list of candidate entries, by simply 
- *		   calling this function from all caches whenever some user 
- *		   specified threshold on dirty data is exceeded.  (the 
- *		   process 0 cache creates the candidate list just before 
- *		   calling this function).
+ *           This fact is used to synchronize the caches for purposes
+ *                 of propagating the list of candidate entries, by simply
+ *           calling this function from all caches whenever some user
+ *           specified threshold on dirty data is exceeded.  (the
+ *           process 0 cache creates the candidate list just before
+ *           calling this function).
  *
- *		2) Under direct user control -- this operation must be
- *		   collective.
+ *        2) Under direct user control -- this operation must be
+ *           collective.
  *
  *              The operations to be managed by this function are as
- * 		follows:
+ *         follows:
  *
- *		All processes:
+ *        All processes:
  *
- *		1) Participate in an opening barrier.
+ *        1) Participate in an opening barrier.
  *
- *		For the process with mpi rank 0:
+ *        For the process with mpi rank 0:
  *
- *		1) Load the contents of the candidate list 
- *		   (candidate_slist_ptr) into a buffer, and broadcast that
- *		   buffer to all the other caches.  Clear the candidate
- *		   list in passing.
+ *        1) Load the contents of the candidate list
+ *           (candidate_slist_ptr) into a buffer, and broadcast that
+ *           buffer to all the other caches.  Clear the candidate
+ *           list in passing.
  *
- *		If there is a positive number of candidates, proceed with 
- *		the following:
+ *        If there is a positive number of candidates, proceed with
+ *        the following:
  *
- *		2) Apply the candidate entry list.
+ *        2) Apply the candidate entry list.
  *
- *		3) Particpate in a closing barrier.
+ *        3) Particpate in a closing barrier.
  *
- *		4) Remove from the dirty list (d_slist_ptr) and from the 
- *		   flushed and still clean entries list (c_slist_ptr),  
+ *        4) Remove from the dirty list (d_slist_ptr) and from the
+ *           flushed and still clean entries list (c_slist_ptr),
  *                 all addresses that appeared in the candidate list, as
- *		   these entries are now clean.
+ *           these entries are now clean.
  *
  *
- *		For all processes with mpi rank greater than 0:
+ *        For all processes with mpi rank greater than 0:
  *
- *		1) Receive the candidate entry list broadcast
+ *        1) Receive the candidate entry list broadcast
  *
- *		If there is a positive number of candidates, proceed with 
- *		the following:
+ *        If there is a positive number of candidates, proceed with
+ *        the following:
  *
- *		2) Apply the candidate entry list.
+ *        2) Apply the candidate entry list.
  *
- *		3) Particpate in a closing barrier.
+ *        3) Particpate in a closing barrier.
  *
  * Return:      Success:        non-negative
  *
@@ -3801,8 +3801,8 @@ H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
                                         hid_t    dxpl_id,
                                         H5AC_t * cache_ptr)
 {
-    int		         mpi_code;
-    int	                 num_candidates = 0;
+    int                 mpi_code;
+    int                     num_candidates = 0;
     haddr_t            * candidates_list_ptr = NULL;
     H5AC_aux_t         * aux_ptr;
     herr_t               ret_value = SUCCEED;   /* Return value */
@@ -3816,7 +3816,7 @@ H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
 
     HDassert( aux_ptr != NULL );
     HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy == 
+    HDassert( aux_ptr->metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
 
     /* to prevent "messages from the future" we must synchronize all
@@ -3837,10 +3837,10 @@ H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
     } /* end else */
 
     if(num_candidates > 0) {
-        herr_t	         result;
+        herr_t             result;
 
-        /* all processes apply the candidate list.  
-         * H5C_apply_candidate_list() handles the details of 
+        /* all processes apply the candidate list.
+         * H5C_apply_candidate_list() handles the details of
          * distributing the writes across the processes.
          */
 
@@ -3860,8 +3860,8 @@ H5AC_propagate_and_apply_candidate_list(H5F_t  * f,
         if(result < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't apply candidate list.")
 
-	if(aux_ptr->write_done != NULL)
-	    (aux_ptr->write_done)();
+    if(aux_ptr->write_done != NULL)
+        (aux_ptr->write_done)();
 
         /* to prevent "messages from the past" we must synchronize all
          * processes again before we go on.
@@ -3890,68 +3890,68 @@ done:
 } /* H5AC_propagate_and_apply_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_propagate_flushed_and_still_clean_entries_list
  *
  * Purpose:     In PHDF5, if the process 0 only metadata write strategy
- *		is selected, only the metadata cache with mpi rank 0 is 
- *		allowed to write to file.  All other metadata caches on 
- *		processes with rank greater than 0 must retain dirty 
- *		entries until they are notified that the entry is now 
- *		clean.
+ *        is selected, only the metadata cache with mpi rank 0 is
+ *        allowed to write to file.  All other metadata caches on
+ *        processes with rank greater than 0 must retain dirty
+ *        entries until they are notified that the entry is now
+ *        clean.
  *
- *		This function is the main routine for handling this 
- *		notification proceedure.  It must be called 
- *		simultaniously on all processes that have the relevant 
- *		file open.  To this end, it is called only during a 
- *		sync point, with a barrier prior to the call.
+ *        This function is the main routine for handling this
+ *        notification proceedure.  It must be called
+ *        simultaniously on all processes that have the relevant
+ *        file open.  To this end, it is called only during a
+ *        sync point, with a barrier prior to the call.
  *
- *		Note that any metadata entry writes by process 0 will
- *		occur after the barrier and just before this call.
+ *        Note that any metadata entry writes by process 0 will
+ *        occur after the barrier and just before this call.
  *
- *		Typicaly, calls to this function will be triggered in
- *		one of two ways:
+ *        Typicaly, calls to this function will be triggered in
+ *        one of two ways:
  *
- *		1) Dirty byte creation exceeds some user specified value.
+ *        1) Dirty byte creation exceeds some user specified value.
  *
- *		   While metadata reads may occur independently, all
- *		   operations writing metadata must be collective.  Thus
- *		   all metadata caches see the same sequence of operations,
+ *           While metadata reads may occur independently, all
+ *           operations writing metadata must be collective.  Thus
+ *           all metadata caches see the same sequence of operations,
  *                 and therefore the same dirty data creation.
  *
- *		   This fact is used to synchronize the caches for purposes
+ *           This fact is used to synchronize the caches for purposes
  *                 of propagating the list of flushed and still clean
- *		   entries, by simply calling this function from all
- *		   caches whenever some user specified threshold on dirty
- *		   data is exceeded.
+ *           entries, by simply calling this function from all
+ *           caches whenever some user specified threshold on dirty
+ *           data is exceeded.
  *
- *		2) Under direct user control -- this operation must be
- *		   collective.
+ *        2) Under direct user control -- this operation must be
+ *           collective.
  *
  *              The operations to be managed by this function are as
- * 		follows:
+ *         follows:
  *
- *		For the process with mpi rank 0:
+ *        For the process with mpi rank 0:
  *
- *		1) Load the contents of the flushed and still clean entries
- *		   list (c_slist_ptr) into a buffer, and broadcast that
- *		   buffer to all the other caches.
+ *        1) Load the contents of the flushed and still clean entries
+ *           list (c_slist_ptr) into a buffer, and broadcast that
+ *           buffer to all the other caches.
  *
- *		2) Clear the flushed and still clean entries list
+ *        2) Clear the flushed and still clean entries list
  *                 (c_slist_ptr).
  *
  *
- *		For all processes with mpi rank greater than 0:
+ *        For all processes with mpi rank greater than 0:
  *
- *		1) Receive the flushed and still clean entries list broadcast
+ *        1) Receive the flushed and still clean entries list broadcast
  *
- *		2) Mark the specified entries as clean.
+ *        2) Mark the specified entries as clean.
  *
  *
- *		For all processes:
+ *        For all processes:
  *
- *		1) Reset the dirtied bytes count to 0.
+ *        1) Reset the dirtied bytes count to 0.
  *
  * Return:      Success:        non-negative
  *
@@ -3969,7 +3969,7 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
                                                     H5AC_t * cache_ptr)
 {
     H5AC_aux_t * aux_ptr;
-    herr_t	 ret_value = SUCCEED;   /* Return value */
+    herr_t     ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -3980,7 +3980,7 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
 
     HDassert(aux_ptr != NULL);
     HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
-    HDassert(aux_ptr->metadata_write_strategy == 
+    HDassert(aux_ptr->metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY);
 
     if(aux_ptr->mpi_rank == 0) {
@@ -3998,18 +3998,18 @@ done:
 } /* H5AC_propagate_flushed_and_still_clean_entries_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_receive_and_apply_clean_list()
  *
  * Purpose:     Receive the list of cleaned entries from process 0,
- *		and mark the specified entries as clean.
+ *        and mark the specified entries as clean.
  *
- *		This function must only be called by the process with
- *		MPI_rank greater than 0.
+ *        This function must only be called by the process with
+ *        MPI_rank greater than 0.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -4025,10 +4025,10 @@ H5AC_receive_and_apply_clean_list(H5F_t  * f,
                                   H5AC_t * cache_ptr)
 {
     H5AC_aux_t         * aux_ptr;
-    haddr_t	       * haddr_buf_ptr = NULL;
+    haddr_t           * haddr_buf_ptr = NULL;
     MPI_Offset         * MPI_Offset_buf_ptr = NULL;
     int                  mpi_result;
-    int			 num_entries = 0;
+    int             num_entries = 0;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -4107,20 +4107,20 @@ done:
 } /* H5AC_receive_and_apply_clean_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5AC_receive_candidate_list()
  *
  * Purpose:     Receive the list of candidate entries from process 0,
- *		and return it in a buffer pointed to by *haddr_buf_ptr_ptr.
- *		Note that the caller must free this buffer if it is 
- *		returned.
+ *        and return it in a buffer pointed to by *haddr_buf_ptr_ptr.
+ *        Note that the caller must free this buffer if it is
+ *        returned.
  *
- *		This function must only be called by the process with
- *		MPI_rank greater than 0.
+ *        This function must only be called by the process with
+ *        MPI_rank greater than 0.
  *
- *		Return SUCCEED on success, and FAIL on failure.
+ *        Return SUCCEED on success, and FAIL on failure.
  *
  * Return:      Non-negative on success/Negative on failure.
  *
@@ -4134,12 +4134,12 @@ H5AC_receive_candidate_list(H5AC_t * cache_ptr,
                             int * num_entries_ptr,
                             haddr_t ** haddr_buf_ptr_ptr)
 {
-    hbool_t		 success = FALSE;
+    hbool_t         success = FALSE;
     H5AC_aux_t         * aux_ptr;
-    haddr_t	       * haddr_buf_ptr = NULL;
+    haddr_t           * haddr_buf_ptr = NULL;
     MPI_Offset         * MPI_Offset_buf_ptr = NULL;
     int                  mpi_result;
-    int			 num_entries;
+    int             num_entries;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -4152,7 +4152,7 @@ H5AC_receive_candidate_list(H5AC_t * cache_ptr,
     HDassert( aux_ptr != NULL );
     HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
     HDassert( aux_ptr->mpi_rank != 0 );
-    HDassert( aux_ptr-> metadata_write_strategy == 
+    HDassert( aux_ptr-> metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
 
     HDassert( num_entries_ptr != NULL );
@@ -4210,7 +4210,7 @@ done:
         MPI_Offset_buf_ptr = (MPI_Offset *)H5MM_xfree((void *)MPI_Offset_buf_ptr);
 
     if(success) {
-        /* finally, pass the number of entries and the buffer pointer 
+        /* finally, pass the number of entries and the buffer pointer
          * back to the caller.  Do this so that we can use the same code
          * to apply the candidate list to all the processes.
          */
@@ -4226,46 +4226,46 @@ done:
 } /* H5AC_receive_candidate_list() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__dist_md_write__flush
  *
  * Purpose:     Routine for handling the details of running a sync point
- *		that is triggered by a flush -- which in turn must have been
- *		triggered by either a flush API call or a file close --
- *		when the distributed metadata write strategy is selected.  
- *
- *		Upon entry, each process generates it own candidate list, 
- *              being a sorted list of all dirty metadata entries currently 
- *		in the metadata cache.  Note that this list must be idendical 
- *		across all processes, as all processes see the same stream 
- *		of dirty metadata coming in, and use the same lists of 
- *		candidate entries at each sync point.  (At first glance, this 
- *		argument sounds circular, but think of it in the sense of
- *		a recursive proof).
- *
- *		If this this list is empty, we are done, and the function 
- *		returns
- *
- *		Otherwise, after the sorted list dirty metadata entries is 
- *		constructed, each process uses the same algorithm to assign 
- *		each entry on the candidate list to exactly one process for 
- *		flushing.
- *
- *		At this point, all processes participate in a barrier to
- *		avoid messages from the past/future bugs.
- *
- *		Each process then flushes the entries assigned to it, and 
- *		marks all other entries on the candidate list as clean.
- *
- *		Finally, all processes participate in a second barrier to 
- *		avoid messages from the past/future bugs.
- *
- *		At the end of this process, process 0 and only process 0
- *		must tidy up its lists of dirtied and cleaned entries.   
- *		These lists are not used in the distributed metadata write
- *		strategy, but they must be maintained should we shift 
- *		to a strategy that uses them.
+ *        that is triggered by a flush -- which in turn must have been
+ *        triggered by either a flush API call or a file close --
+ *        when the distributed metadata write strategy is selected.
+ *
+ *        Upon entry, each process generates it own candidate list,
+ *              being a sorted list of all dirty metadata entries currently
+ *        in the metadata cache.  Note that this list must be idendical
+ *        across all processes, as all processes see the same stream
+ *        of dirty metadata coming in, and use the same lists of
+ *        candidate entries at each sync point.  (At first glance, this
+ *        argument sounds circular, but think of it in the sense of
+ *        a recursive proof).
+ *
+ *        If this this list is empty, we are done, and the function
+ *        returns
+ *
+ *        Otherwise, after the sorted list dirty metadata entries is
+ *        constructed, each process uses the same algorithm to assign
+ *        each entry on the candidate list to exactly one process for
+ *        flushing.
+ *
+ *        At this point, all processes participate in a barrier to
+ *        avoid messages from the past/future bugs.
+ *
+ *        Each process then flushes the entries assigned to it, and
+ *        marks all other entries on the candidate list as clean.
+ *
+ *        Finally, all processes participate in a second barrier to
+ *        avoid messages from the past/future bugs.
+ *
+ *        At the end of this process, process 0 and only process 0
+ *        must tidy up its lists of dirtied and cleaned entries.
+ *        These lists are not used in the distributed metadata write
+ *        strategy, but they must be maintained should we shift
+ *        to a strategy that uses them.
  *
  * Return:      Success:        non-negative
  *
@@ -4278,15 +4278,15 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__dist_md_write__flush(H5F_t *f, 
-                               hid_t dxpl_id, 
+H5AC_rsp__dist_md_write__flush(H5F_t *f,
+                               hid_t dxpl_id,
                                H5AC_t * cache_ptr)
 {
-    int		 mpi_code;
+    int         mpi_code;
     int          num_entries = 0;
     haddr_t    * haddr_buf_ptr = NULL;
     H5AC_aux_t * aux_ptr;
-    herr_t	 ret_value = SUCCEED;   /* Return value */
+    herr_t     ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -4300,17 +4300,17 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f,
 
     HDassert( aux_ptr != NULL );
     HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy == 
+    HDassert( aux_ptr->metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
 
-    /* first construct the candidate list -- initially, this will be in the 
+    /* first construct the candidate list -- initially, this will be in the
      * form of a skip list.  We will convert it later.
      */
     if(H5C_construct_candidate_list__clean_cache(cache_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Can't construct candidate list.")
 
     if(aux_ptr->candidate_slist_len > 0) {
-        herr_t	 result;
+        herr_t     result;
 
         /* convert the candidate list into the format we
          * are used to receiving from process 0.
@@ -4340,7 +4340,7 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f,
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't apply candidate list.")
 
         /* this code exists primarily for the test bed -- it allows us to
-         * enforce posix semantics on the server that pretends to be a 
+         * enforce posix semantics on the server that pretends to be a
          * file system in our parallel tests.
          */
         if(aux_ptr->write_done != NULL)
@@ -4350,7 +4350,7 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f,
         if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed 1", mpi_code)
 
-	/* if this is process zero, tidy up the dirtied,
+    /* if this is process zero, tidy up the dirtied,
          * and flushed and still clean lists.
          */
         if(aux_ptr->mpi_rank == 0) {
@@ -4374,51 +4374,51 @@ done:
 } /* H5AC_rsp__dist_md_write__flush() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__dist_md_write__flush_to_min_clean
  *
  * Purpose:     Routine for handling the details of running a sync point
- *		triggered by the accumulation of dirty metadata (as 
- *		opposed to a flush call to the API) when the distributed
- *		metadata write strategy is selected.
+ *        triggered by the accumulation of dirty metadata (as
+ *        opposed to a flush call to the API) when the distributed
+ *        metadata write strategy is selected.
  *
- *		After invocation and initial sanity checking this function
- *		first checks to see if evictions are enabled -- if they 
- *		are not, the function does nothing and returns.
+ *        After invocation and initial sanity checking this function
+ *        first checks to see if evictions are enabled -- if they
+ *        are not, the function does nothing and returns.
  *
- *		Otherwise, process zero constructs a list of entries to 
- *		be flushed in order to bring the process zero cache back
- *		within its min clean requirement.  Note that this list 
- *		(the candidate list) may be empty.
+ *        Otherwise, process zero constructs a list of entries to
+ *        be flushed in order to bring the process zero cache back
+ *        within its min clean requirement.  Note that this list
+ *        (the candidate list) may be empty.
  *
  *              Then, all processes participate in a barrier.
  *
- *		After the barrier, process 0 broadcasts the number of 
- *		entries in the candidate list prepared above, and all 
- *		other processes receive this number.
+ *        After the barrier, process 0 broadcasts the number of
+ *        entries in the candidate list prepared above, and all
+ *        other processes receive this number.
  *
- *		If this number is zero, we are done, and the function
- *		returns without further action.
+ *        If this number is zero, we are done, and the function
+ *        returns without further action.
  *
- *		Otherwise, process 0 broadcasts the sorted list of 
- *		candidate entries, and all other processes receive it.
+ *        Otherwise, process 0 broadcasts the sorted list of
+ *        candidate entries, and all other processes receive it.
  *
- *		Then, each process uses the same algorithm to assign 
- *		each entry on the candidate list to exactly one process 
- *		for flushing.
+ *        Then, each process uses the same algorithm to assign
+ *        each entry on the candidate list to exactly one process
+ *        for flushing.
  *
- *		Each process then flushes the entries assigned to it, and 
- *		marks all other entries on the candidate list as clean.
+ *        Each process then flushes the entries assigned to it, and
+ *        marks all other entries on the candidate list as clean.
  *
- *		Finally, all processes participate in a second barrier to 
- *		avoid messages from the past/future bugs.
+ *        Finally, all processes participate in a second barrier to
+ *        avoid messages from the past/future bugs.
  *
- *		At the end of this process, process 0 and only process 0
- *		must tidy up its lists of dirtied and cleaned entries.   
- *		These lists are not used in the distributed metadata write
- *		strategy, but they must be maintained should we shift 
- *		to a strategy that uses them.
+ *        At the end of this process, process 0 and only process 0
+ *        must tidy up its lists of dirtied and cleaned entries.
+ *        These lists are not used in the distributed metadata write
+ *        strategy, but they must be maintained should we shift
+ *        to a strategy that uses them.
  *
  * Return:      Success:        non-negative
  *
@@ -4431,13 +4431,13 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f, 
-                                            hid_t dxpl_id, 
+H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
+                                            hid_t dxpl_id,
                                             H5AC_t * cache_ptr)
 {
-    hbool_t 	 evictions_enabled;
+    hbool_t      evictions_enabled;
     H5AC_aux_t * aux_ptr;
-    herr_t	 ret_value = SUCCEED;   /* Return value */
+    herr_t     ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -4451,7 +4451,7 @@ H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
 
     HDassert( aux_ptr != NULL );
     HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy == 
+    HDassert( aux_ptr->metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
 
     /* Query if evictions are allowed */
@@ -4475,33 +4475,33 @@ done:
 } /* H5AC_rsp__dist_md_write__flush_to_min_clean() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__p0_only__flush
  *
  * Purpose:     Routine for handling the details of running a sync point
- *		that is triggered a flush -- which in turn must have been
- *		triggered by either a flush API call or a file close -- 
- *		when the process 0 only metadata write strategy is selected.  
+ *        that is triggered a flush -- which in turn must have been
+ *        triggered by either a flush API call or a file close --
+ *        when the process 0 only metadata write strategy is selected.
  *
  *              First, all processes participate in a barrier.
  *
- *		Then process zero flushes all dirty entries, and broadcasts
- *		they number of clean entries (if any) to all the other 
- *		caches.
+ *        Then process zero flushes all dirty entries, and broadcasts
+ *        they number of clean entries (if any) to all the other
+ *        caches.
  *
- *		If this number is zero, we are done.
+ *        If this number is zero, we are done.
  *
- *		Otherwise, process 0 broadcasts the list of cleaned 
- *		entries, and all other processes which are part of this
- *		file group receive it, and mark the listed entries as
- *		clean in their caches.
+ *        Otherwise, process 0 broadcasts the list of cleaned
+ *        entries, and all other processes which are part of this
+ *        file group receive it, and mark the listed entries as
+ *        clean in their caches.
  *
- *		Since all processes have the same set of dirty 
- *		entries at the beginning of the sync point, and all
- *		entries that will be written are written before 
- *		process zero broadcasts the number of cleaned entries,
- *		there is no need for a closing barrier.
+ *        Since all processes have the same set of dirty
+ *        entries at the beginning of the sync point, and all
+ *        entries that will be written are written before
+ *        process zero broadcasts the number of cleaned entries,
+ *        there is no need for a closing barrier.
  *
  * Return:      Success:        non-negative
  *
@@ -4514,13 +4514,13 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__p0_only__flush(H5F_t *f, 
-                         hid_t dxpl_id, 
+H5AC_rsp__p0_only__flush(H5F_t *f,
+                         hid_t dxpl_id,
                          H5AC_t * cache_ptr)
 {
-    int		 mpi_code;
+    int         mpi_code;
     H5AC_aux_t * aux_ptr;
-    herr_t	 ret_value = SUCCEED;   /* Return value */
+    herr_t     ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -4534,12 +4534,12 @@ H5AC_rsp__p0_only__flush(H5F_t *f,
 
     HDassert( aux_ptr != NULL );
     HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy == 
+    HDassert( aux_ptr->metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY );
 
 
-    /* to prevent "messages from the future" we must 
-     * synchronize all processes before we start the flush.  
+    /* to prevent "messages from the future" we must
+     * synchronize all processes before we start the flush.
      * Hence the following barrier.
      */
     if(MPI_SUCCESS != (mpi_code = MPI_Barrier(aux_ptr->mpi_comm)))
@@ -4571,39 +4571,39 @@ done:
 } /* H5AC_rsp__p0_only__flush() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_rsp__p0_only__flush_to_min_clean
  *
  * Purpose:     Routine for handling the details of running a sync point
- *		triggered by the accumulation of dirty metadata (as 
- *		opposed to a flush call to the API) when the process 0
- *		only metadata write strategy is selected.
+ *        triggered by the accumulation of dirty metadata (as
+ *        opposed to a flush call to the API) when the process 0
+ *        only metadata write strategy is selected.
  *
- *		After invocation and initial sanity checking this function
- *		first checks to see if evictions are enabled -- if they 
- *		are not, the function does nothing and returns.
+ *        After invocation and initial sanity checking this function
+ *        first checks to see if evictions are enabled -- if they
+ *        are not, the function does nothing and returns.
  *
  *              Otherwise, all processes participate in a barrier.
  *
- *		After the barrier, if this is process 0, the function 
- *		causes the cache to flush sufficient entries to get the 
- *		cache back within its minimum clean fraction, and broadcast 
- *		the number of entries which have been flushed since 
- *		the last sync point, and are still clean.
+ *        After the barrier, if this is process 0, the function
+ *        causes the cache to flush sufficient entries to get the
+ *        cache back within its minimum clean fraction, and broadcast
+ *        the number of entries which have been flushed since
+ *        the last sync point, and are still clean.
  *
- *		If this number is zero, we are done.
+ *        If this number is zero, we are done.
  *
- *		Otherwise, process 0 broadcasts the list of cleaned 
- *		entries, and all other processes which are part of this
- *		file group receive it, and mark the listed entries as
- *		clean in their caches.
+ *        Otherwise, process 0 broadcasts the list of cleaned
+ *        entries, and all other processes which are part of this
+ *        file group receive it, and mark the listed entries as
+ *        clean in their caches.
  *
- *		Since all processes have the same set of dirty 
- *		entries at the beginning of the sync point, and all
- *		entries that will be written are written before 
- *		process zero broadcasts the number of cleaned entries,
- *		there is no need for a closing barrier.
+ *        Since all processes have the same set of dirty
+ *        entries at the beginning of the sync point, and all
+ *        entries that will be written are written before
+ *        process zero broadcasts the number of cleaned entries,
+ *        there is no need for a closing barrier.
  *
  * Return:      Success:        non-negative
  *
@@ -4616,13 +4616,13 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f, 
-                                      hid_t dxpl_id, 
+H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
+                                      hid_t dxpl_id,
                                       H5AC_t * cache_ptr)
 {
-    hbool_t 	 evictions_enabled;
+    hbool_t      evictions_enabled;
     H5AC_aux_t * aux_ptr;
-    herr_t	 ret_value = SUCCEED;   /* Return value */
+    herr_t     ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -4636,7 +4636,7 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
 
     HDassert( aux_ptr != NULL );
     HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy == 
+    HDassert( aux_ptr->metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY );
 
     /* Query if evictions are allowed */
@@ -4661,11 +4661,11 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
 
         if(0 == aux_ptr->mpi_rank) {
-            herr_t	 result;
+            herr_t     result;
 
-            /* here, process 0 flushes as many entries as necessary to 
+            /* here, process 0 flushes as many entries as necessary to
              * comply with the currently specified min clean size.
-             * Note that it is quite possible that no entries will be 
+             * Note that it is quite possible that no entries will be
              * flushed.
              */
             aux_ptr->write_permitted = TRUE;
@@ -4678,8 +4678,8 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_flush_to_min_clean() failed.")
 
             /* this call exists primarily for the test code -- it is used
- 	     * to enforce POSIX semantics on the process used to simulate
- 	     * reads and writes in t_cache.c.
+        * to enforce POSIX semantics on the process used to simulate
+        * reads and writes in t_cache.c.
              */
             if(aux_ptr->write_done != NULL)
                 (aux_ptr->write_done)();
@@ -4694,28 +4694,28 @@ done:
 } /* H5AC_rsp__p0_only__flush_to_min_clean() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_run_sync_point
  *
  * Purpose:     Top level routine for managing a sync point between all
- *		meta data caches in the parallel case.  Since all caches 
- *		see the same sequence of dirty metadata, we simply count
- *		bytes of dirty metadata, and run a sync point whenever the
- *		number of dirty bytes of metadata seen since the last
- *		sync point exceeds a threshold that is common across all
- *		processes.  We also run sync points in response to 
- *		HDF5 API calls triggering either a flush or a file close.
- *
- *		In earlier versions of PHDF5, only the metadata cache with 
- *		mpi rank 0 was allowed to write to file.  All other 
- *		metadata caches on processes with rank greater than 0 were
- *		required to retain dirty entries until they were notified 
- *		that the entry is was clean.
- *
- *		This function was created to make it easier for us to 
- *		experiment with other options, as it is a single point 
- *		for the execution of sync points.  
+ *        meta data caches in the parallel case.  Since all caches
+ *        see the same sequence of dirty metadata, we simply count
+ *        bytes of dirty metadata, and run a sync point whenever the
+ *        number of dirty bytes of metadata seen since the last
+ *        sync point exceeds a threshold that is common across all
+ *        processes.  We also run sync points in response to
+ *        HDF5 API calls triggering either a flush or a file close.
+ *
+ *        In earlier versions of PHDF5, only the metadata cache with
+ *        mpi rank 0 was allowed to write to file.  All other
+ *        metadata caches on processes with rank greater than 0 were
+ *        required to retain dirty entries until they were notified
+ *        that the entry is was clean.
+ *
+ *        This function was created to make it easier for us to
+ *        experiment with other options, as it is a single point
+ *        for the execution of sync points.
  *
  * Return:      Success:        non-negative
  *
@@ -4728,13 +4728,13 @@ done:
  */
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC_run_sync_point(H5F_t *f, 
-                    hid_t dxpl_id, 
-		    int sync_point_op)
+H5AC_run_sync_point(H5F_t *f,
+                    hid_t dxpl_id,
+            int sync_point_op)
 {
     H5AC_t * cache_ptr;
     H5AC_aux_t * aux_ptr;
-    herr_t	 ret_value = SUCCEED;   /* Return value */
+    herr_t     ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -4768,44 +4768,44 @@ H5AC_run_sync_point(H5F_t *f,
 
     switch(aux_ptr->metadata_write_strategy) {
         case H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY:
-	    switch(sync_point_op) {
+        switch(sync_point_op) {
                 case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
-	            if(H5AC_rsp__p0_only__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
+                if(H5AC_rsp__p0_only__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__p0_only__flush_to_min_clean() failed.")
-		    break;
+            break;
 
-		case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
-	            if(H5AC_rsp__p0_only__flush(f, dxpl_id, cache_ptr) < 0)
+        case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
+                if(H5AC_rsp__p0_only__flush(f, dxpl_id, cache_ptr) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__p0_only__flush() failed.")
-		    break;
+            break;
 
-		default:
+        default:
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown flush op");
-		    break;
-	    } /* end switch */
-	    break;
+            break;
+        } /* end switch */
+        break;
 
-	case H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED:
-	    switch(sync_point_op) {
+    case H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED:
+        switch(sync_point_op) {
                 case H5AC_SYNC_POINT_OP__FLUSH_TO_MIN_CLEAN:
-	            if(H5AC_rsp__dist_md_write__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
+                if(H5AC_rsp__dist_md_write__flush_to_min_clean(f, dxpl_id, cache_ptr) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__dist_md_write__flush() failed.")
-		    break;
+            break;
 
-		case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
-	            if(H5AC_rsp__dist_md_write__flush(f, dxpl_id, cache_ptr) < 0)
+        case H5AC_SYNC_POINT_OP__FLUSH_CACHE:
+                if(H5AC_rsp__dist_md_write__flush(f, dxpl_id, cache_ptr) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "H5AC_rsp__dist_md_write__flush() failed.")
-		    break;
+            break;
 
-		default:
+        default:
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unknown flush op");
-		    break;
-	    } /* end switch */
-	    break;
+            break;
+        } /* end switch */
+        break;
 
-	default:
+    default:
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown metadata write strategy.")
-	    break;
+        break;
     } /* end switch */
 
     /* reset the dirty bytes count */
@@ -4826,32 +4826,32 @@ done:
 } /* H5AC_run_sync_point() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_tidy_cache_0_lists()
  *
  * Purpose:     In the distributed metadata write strategy, not all dirty
- *		entries are written by process 0 -- thus we must tidy
- *		up the dirtied, and flushed and still clean lists 
- *		maintained by process zero after each sync point.
+ *        entries are written by process 0 -- thus we must tidy
+ *        up the dirtied, and flushed and still clean lists
+ *        maintained by process zero after each sync point.
  *
- *		This procedure exists to tend to this issue.
+ *        This procedure exists to tend to this issue.
  *
- *		At this point, all entries that process 0 cleared should
- *		have been removed from both the dirty and flushed and 
- *		still clean lists, and entries that process 0 has flushed
- *		should have been removed from the dirtied list and added
- *		to the flushed and still clean list.
+ *        At this point, all entries that process 0 cleared should
+ *        have been removed from both the dirty and flushed and
+ *        still clean lists, and entries that process 0 has flushed
+ *        should have been removed from the dirtied list and added
+ *        to the flushed and still clean list.
  *
- *		However, since the distributed metadata write strategy
- *		doesn't make use of these lists, the objective is simply
- *		to maintain these lists in consistent state that allows
- *		them to be used should the metadata write strategy change
- *		to one that uses these lists.
+ *        However, since the distributed metadata write strategy
+ *        doesn't make use of these lists, the objective is simply
+ *        to maintain these lists in consistent state that allows
+ *        them to be used should the metadata write strategy change
+ *        to one that uses these lists.
  *
- *		Thus for our purposes, all we need to do is remove from 
- *		the dirtied and flushed and still clean lists all
- *		references to entries that appear in the candidate list.
+ *        Thus for our purposes, all we need to do is remove from
+ *        the dirtied and flushed and still clean lists all
+ *        references to entries that appear in the candidate list.
  *
  * Return:      Success:        non-negative
  *
@@ -4882,17 +4882,17 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
 
     HDassert( aux_ptr != NULL );
     HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
-    HDassert( aux_ptr->metadata_write_strategy == 
+    HDassert( aux_ptr->metadata_write_strategy ==
               H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED );
     HDassert( aux_ptr->mpi_rank == 0 );
     HDassert( num_candidates > 0 );
     HDassert( candidates_list_ptr != NULL );
 
-    /* clean up dirtied and flushed and still clean lists by removing 
-     * all entries on the candidate list.  Cleared entries should 
-     * have been removed from both the dirty and cleaned lists at 
-     * this point, flushed entries should have been added to the 
-     * cleaned list.  However, for this metadata write strategy, 
+    /* clean up dirtied and flushed and still clean lists by removing
+     * all entries on the candidate list.  Cleared entries should
+     * have been removed from both the dirty and cleaned lists at
+     * this point, flushed entries should have been added to the
+     * cleaned list.  However, for this metadata write strategy,
      * we just want to remove all references to the candidate entries.
      */
     for(i = 0; i < num_candidates; i++) {
@@ -4902,7 +4902,7 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
 
         addr = candidates_list_ptr[i];
 
-        /* addr must be either on the dirtied list, or on the flushed 
+        /* addr must be either on the dirtied list, or on the flushed
          * and still clean list.  Remove it.
          */
         d_slist_entry_ptr = (H5AC_slist_entry_t *)H5SL_search(aux_ptr->d_slist_ptr, (void *)&addr);
@@ -4943,7 +4943,7 @@ done:
 } /* H5AC_tidy_cache_0_lists() */
 #endif /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5AC_flush_entries
  *
diff --git a/src/H5Bdbg.c b/src/H5Bdbg.c
index f3a0f5c..f502f8b 100644
--- a/src/H5Bdbg.c
+++ b/src/H5Bdbg.c
@@ -191,7 +191,7 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
 
     if(0 == ncalls++) {
 	if(H5DEBUG(B))
-	    fprintf(H5DEBUG(B), "H5B: debugging B-trees (expensive)\n");
+	    HDfprintf(H5DEBUG(B), "H5B: debugging B-trees (expensive)\n");
     } /* end if */
 
     /* Get shared info for B-tree */
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 8a475b9..c9dfe87 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -5539,10 +5539,10 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
         HGOTO_DONE(SUCCEED)
 
     if (headers) {
-        fprintf(H5DEBUG(AC), "H5D: raw data cache statistics\n");
-        fprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s+%-8s\n",
+        HDfprintf(H5DEBUG(AC), "H5D: raw data cache statistics\n");
+        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s+%-8s\n",
             "Layer", "Hits", "Misses", "MissRate", "Inits", "Flushes");
-        fprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s-%-8s\n",
+        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s-%-8s\n",
             "-----", "----", "------", "--------", "-----", "-------");
     }
 
@@ -5563,7 +5563,7 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
             sprintf(ascii, "%7.2f%%", miss_rate);
         }
 
-        fprintf(H5DEBUG(AC), "   %-18s %8u %8u %7s %8d+%-9ld\n",
+        HDfprintf(H5DEBUG(AC), "   %-18s %8u %8u %7s %8d+%-9ld\n",
             "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii,
             rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits));
     }
diff --git a/src/H5Edefin.h b/src/H5Edefin.h
index 8442781..07d3a8b 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -19,40 +19,74 @@
 #define _H5Edefin_H
 
 /* Major error IDs */
+hid_t H5E_IO_g             = FAIL;      /* Low-level I/O */
+hid_t H5E_SOHM_g           = FAIL;      /* Shared Object Header Messages */
 hid_t H5E_ATTR_g           = FAIL;      /* Attribute */
-hid_t H5E_NONE_MAJOR_g     = FAIL;      /* No error */
-hid_t H5E_PLINE_g          = FAIL;      /* Data filters */
-hid_t H5E_FSPACE_g         = FAIL;      /* Free Space Manager */
-hid_t H5E_RS_g             = FAIL;      /* Reference Counted Strings */
-hid_t H5E_DATATYPE_g       = FAIL;      /* Datatype */
-hid_t H5E_FILE_g           = FAIL;      /* File accessibilty */
+hid_t H5E_PLIST_g          = FAIL;      /* Property lists */
+hid_t H5E_FUNC_g           = FAIL;      /* Function entry/exit */
+hid_t H5E_ERROR_g          = FAIL;      /* Error API */
+hid_t H5E_STORAGE_g        = FAIL;      /* Data storage */
+hid_t H5E_OHDR_g           = FAIL;      /* Object header */
 hid_t H5E_PLUGIN_g         = FAIL;      /* Plugin for dynamically loaded library */
+hid_t H5E_TST_g            = FAIL;      /* Ternary Search Trees */
 hid_t H5E_DATASET_g        = FAIL;      /* Dataset */
-hid_t H5E_OHDR_g           = FAIL;      /* Object header */
+hid_t H5E_BTREE_g          = FAIL;      /* B-Tree node */
 hid_t H5E_SLIST_g          = FAIL;      /* Skip Lists */
-hid_t H5E_LINK_g           = FAIL;      /* Links */
-hid_t H5E_RESOURCE_g       = FAIL;      /* Resource unavailable */
-hid_t H5E_ERROR_g          = FAIL;      /* Error API */
-hid_t H5E_INTERNAL_g       = FAIL;      /* Internal error (too specific to document in detail) */
-hid_t H5E_TST_g            = FAIL;      /* Ternary Search Trees */
+hid_t H5E_VFL_g            = FAIL;      /* Virtual File Layer */
+hid_t H5E_DATASPACE_g      = FAIL;      /* Dataspace */
+hid_t H5E_DATATYPE_g       = FAIL;      /* Datatype */
+hid_t H5E_RS_g             = FAIL;      /* Reference Counted Strings */
+hid_t H5E_ATOM_g           = FAIL;      /* Object atom */
 hid_t H5E_CACHE_g          = FAIL;      /* Object cache */
-hid_t H5E_EFL_g            = FAIL;      /* External file list */
+hid_t H5E_INTERNAL_g       = FAIL;      /* Internal error (too specific to document in detail) */
 hid_t H5E_SYM_g            = FAIL;      /* Symbol table */
+hid_t H5E_LINK_g           = FAIL;      /* Links */
 hid_t H5E_HEAP_g           = FAIL;      /* Heap */
+hid_t H5E_PLINE_g          = FAIL;      /* Data filters */
+hid_t H5E_EFL_g            = FAIL;      /* External file list */
 hid_t H5E_REFERENCE_g      = FAIL;      /* References */
-hid_t H5E_FUNC_g           = FAIL;      /* Function entry/exit */
-hid_t H5E_STORAGE_g        = FAIL;      /* Data storage */
-hid_t H5E_VFL_g            = FAIL;      /* Virtual File Layer */
-hid_t H5E_SOHM_g           = FAIL;      /* Shared Object Header Messages */
-hid_t H5E_ATOM_g           = FAIL;      /* Object atom */
+hid_t H5E_FILE_g           = FAIL;      /* File accessibilty */
+hid_t H5E_RESOURCE_g       = FAIL;      /* Resource unavailable */
+hid_t H5E_NONE_MAJOR_g     = FAIL;      /* No error */
 hid_t H5E_ARGS_g           = FAIL;      /* Invalid arguments to routine */
-hid_t H5E_BTREE_g          = FAIL;      /* B-Tree node */
-hid_t H5E_IO_g             = FAIL;      /* Low-level I/O */
-hid_t H5E_PLIST_g          = FAIL;      /* Property lists */
-hid_t H5E_DATASPACE_g      = FAIL;      /* Dataspace */
+hid_t H5E_FSPACE_g         = FAIL;      /* Free Space Manager */
 
 /* Minor error IDs */
 
+/* Function entry/exit interface errors */
+hid_t H5E_CANTINIT_g       = FAIL;      /* Unable to initialize object */
+hid_t H5E_ALREADYINIT_g    = FAIL;      /* Object already initialized */
+hid_t H5E_CANTRELEASE_g    = FAIL;      /* Unable to release object */
+
+/* Link related errors */
+hid_t H5E_TRAVERSE_g       = FAIL;      /* Link traversal failure */
+hid_t H5E_NLINKS_g         = FAIL;      /* Too many soft links in path */
+hid_t H5E_NOTREGISTERED_g  = FAIL;      /* Link class not registered */
+hid_t H5E_CANTMOVE_g       = FAIL;      /* Can't move object */
+hid_t H5E_CANTSORT_g       = FAIL;      /* Can't sort objects */
+
+/* Parallel MPI errors */
+hid_t H5E_MPI_g            = FAIL;      /* Some MPI function failed */
+hid_t H5E_MPIERRSTR_g      = FAIL;      /* MPI Error String */
+hid_t H5E_CANTRECV_g       = FAIL;      /* Can't receive data */
+
+/* Cache related errors */
+hid_t H5E_CANTFLUSH_g      = FAIL;      /* Unable to flush data from cache */
+hid_t H5E_CANTSERIALIZE_g  = FAIL;      /* Unable to serialize data from cache */
+hid_t H5E_CANTLOAD_g       = FAIL;      /* Unable to load metadata into cache */
+hid_t H5E_PROTECT_g        = FAIL;      /* Protected metadata error */
+hid_t H5E_NOTCACHED_g      = FAIL;      /* Metadata not currently cached */
+hid_t H5E_SYSTEM_g         = FAIL;      /* Internal error detected */
+hid_t H5E_CANTINS_g        = FAIL;      /* Unable to insert metadata into cache */
+hid_t H5E_CANTPROTECT_g    = FAIL;      /* Unable to protect metadata */
+hid_t H5E_CANTUNPROTECT_g  = FAIL;      /* Unable to unprotect metadata */
+hid_t H5E_CANTPIN_g        = FAIL;      /* Unable to pin cache entry */
+hid_t H5E_CANTUNPIN_g      = FAIL;      /* Unable to un-pin cache entry */
+hid_t H5E_CANTMARKDIRTY_g  = FAIL;      /* Unable to mark a pinned entry as dirty */
+hid_t H5E_CANTDIRTY_g      = FAIL;      /* Unable to mark metadata as dirty */
+hid_t H5E_CANTEXPUNGE_g    = FAIL;      /* Unable to expunge a metadata cache entry */
+hid_t H5E_CANTRESIZE_g     = FAIL;      /* Unable to resize a metadata cache entry */
+
 /* Argument errors */
 hid_t H5E_UNINITIALIZED_g  = FAIL;      /* Information is uinitialized */
 hid_t H5E_UNSUPPORTED_g    = FAIL;      /* Feature is unsupported */
@@ -60,24 +94,8 @@ hid_t H5E_BADTYPE_g        = FAIL;      /* Inappropriate type */
 hid_t H5E_BADRANGE_g       = FAIL;      /* Out of range */
 hid_t H5E_BADVALUE_g       = FAIL;      /* Bad value */
 
-/* Object atom related errors */
-hid_t H5E_BADATOM_g        = FAIL;      /* Unable to find atom information (already closed?) */
-hid_t H5E_BADGROUP_g       = FAIL;      /* Unable to find ID group information */
-hid_t H5E_CANTREGISTER_g   = FAIL;      /* Unable to register new atom */
-hid_t H5E_CANTINC_g        = FAIL;      /* Unable to increment reference count */
-hid_t H5E_CANTDEC_g        = FAIL;      /* Unable to decrement reference count */
-hid_t H5E_NOIDS_g          = FAIL;      /* Out of IDs for group */
-
-/* Function entry/exit interface errors */
-hid_t H5E_CANTINIT_g       = FAIL;      /* Unable to initialize object */
-hid_t H5E_ALREADYINIT_g    = FAIL;      /* Object already initialized */
-hid_t H5E_CANTRELEASE_g    = FAIL;      /* Unable to release object */
-
-/* Property list errors */
-hid_t H5E_CANTGET_g        = FAIL;      /* Can't get value */
-hid_t H5E_CANTSET_g        = FAIL;      /* Can't set value */
-hid_t H5E_DUPCLASS_g       = FAIL;      /* Duplicate class name in parent class */
-hid_t H5E_SETDISALLOWED_g  = FAIL;      /* Disallowed operation */
+/* Plugin errors */
+hid_t H5E_OPENERROR_g      = FAIL;      /* Can't open directory or file */
 
 /* Generic low-level file I/O errors */
 hid_t H5E_SEEKERROR_g      = FAIL;      /* Seek failed */
@@ -87,6 +105,14 @@ hid_t H5E_CLOSEERROR_g     = FAIL;      /* Close failed */
 hid_t H5E_OVERFLOW_g       = FAIL;      /* Address overflowed */
 hid_t H5E_FCNTL_g          = FAIL;      /* File control (fcntl) failed */
 
+/* Heap errors */
+hid_t H5E_CANTRESTORE_g    = FAIL;      /* Can't restore condition */
+hid_t H5E_CANTCOMPUTE_g    = FAIL;      /* Can't compute value */
+hid_t H5E_CANTEXTEND_g     = FAIL;      /* Can't extend heap's space */
+hid_t H5E_CANTATTACH_g     = FAIL;      /* Can't attach object */
+hid_t H5E_CANTUPDATE_g     = FAIL;      /* Can't update object */
+hid_t H5E_CANTOPERATE_g    = FAIL;      /* Can't operate on object */
+
 /* Resource errors */
 hid_t H5E_NOSPACE_g        = FAIL;      /* No space available for allocation */
 hid_t H5E_CANTALLOC_g      = FAIL;      /* Can't allocate space */
@@ -99,22 +125,58 @@ hid_t H5E_CANTGC_g         = FAIL;      /* Unable to garbage collect */
 hid_t H5E_CANTGETSIZE_g    = FAIL;      /* Unable to compute size */
 hid_t H5E_OBJOPEN_g        = FAIL;      /* Object is already open */
 
+/* I/O pipeline errors */
+hid_t H5E_NOFILTER_g       = FAIL;      /* Requested filter is not available */
+hid_t H5E_CALLBACK_g       = FAIL;      /* Callback failed */
+hid_t H5E_CANAPPLY_g       = FAIL;      /* Error from filter 'can apply' callback */
+hid_t H5E_SETLOCAL_g       = FAIL;      /* Error from filter 'set local' callback */
+hid_t H5E_NOENCODER_g      = FAIL;      /* Filter present but encoding disabled */
+hid_t H5E_CANTFILTER_g     = FAIL;      /* Filter operation failed */
+
+/* Dataspace errors */
+hid_t H5E_CANTCLIP_g       = FAIL;      /* Can't clip hyperslab region */
+hid_t H5E_CANTCOUNT_g      = FAIL;      /* Can't count elements */
+hid_t H5E_CANTSELECT_g     = FAIL;      /* Can't select hyperslab */
+hid_t H5E_CANTNEXT_g       = FAIL;      /* Can't move to next iterator location */
+hid_t H5E_BADSELECT_g      = FAIL;      /* Invalid selection */
+hid_t H5E_CANTCOMPARE_g    = FAIL;      /* Can't compare objects */
+
+/* Free space errors */
+hid_t H5E_CANTMERGE_g      = FAIL;      /* Can't merge objects */
+hid_t H5E_CANTREVIVE_g     = FAIL;      /* Can't revive object */
+hid_t H5E_CANTSHRINK_g     = FAIL;      /* Can't shrink container */
+
+/* Object header related errors */
+hid_t H5E_LINKCOUNT_g      = FAIL;      /* Bad object header link count */
+hid_t H5E_VERSION_g        = FAIL;      /* Wrong version number */
+hid_t H5E_ALIGNMENT_g      = FAIL;      /* Alignment error */
+hid_t H5E_BADMESG_g        = FAIL;      /* Unrecognized message */
+hid_t H5E_CANTDELETE_g     = FAIL;      /* Can't delete message */
+hid_t H5E_BADITER_g        = FAIL;      /* Iteration failed */
+hid_t H5E_CANTPACK_g       = FAIL;      /* Can't pack messages */
+hid_t H5E_CANTRESET_g      = FAIL;      /* Can't reset object */
+hid_t H5E_CANTRENAME_g     = FAIL;      /* Unable to rename object */
+
+/* System level errors */
+hid_t H5E_SYSERRSTR_g      = FAIL;      /* System error message */
+
 /* Datatype conversion errors */
 hid_t H5E_CANTCONVERT_g    = FAIL;      /* Can't convert datatypes */
 hid_t H5E_BADSIZE_g        = FAIL;      /* Bad size for object */
 
-/* Heap errors */
-hid_t H5E_CANTRESTORE_g    = FAIL;      /* Can't restore condition */
-hid_t H5E_CANTCOMPUTE_g    = FAIL;      /* Can't compute value */
-hid_t H5E_CANTEXTEND_g     = FAIL;      /* Can't extend heap's space */
-hid_t H5E_CANTATTACH_g     = FAIL;      /* Can't attach object */
-hid_t H5E_CANTUPDATE_g     = FAIL;      /* Can't update object */
-hid_t H5E_CANTOPERATE_g    = FAIL;      /* Can't operate on object */
+/* Object atom related errors */
+hid_t H5E_BADATOM_g        = FAIL;      /* Unable to find atom information (already closed?) */
+hid_t H5E_BADGROUP_g       = FAIL;      /* Unable to find ID group information */
+hid_t H5E_CANTREGISTER_g   = FAIL;      /* Unable to register new atom */
+hid_t H5E_CANTINC_g        = FAIL;      /* Unable to increment reference count */
+hid_t H5E_CANTDEC_g        = FAIL;      /* Unable to decrement reference count */
+hid_t H5E_NOIDS_g          = FAIL;      /* Out of IDs for group */
 
-/* Parallel MPI errors */
-hid_t H5E_MPI_g            = FAIL;      /* Some MPI function failed */
-hid_t H5E_MPIERRSTR_g      = FAIL;      /* MPI Error String */
-hid_t H5E_CANTRECV_g       = FAIL;      /* Can't receive data */
+/* Property list errors */
+hid_t H5E_CANTGET_g        = FAIL;      /* Can't get value */
+hid_t H5E_CANTSET_g        = FAIL;      /* Can't set value */
+hid_t H5E_DUPCLASS_g       = FAIL;      /* Duplicate class name in parent class */
+hid_t H5E_SETDISALLOWED_g  = FAIL;      /* Disallowed operation */
 
 /* B-tree related errors */
 hid_t H5E_NOTFOUND_g       = FAIL;      /* Object not found */
@@ -135,25 +197,8 @@ hid_t H5E_CANTCLOSEOBJ_g   = FAIL;      /* Can't close object */
 hid_t H5E_COMPLEN_g        = FAIL;      /* Name component is too long */
 hid_t H5E_PATH_g           = FAIL;      /* Problem with path to object */
 
-/* Free space errors */
-hid_t H5E_CANTMERGE_g      = FAIL;      /* Can't merge objects */
-hid_t H5E_CANTREVIVE_g     = FAIL;      /* Can't revive object */
-hid_t H5E_CANTSHRINK_g     = FAIL;      /* Can't shrink container */
-
-/* I/O pipeline errors */
-hid_t H5E_NOFILTER_g       = FAIL;      /* Requested filter is not available */
-hid_t H5E_CALLBACK_g       = FAIL;      /* Callback failed */
-hid_t H5E_CANAPPLY_g       = FAIL;      /* Error from filter 'can apply' callback */
-hid_t H5E_SETLOCAL_g       = FAIL;      /* Error from filter 'set local' callback */
-hid_t H5E_NOENCODER_g      = FAIL;      /* Filter present but encoding disabled */
-hid_t H5E_CANTFILTER_g     = FAIL;      /* Filter operation failed */
-
-/* Link related errors */
-hid_t H5E_TRAVERSE_g       = FAIL;      /* Link traversal failure */
-hid_t H5E_NLINKS_g         = FAIL;      /* Too many soft links in path */
-hid_t H5E_NOTREGISTERED_g  = FAIL;      /* Link class not registered */
-hid_t H5E_CANTMOVE_g       = FAIL;      /* Can't move object */
-hid_t H5E_CANTSORT_g       = FAIL;      /* Can't sort objects */
+/* No error */
+hid_t H5E_NONE_MINOR_g     = FAIL;      /* No error */
 
 /* File accessibilty errors */
 hid_t H5E_FILEEXISTS_g     = FAIL;      /* File already exists */
@@ -166,49 +211,4 @@ hid_t H5E_BADFILE_g        = FAIL;      /* Bad file ID accessed */
 hid_t H5E_TRUNCATED_g      = FAIL;      /* File has been truncated */
 hid_t H5E_MOUNT_g          = FAIL;      /* File mount error */
 
-/* Cache related errors */
-hid_t H5E_CANTFLUSH_g      = FAIL;      /* Unable to flush data from cache */
-hid_t H5E_CANTSERIALIZE_g  = FAIL;      /* Unable to serialize data from cache */
-hid_t H5E_CANTLOAD_g       = FAIL;      /* Unable to load metadata into cache */
-hid_t H5E_PROTECT_g        = FAIL;      /* Protected metadata error */
-hid_t H5E_NOTCACHED_g      = FAIL;      /* Metadata not currently cached */
-hid_t H5E_SYSTEM_g         = FAIL;      /* Internal error detected */
-hid_t H5E_CANTINS_g        = FAIL;      /* Unable to insert metadata into cache */
-hid_t H5E_CANTPROTECT_g    = FAIL;      /* Unable to protect metadata */
-hid_t H5E_CANTUNPROTECT_g  = FAIL;      /* Unable to unprotect metadata */
-hid_t H5E_CANTPIN_g        = FAIL;      /* Unable to pin cache entry */
-hid_t H5E_CANTUNPIN_g      = FAIL;      /* Unable to un-pin cache entry */
-hid_t H5E_CANTMARKDIRTY_g  = FAIL;      /* Unable to mark a pinned entry as dirty */
-hid_t H5E_CANTDIRTY_g      = FAIL;      /* Unable to mark metadata as dirty */
-hid_t H5E_CANTEXPUNGE_g    = FAIL;      /* Unable to expunge a metadata cache entry */
-hid_t H5E_CANTRESIZE_g     = FAIL;      /* Unable to resize a metadata cache entry */
-
-/* System level errors */
-hid_t H5E_SYSERRSTR_g      = FAIL;      /* System error message */
-
-/* No error */
-hid_t H5E_NONE_MINOR_g     = FAIL;      /* No error */
-
-/* Dataspace errors */
-hid_t H5E_CANTCLIP_g       = FAIL;      /* Can't clip hyperslab region */
-hid_t H5E_CANTCOUNT_g      = FAIL;      /* Can't count elements */
-hid_t H5E_CANTSELECT_g     = FAIL;      /* Can't select hyperslab */
-hid_t H5E_CANTNEXT_g       = FAIL;      /* Can't move to next iterator location */
-hid_t H5E_BADSELECT_g      = FAIL;      /* Invalid selection */
-hid_t H5E_CANTCOMPARE_g    = FAIL;      /* Can't compare objects */
-
-/* Object header related errors */
-hid_t H5E_LINKCOUNT_g      = FAIL;      /* Bad object header link count */
-hid_t H5E_VERSION_g        = FAIL;      /* Wrong version number */
-hid_t H5E_ALIGNMENT_g      = FAIL;      /* Alignment error */
-hid_t H5E_BADMESG_g        = FAIL;      /* Unrecognized message */
-hid_t H5E_CANTDELETE_g     = FAIL;      /* Can't delete message */
-hid_t H5E_BADITER_g        = FAIL;      /* Iteration failed */
-hid_t H5E_CANTPACK_g       = FAIL;      /* Can't pack messages */
-hid_t H5E_CANTRESET_g      = FAIL;      /* Can't reset object */
-hid_t H5E_CANTRENAME_g     = FAIL;      /* Unable to rename object */
-
-/* Plugin errors */
-hid_t H5E_OPENERROR_g      = FAIL;      /* Can't open directory or file */
-
 #endif /* H5Edefin_H */
diff --git a/src/H5Einit.h b/src/H5Einit.h
index 3c0c095..720e6f3 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -22,160 +22,160 @@
 /* Major error codes */
 /*********************/
 
-assert(H5E_ATTR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute"))==NULL)
+HDassert(H5E_IO_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Low-level I/O"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ATTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NONE_MAJOR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "No error"))==NULL)
+HDassert(H5E_SOHM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Shared Object Header Messages"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NONE_MAJOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_SOHM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_PLINE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data filters"))==NULL)
+HDassert(H5E_ATTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_ATTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FSPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Free Space Manager"))==NULL)
+HDassert(H5E_PLIST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_RS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings"))==NULL)
+HDassert(H5E_FUNC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_DATATYPE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Datatype"))==NULL)
+HDassert(H5E_ERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessibilty"))==NULL)
+HDassert(H5E_STORAGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_PLUGIN_g==(-1));
+HDassert(H5E_OHDR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_PLUGIN_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Plugin for dynamically loaded library"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_PLUGIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_DATASET_g==(-1));
+HDassert(H5E_TST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_DATASET_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataset"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_OHDR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL)
+HDassert(H5E_BTREE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SLIST_g==(-1));
+HDassert(H5E_SLIST_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Skip Lists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_SLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_LINK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Links"))==NULL)
+HDassert(H5E_VFL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_VFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_RESOURCE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable"))==NULL)
+HDassert(H5E_DATASPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API"))==NULL)
+HDassert(H5E_DATATYPE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Datatype"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_INTERNAL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)"))==NULL)
+HDassert(H5E_RS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_TST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees"))==NULL)
+HDassert(H5E_ATOM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CACHE_g==(-1));
+HDassert(H5E_CACHE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_EFL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list"))==NULL)
+HDassert(H5E_INTERNAL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SYM_g==(-1));
+HDassert(H5E_SYM_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_HEAP_g==(-1));
+HDassert(H5E_LINK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Links"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_HEAP_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Heap"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_REFERENCE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "References"))==NULL)
+HDassert(H5E_PLINE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data filters"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FUNC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit"))==NULL)
+HDassert(H5E_EFL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_STORAGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage"))==NULL)
+HDassert(H5E_REFERENCE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "References"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_VFL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer"))==NULL)
+HDassert(H5E_FILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessibilty"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_VFL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SOHM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Shared Object Header Messages"))==NULL)
+HDassert(H5E_RESOURCE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SOHM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ATOM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom"))==NULL)
+HDassert(H5E_NONE_MAJOR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "No error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NONE_MAJOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ARGS_g==(-1));
+HDassert(H5E_ARGS_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MAJOR, "Invalid arguments to routine"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BTREE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_IO_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Low-level I/O"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_PLIST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_DATASPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace"))==NULL)
+HDassert(H5E_FSPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Free Space Manager"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_FSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /*********************/
@@ -183,626 +183,626 @@ if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
 /*********************/
 
 
-/* Argument errors */
-assert(H5E_UNINITIALIZED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
+/* Function entry/exit interface errors */
+HDassert(H5E_CANTINIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_UNSUPPORTED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
+HDassert(H5E_ALREADYINIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADTYPE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
+HDassert(H5E_CANTRELEASE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADRANGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
+
+/* Link related errors */
+HDassert(H5E_TRAVERSE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Link traversal failure"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_TRAVERSE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADVALUE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
+HDassert(H5E_NLINKS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Too many soft links in path"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NLINKS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Object atom related errors */
-assert(H5E_BADATOM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)"))==NULL)
+HDassert(H5E_NOTREGISTERED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADGROUP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information"))==NULL)
+HDassert(H5E_CANTMOVE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTREGISTER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom"))==NULL)
+HDassert(H5E_CANTSORT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't sort objects"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTSORT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTINC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count"))==NULL)
+
+/* Parallel MPI errors */
+HDassert(H5E_MPI_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTDEC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count"))==NULL)
+HDassert(H5E_MPIERRSTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NOIDS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group"))==NULL)
+HDassert(H5E_CANTRECV_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive data"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Function entry/exit interface errors */
-assert(H5E_CANTINIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object"))==NULL)
+/* Cache related errors */
+HDassert(H5E_CANTFLUSH_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ALREADYINIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized"))==NULL)
+HDassert(H5E_CANTSERIALIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to serialize data from cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTSERIALIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTRELEASE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object"))==NULL)
+HDassert(H5E_CANTLOAD_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to load metadata into cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Property list errors */
-assert(H5E_CANTGET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value"))==NULL)
+HDassert(H5E_PROTECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Protected metadata error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value"))==NULL)
+HDassert(H5E_NOTCACHED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Metadata not currently cached"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_DUPCLASS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class"))==NULL)
+HDassert(H5E_SYSTEM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Internal error detected"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_SYSTEM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SETDISALLOWED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Disallowed operation"))==NULL)
+HDassert(H5E_CANTINS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert metadata into cache"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SETDISALLOWED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTINS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Generic low-level file I/O errors */
-assert(H5E_SEEKERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed"))==NULL)
+HDassert(H5E_CANTPROTECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to protect metadata"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_READERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed"))==NULL)
+HDassert(H5E_CANTUNPROTECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_WRITEERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed"))==NULL)
+HDassert(H5E_CANTPIN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to pin cache entry"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CLOSEERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed"))==NULL)
+HDassert(H5E_CANTUNPIN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to un-pin cache entry"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTUNPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_OVERFLOW_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed"))==NULL)
+HDassert(H5E_CANTMARKDIRTY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark a pinned entry as dirty"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTMARKDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FCNTL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed"))==NULL)
+HDassert(H5E_CANTDIRTY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark metadata as dirty"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_CANTEXPUNGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to expunge a metadata cache entry"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTEXPUNGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_CANTRESIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to resize a metadata cache entry"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTRESIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Resource errors */
-assert(H5E_NOSPACE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation"))==NULL)
+/* Argument errors */
+HDassert(H5E_UNINITIALIZED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTALLOC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't allocate space"))==NULL)
+HDassert(H5E_UNSUPPORTED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCOPY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object"))==NULL)
+HDassert(H5E_BADTYPE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTFREE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object"))==NULL)
+HDassert(H5E_BADRANGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ALREADYEXISTS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
+HDassert(H5E_BADVALUE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTLOCK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object"))==NULL)
+
+/* Plugin errors */
+HDassert(H5E_OPENERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open directory or file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_OPENERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTUNLOCK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object"))==NULL)
+
+/* Generic low-level file I/O errors */
+HDassert(H5E_SEEKERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTGC_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect"))==NULL)
+HDassert(H5E_READERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTGETSIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to compute size"))==NULL)
+HDassert(H5E_WRITEERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTGETSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_OBJOPEN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object is already open"))==NULL)
+HDassert(H5E_CLOSEERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OBJOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Datatype conversion errors */
-assert(H5E_CANTCONVERT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL)
+HDassert(H5E_OVERFLOW_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADSIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object"))==NULL)
+HDassert(H5E_FCNTL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Heap errors */
-assert(H5E_CANTRESTORE_g==(-1));
+HDassert(H5E_CANTRESTORE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't restore condition"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTRESTORE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCOMPUTE_g==(-1));
+HDassert(H5E_CANTCOMPUTE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compute value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTCOMPUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTEXTEND_g==(-1));
+HDassert(H5E_CANTEXTEND_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't extend heap's space"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTEXTEND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTATTACH_g==(-1));
+HDassert(H5E_CANTATTACH_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't attach object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTATTACH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTUPDATE_g==(-1));
+HDassert(H5E_CANTUPDATE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't update object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTUPDATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTOPERATE_g==(-1));
+HDassert(H5E_CANTOPERATE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't operate on object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTOPERATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Parallel MPI errors */
-assert(H5E_MPI_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed"))==NULL)
+/* Resource errors */
+HDassert(H5E_NOSPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_MPIERRSTR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
+HDassert(H5E_CANTALLOC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't allocate space"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTRECV_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive data"))==NULL)
+HDassert(H5E_CANTCOPY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* B-tree related errors */
-assert(H5E_NOTFOUND_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL)
+HDassert(H5E_CANTFREE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_EXISTS_g==(-1));
+HDassert(H5E_ALREADYEXISTS_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTENCODE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value"))==NULL)
+HDassert(H5E_CANTLOCK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTDECODE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value"))==NULL)
+HDassert(H5E_CANTUNLOCK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSPLIT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node"))==NULL)
+HDassert(H5E_CANTGC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTREDISTRIBUTE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to redistribute records"))==NULL)
+HDassert(H5E_CANTGETSIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to compute size"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREDISTRIBUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTGETSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSWAP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to swap records"))==NULL)
+HDassert(H5E_OBJOPEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object is already open"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSWAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_OBJOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTINSERT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object"))==NULL)
+
+/* I/O pipeline errors */
+HDassert(H5E_NOFILTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Requested filter is not available"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTLIST_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node"))==NULL)
+HDassert(H5E_CALLBACK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Callback failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTMODIFY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to modify record"))==NULL)
+HDassert(H5E_CANAPPLY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'can apply' callback"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMODIFY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTREMOVE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object"))==NULL)
+HDassert(H5E_SETLOCAL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'set local' callback"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_NOENCODER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter present but encoding disabled"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOENCODER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_CANTFILTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter operation failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Group related errors */
-assert(H5E_CANTOPENOBJ_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object"))==NULL)
+/* Dataspace errors */
+HDassert(H5E_CANTCLIP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCLOSEOBJ_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't close object"))==NULL)
+HDassert(H5E_CANTCOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_COMPLEN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long"))==NULL)
+HDassert(H5E_CANTSELECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_PATH_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with path to object"))==NULL)
+HDassert(H5E_CANTNEXT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PATH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_BADSELECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+HDassert(H5E_CANTCOMPARE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 /* Free space errors */
-assert(H5E_CANTMERGE_g==(-1));
+HDassert(H5E_CANTMERGE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't merge objects"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTMERGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTREVIVE_g==(-1));
+HDassert(H5E_CANTREVIVE_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't revive object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTREVIVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSHRINK_g==(-1));
+HDassert(H5E_CANTSHRINK_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't shrink container"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
 if((H5E_CANTSHRINK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* I/O pipeline errors */
-assert(H5E_NOFILTER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Requested filter is not available"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CALLBACK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Callback failed"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANAPPLY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'can apply' callback"))==NULL)
+/* Object header related errors */
+HDassert(H5E_LINKCOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SETLOCAL_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'set local' callback"))==NULL)
+HDassert(H5E_VERSION_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NOENCODER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter present but encoding disabled"))==NULL)
+HDassert(H5E_ALIGNMENT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOENCODER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTFILTER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Filter operation failed"))==NULL)
+HDassert(H5E_BADMESG_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTFILTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Link related errors */
-assert(H5E_TRAVERSE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Link traversal failure"))==NULL)
+HDassert(H5E_CANTDELETE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TRAVERSE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NLINKS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Too many soft links in path"))==NULL)
+HDassert(H5E_BADITER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Iteration failed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NLINKS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADITER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NOTREGISTERED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered"))==NULL)
+HDassert(H5E_CANTPACK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't pack messages"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTPACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTMOVE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move object"))==NULL)
+HDassert(H5E_CANTRESET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't reset object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTRESET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSORT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't sort objects"))==NULL)
+HDassert(H5E_CANTRENAME_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSORT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* File accessibilty errors */
-assert(H5E_FILEEXISTS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists"))==NULL)
+/* System level errors */
+HDassert(H5E_SYSERRSTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "System error message"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_SYSERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_FILEOPEN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File already open"))==NULL)
+
+/* Datatype conversion errors */
+HDassert(H5E_CANTCONVERT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCREATE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to create file"))==NULL)
+HDassert(H5E_BADSIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTOPENFILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to open file"))==NULL)
+
+/* Object atom related errors */
+HDassert(H5E_BADATOM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCLOSEFILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to close file"))==NULL)
+HDassert(H5E_BADGROUP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NOTHDF5_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Not an HDF5 file"))==NULL)
+HDassert(H5E_CANTREGISTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADFILE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad file ID accessed"))==NULL)
+HDassert(H5E_CANTINC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_TRUNCATED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File has been truncated"))==NULL)
+HDassert(H5E_CANTDEC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_MOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error"))==NULL)
+HDassert(H5E_NOIDS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Cache related errors */
-assert(H5E_CANTFLUSH_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSERIALIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to serialize data from cache"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSERIALIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTLOAD_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to load metadata into cache"))==NULL)
+/* Property list errors */
+HDassert(H5E_CANTGET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_PROTECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Protected metadata error"))==NULL)
+HDassert(H5E_CANTSET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_NOTCACHED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Metadata not currently cached"))==NULL)
+HDassert(H5E_DUPCLASS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_SYSTEM_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Internal error detected"))==NULL)
+HDassert(H5E_SETDISALLOWED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Disallowed operation"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SYSTEM_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_SETDISALLOWED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTINS_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert metadata into cache"))==NULL)
+
+/* B-tree related errors */
+HDassert(H5E_NOTFOUND_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTINS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTPROTECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to protect metadata"))==NULL)
+HDassert(H5E_EXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTUNPROTECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata"))==NULL)
+HDassert(H5E_CANTENCODE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTPIN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to pin cache entry"))==NULL)
+HDassert(H5E_CANTDECODE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTUNPIN_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to un-pin cache entry"))==NULL)
+HDassert(H5E_CANTSPLIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTUNPIN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTMARKDIRTY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark a pinned entry as dirty"))==NULL)
+HDassert(H5E_CANTREDISTRIBUTE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to redistribute records"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTMARKDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTREDISTRIBUTE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTDIRTY_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark metadata as dirty"))==NULL)
+HDassert(H5E_CANTSWAP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to swap records"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDIRTY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTSWAP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTEXPUNGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to expunge a metadata cache entry"))==NULL)
+HDassert(H5E_CANTINSERT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTEXPUNGE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTRESIZE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to resize a metadata cache entry"))==NULL)
+HDassert(H5E_CANTLIST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRESIZE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* System level errors */
-assert(H5E_SYSERRSTR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "System error message"))==NULL)
+HDassert(H5E_CANTMODIFY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to modify record"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_SYSERRSTR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTMODIFY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* No error */
-assert(H5E_NONE_MINOR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "No error"))==NULL)
+HDassert(H5E_CANTREMOVE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_NONE_MINOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Dataspace errors */
-assert(H5E_CANTCLIP_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTSELECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab"))==NULL)
+/* Group related errors */
+HDassert(H5E_CANTOPENOBJ_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTNEXT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location"))==NULL)
+HDassert(H5E_CANTCLOSEOBJ_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't close object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTCLOSEOBJ_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADSELECT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection"))==NULL)
+HDassert(H5E_COMPLEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTCOMPARE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL)
+HDassert(H5E_PATH_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with path to object"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_PATH_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Object header related errors */
-assert(H5E_LINKCOUNT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count"))==NULL)
+/* No error */
+HDassert(H5E_NONE_MINOR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "No error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NONE_MINOR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_VERSION_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number"))==NULL)
+
+/* File accessibilty errors */
+HDassert(H5E_FILEEXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_ALIGNMENT_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error"))==NULL)
+HDassert(H5E_FILEOPEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File already open"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADMESG_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message"))==NULL)
+HDassert(H5E_CANTCREATE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to create file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTDELETE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message"))==NULL)
+HDassert(H5E_CANTOPENFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to open file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADITER_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Iteration failed"))==NULL)
+HDassert(H5E_CANTCLOSEFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to close file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADITER_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTPACK_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't pack messages"))==NULL)
+HDassert(H5E_NOTHDF5_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Not an HDF5 file"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTPACK_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTRESET_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't reset object"))==NULL)
+HDassert(H5E_BADFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad file ID accessed"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRESET_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_CANTRENAME_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename object"))==NULL)
+HDassert(H5E_TRUNCATED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File has been truncated"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-/* Plugin errors */
-assert(H5E_OPENERROR_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open directory or file"))==NULL)
+HDassert(H5E_MOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error"))==NULL)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_OPENERROR_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
+if((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
 #endif /* H5Einit_H */
diff --git a/src/H5Eint.c b/src/H5Eint.c
index 636866b..ab378fb 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -262,7 +262,7 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
         if(cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
-        fprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
+        HDfprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
             (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
             (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
             (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
@@ -277,17 +277,17 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
 
             if(mpi_initialized && !mpi_finalized) {
 	        MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-	        fprintf(stream, "MPI-process %d", mpi_rank);
+	        HDfprintf(stream, "MPI-process %d", mpi_rank);
 	    } /* end if */
             else
-	        fprintf(stream, "thread 0");
+	        HDfprintf(stream, "thread 0");
         } /* end block */
 #elif defined(H5_HAVE_THREADSAFE)
-        fprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong());
+        HDfprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong());
 #else
-        fprintf(stream, "thread 0");
+        HDfprintf(stream, "thread 0");
 #endif
-        fprintf(stream, ":\n");
+        HDfprintf(stream, ":\n");
     } /* end if */
 
     /* Check for "real" error description - used to format output more nicely */
@@ -295,12 +295,12 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
         have_desc=0;
 
     /* Print error message */
-    fprintf(stream, "%*s#%03d: %s line %u in %s()%s%s\n",
+    HDfprintf(stream, "%*s#%03d: %s line %u in %s()%s%s\n",
 	     H5E_INDENT, "", n, err_desc->file_name, err_desc->line,
 	     err_desc->func_name, (have_desc ? ": " : ""),
              (have_desc ? err_desc->desc : ""));
-    fprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
-    fprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
+    HDfprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
+    HDfprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -394,7 +394,7 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
         if(cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
-        fprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
+        HDfprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
             (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
             (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
             (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
@@ -409,17 +409,17 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
 
             if(mpi_initialized && !mpi_finalized) {
 	        MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-	        fprintf(stream, "MPI-process %d", mpi_rank);
+	        HDfprintf(stream, "MPI-process %d", mpi_rank);
 	    } /* end if */
             else
-	        fprintf(stream, "thread 0");
+	        HDfprintf(stream, "thread 0");
         } /* end block */
 #elif defined(H5_HAVE_THREADSAFE)
-        fprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong());
+        HDfprintf(stream, "thread %lu", (unsigned long)HDpthread_self_ulong());
 #else
-        fprintf(stream, "thread 0");
+        HDfprintf(stream, "thread 0");
 #endif
-        fprintf(stream, ":\n");
+        HDfprintf(stream, ":\n");
     } /* end if */
 
     /* Check for "real" error description - used to format output more nicely */
@@ -427,12 +427,12 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
         have_desc = 0;
 
     /* Print error message */
-    fprintf(stream, "%*s#%03u: %s line %u in %s()%s%s\n",
+    HDfprintf(stream, "%*s#%03u: %s line %u in %s()%s%s\n",
 	     H5E_INDENT, "", n, err_desc->file_name, err_desc->line,
 	     err_desc->func_name, (have_desc ? ": " : ""),
              (have_desc ? err_desc->desc : ""));
-    fprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
-    fprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
+    HDfprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
+    HDfprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
index 17659b1..d7694a0 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -26,73 +26,133 @@ extern "C" {
 /* Major error codes */
 /*********************/
 
+#define H5E_IO               (H5OPEN H5E_IO_g)
+#define H5E_SOHM             (H5OPEN H5E_SOHM_g)
 #define H5E_ATTR             (H5OPEN H5E_ATTR_g)
-#define H5E_NONE_MAJOR       (H5OPEN H5E_NONE_MAJOR_g)
-#define H5E_PLINE            (H5OPEN H5E_PLINE_g)
-#define H5E_FSPACE           (H5OPEN H5E_FSPACE_g)
-#define H5E_RS               (H5OPEN H5E_RS_g)
-#define H5E_DATATYPE         (H5OPEN H5E_DATATYPE_g)
-#define H5E_FILE             (H5OPEN H5E_FILE_g)
+#define H5E_PLIST            (H5OPEN H5E_PLIST_g)
+#define H5E_FUNC             (H5OPEN H5E_FUNC_g)
+#define H5E_ERROR            (H5OPEN H5E_ERROR_g)
+#define H5E_STORAGE          (H5OPEN H5E_STORAGE_g)
+#define H5E_OHDR             (H5OPEN H5E_OHDR_g)
 #define H5E_PLUGIN           (H5OPEN H5E_PLUGIN_g)
+#define H5E_TST              (H5OPEN H5E_TST_g)
 #define H5E_DATASET          (H5OPEN H5E_DATASET_g)
-#define H5E_OHDR             (H5OPEN H5E_OHDR_g)
+#define H5E_BTREE            (H5OPEN H5E_BTREE_g)
 #define H5E_SLIST            (H5OPEN H5E_SLIST_g)
-#define H5E_LINK             (H5OPEN H5E_LINK_g)
-#define H5E_RESOURCE         (H5OPEN H5E_RESOURCE_g)
-#define H5E_ERROR            (H5OPEN H5E_ERROR_g)
-#define H5E_INTERNAL         (H5OPEN H5E_INTERNAL_g)
-#define H5E_TST              (H5OPEN H5E_TST_g)
+#define H5E_VFL              (H5OPEN H5E_VFL_g)
+#define H5E_DATASPACE        (H5OPEN H5E_DATASPACE_g)
+#define H5E_DATATYPE         (H5OPEN H5E_DATATYPE_g)
+#define H5E_RS               (H5OPEN H5E_RS_g)
+#define H5E_ATOM             (H5OPEN H5E_ATOM_g)
 #define H5E_CACHE            (H5OPEN H5E_CACHE_g)
-#define H5E_EFL              (H5OPEN H5E_EFL_g)
+#define H5E_INTERNAL         (H5OPEN H5E_INTERNAL_g)
 #define H5E_SYM              (H5OPEN H5E_SYM_g)
+#define H5E_LINK             (H5OPEN H5E_LINK_g)
 #define H5E_HEAP             (H5OPEN H5E_HEAP_g)
+#define H5E_PLINE            (H5OPEN H5E_PLINE_g)
+#define H5E_EFL              (H5OPEN H5E_EFL_g)
 #define H5E_REFERENCE        (H5OPEN H5E_REFERENCE_g)
-#define H5E_FUNC             (H5OPEN H5E_FUNC_g)
-#define H5E_STORAGE          (H5OPEN H5E_STORAGE_g)
-#define H5E_VFL              (H5OPEN H5E_VFL_g)
-#define H5E_SOHM             (H5OPEN H5E_SOHM_g)
-#define H5E_ATOM             (H5OPEN H5E_ATOM_g)
+#define H5E_FILE             (H5OPEN H5E_FILE_g)
+#define H5E_RESOURCE         (H5OPEN H5E_RESOURCE_g)
+#define H5E_NONE_MAJOR       (H5OPEN H5E_NONE_MAJOR_g)
 #define H5E_ARGS             (H5OPEN H5E_ARGS_g)
-#define H5E_BTREE            (H5OPEN H5E_BTREE_g)
-#define H5E_IO               (H5OPEN H5E_IO_g)
-#define H5E_PLIST            (H5OPEN H5E_PLIST_g)
-#define H5E_DATASPACE        (H5OPEN H5E_DATASPACE_g)
+#define H5E_FSPACE           (H5OPEN H5E_FSPACE_g)
+H5_DLLVAR hid_t H5E_IO_g;            /* Low-level I/O */
+H5_DLLVAR hid_t H5E_SOHM_g;          /* Shared Object Header Messages */
 H5_DLLVAR hid_t H5E_ATTR_g;          /* Attribute */
-H5_DLLVAR hid_t H5E_NONE_MAJOR_g;    /* No error */
-H5_DLLVAR hid_t H5E_PLINE_g;         /* Data filters */
-H5_DLLVAR hid_t H5E_FSPACE_g;        /* Free Space Manager */
-H5_DLLVAR hid_t H5E_RS_g;            /* Reference Counted Strings */
-H5_DLLVAR hid_t H5E_DATATYPE_g;      /* Datatype */
-H5_DLLVAR hid_t H5E_FILE_g;          /* File accessibilty */
+H5_DLLVAR hid_t H5E_PLIST_g;         /* Property lists */
+H5_DLLVAR hid_t H5E_FUNC_g;          /* Function entry/exit */
+H5_DLLVAR hid_t H5E_ERROR_g;         /* Error API */
+H5_DLLVAR hid_t H5E_STORAGE_g;       /* Data storage */
+H5_DLLVAR hid_t H5E_OHDR_g;          /* Object header */
 H5_DLLVAR hid_t H5E_PLUGIN_g;        /* Plugin for dynamically loaded library */
+H5_DLLVAR hid_t H5E_TST_g;           /* Ternary Search Trees */
 H5_DLLVAR hid_t H5E_DATASET_g;       /* Dataset */
-H5_DLLVAR hid_t H5E_OHDR_g;          /* Object header */
+H5_DLLVAR hid_t H5E_BTREE_g;         /* B-Tree node */
 H5_DLLVAR hid_t H5E_SLIST_g;         /* Skip Lists */
-H5_DLLVAR hid_t H5E_LINK_g;          /* Links */
-H5_DLLVAR hid_t H5E_RESOURCE_g;      /* Resource unavailable */
-H5_DLLVAR hid_t H5E_ERROR_g;         /* Error API */
-H5_DLLVAR hid_t H5E_INTERNAL_g;      /* Internal error (too specific to document in detail) */
-H5_DLLVAR hid_t H5E_TST_g;           /* Ternary Search Trees */
+H5_DLLVAR hid_t H5E_VFL_g;           /* Virtual File Layer */
+H5_DLLVAR hid_t H5E_DATASPACE_g;     /* Dataspace */
+H5_DLLVAR hid_t H5E_DATATYPE_g;      /* Datatype */
+H5_DLLVAR hid_t H5E_RS_g;            /* Reference Counted Strings */
+H5_DLLVAR hid_t H5E_ATOM_g;          /* Object atom */
 H5_DLLVAR hid_t H5E_CACHE_g;         /* Object cache */
-H5_DLLVAR hid_t H5E_EFL_g;           /* External file list */
+H5_DLLVAR hid_t H5E_INTERNAL_g;      /* Internal error (too specific to document in detail) */
 H5_DLLVAR hid_t H5E_SYM_g;           /* Symbol table */
+H5_DLLVAR hid_t H5E_LINK_g;          /* Links */
 H5_DLLVAR hid_t H5E_HEAP_g;          /* Heap */
+H5_DLLVAR hid_t H5E_PLINE_g;         /* Data filters */
+H5_DLLVAR hid_t H5E_EFL_g;           /* External file list */
 H5_DLLVAR hid_t H5E_REFERENCE_g;     /* References */
-H5_DLLVAR hid_t H5E_FUNC_g;          /* Function entry/exit */
-H5_DLLVAR hid_t H5E_STORAGE_g;       /* Data storage */
-H5_DLLVAR hid_t H5E_VFL_g;           /* Virtual File Layer */
-H5_DLLVAR hid_t H5E_SOHM_g;          /* Shared Object Header Messages */
-H5_DLLVAR hid_t H5E_ATOM_g;          /* Object atom */
+H5_DLLVAR hid_t H5E_FILE_g;          /* File accessibilty */
+H5_DLLVAR hid_t H5E_RESOURCE_g;      /* Resource unavailable */
+H5_DLLVAR hid_t H5E_NONE_MAJOR_g;    /* No error */
 H5_DLLVAR hid_t H5E_ARGS_g;          /* Invalid arguments to routine */
-H5_DLLVAR hid_t H5E_BTREE_g;         /* B-Tree node */
-H5_DLLVAR hid_t H5E_IO_g;            /* Low-level I/O */
-H5_DLLVAR hid_t H5E_PLIST_g;         /* Property lists */
-H5_DLLVAR hid_t H5E_DATASPACE_g;     /* Dataspace */
+H5_DLLVAR hid_t H5E_FSPACE_g;        /* Free Space Manager */
 
 /*********************/
 /* Minor error codes */
 /*********************/
 
+/* Function entry/exit interface errors */
+#define H5E_CANTINIT         (H5OPEN H5E_CANTINIT_g)
+#define H5E_ALREADYINIT      (H5OPEN H5E_ALREADYINIT_g)
+#define H5E_CANTRELEASE      (H5OPEN H5E_CANTRELEASE_g)
+H5_DLLVAR hid_t H5E_CANTINIT_g;      /* Unable to initialize object */
+H5_DLLVAR hid_t H5E_ALREADYINIT_g;   /* Object already initialized */
+H5_DLLVAR hid_t H5E_CANTRELEASE_g;   /* Unable to release object */
+
+/* Link related errors */
+#define H5E_TRAVERSE         (H5OPEN H5E_TRAVERSE_g)
+#define H5E_NLINKS           (H5OPEN H5E_NLINKS_g)
+#define H5E_NOTREGISTERED    (H5OPEN H5E_NOTREGISTERED_g)
+#define H5E_CANTMOVE         (H5OPEN H5E_CANTMOVE_g)
+#define H5E_CANTSORT         (H5OPEN H5E_CANTSORT_g)
+H5_DLLVAR hid_t H5E_TRAVERSE_g;      /* Link traversal failure */
+H5_DLLVAR hid_t H5E_NLINKS_g;        /* Too many soft links in path */
+H5_DLLVAR hid_t H5E_NOTREGISTERED_g; /* Link class not registered */
+H5_DLLVAR hid_t H5E_CANTMOVE_g;      /* Can't move object */
+H5_DLLVAR hid_t H5E_CANTSORT_g;      /* Can't sort objects */
+
+/* Parallel MPI errors */
+#define H5E_MPI              (H5OPEN H5E_MPI_g)
+#define H5E_MPIERRSTR        (H5OPEN H5E_MPIERRSTR_g)
+#define H5E_CANTRECV         (H5OPEN H5E_CANTRECV_g)
+H5_DLLVAR hid_t H5E_MPI_g;           /* Some MPI function failed */
+H5_DLLVAR hid_t H5E_MPIERRSTR_g;     /* MPI Error String */
+H5_DLLVAR hid_t H5E_CANTRECV_g;      /* Can't receive data */
+
+/* Cache related errors */
+#define H5E_CANTFLUSH        (H5OPEN H5E_CANTFLUSH_g)
+#define H5E_CANTSERIALIZE    (H5OPEN H5E_CANTSERIALIZE_g)
+#define H5E_CANTLOAD         (H5OPEN H5E_CANTLOAD_g)
+#define H5E_PROTECT          (H5OPEN H5E_PROTECT_g)
+#define H5E_NOTCACHED        (H5OPEN H5E_NOTCACHED_g)
+#define H5E_SYSTEM           (H5OPEN H5E_SYSTEM_g)
+#define H5E_CANTINS          (H5OPEN H5E_CANTINS_g)
+#define H5E_CANTPROTECT      (H5OPEN H5E_CANTPROTECT_g)
+#define H5E_CANTUNPROTECT    (H5OPEN H5E_CANTUNPROTECT_g)
+#define H5E_CANTPIN          (H5OPEN H5E_CANTPIN_g)
+#define H5E_CANTUNPIN        (H5OPEN H5E_CANTUNPIN_g)
+#define H5E_CANTMARKDIRTY    (H5OPEN H5E_CANTMARKDIRTY_g)
+#define H5E_CANTDIRTY        (H5OPEN H5E_CANTDIRTY_g)
+#define H5E_CANTEXPUNGE      (H5OPEN H5E_CANTEXPUNGE_g)
+#define H5E_CANTRESIZE       (H5OPEN H5E_CANTRESIZE_g)
+H5_DLLVAR hid_t H5E_CANTFLUSH_g;     /* Unable to flush data from cache */
+H5_DLLVAR hid_t H5E_CANTSERIALIZE_g; /* Unable to serialize data from cache */
+H5_DLLVAR hid_t H5E_CANTLOAD_g;      /* Unable to load metadata into cache */
+H5_DLLVAR hid_t H5E_PROTECT_g;       /* Protected metadata error */
+H5_DLLVAR hid_t H5E_NOTCACHED_g;     /* Metadata not currently cached */
+H5_DLLVAR hid_t H5E_SYSTEM_g;        /* Internal error detected */
+H5_DLLVAR hid_t H5E_CANTINS_g;       /* Unable to insert metadata into cache */
+H5_DLLVAR hid_t H5E_CANTPROTECT_g;   /* Unable to protect metadata */
+H5_DLLVAR hid_t H5E_CANTUNPROTECT_g; /* Unable to unprotect metadata */
+H5_DLLVAR hid_t H5E_CANTPIN_g;       /* Unable to pin cache entry */
+H5_DLLVAR hid_t H5E_CANTUNPIN_g;     /* Unable to un-pin cache entry */
+H5_DLLVAR hid_t H5E_CANTMARKDIRTY_g; /* Unable to mark a pinned entry as dirty */
+H5_DLLVAR hid_t H5E_CANTDIRTY_g;     /* Unable to mark metadata as dirty */
+H5_DLLVAR hid_t H5E_CANTEXPUNGE_g;   /* Unable to expunge a metadata cache entry */
+H5_DLLVAR hid_t H5E_CANTRESIZE_g;    /* Unable to resize a metadata cache entry */
+
 /* Argument errors */
 #define H5E_UNINITIALIZED    (H5OPEN H5E_UNINITIALIZED_g)
 #define H5E_UNSUPPORTED      (H5OPEN H5E_UNSUPPORTED_g)
@@ -105,37 +165,9 @@ H5_DLLVAR hid_t H5E_BADTYPE_g;       /* Inappropriate type */
 H5_DLLVAR hid_t H5E_BADRANGE_g;      /* Out of range */
 H5_DLLVAR hid_t H5E_BADVALUE_g;      /* Bad value */
 
-/* Object atom related errors */
-#define H5E_BADATOM          (H5OPEN H5E_BADATOM_g)
-#define H5E_BADGROUP         (H5OPEN H5E_BADGROUP_g)
-#define H5E_CANTREGISTER     (H5OPEN H5E_CANTREGISTER_g)
-#define H5E_CANTINC          (H5OPEN H5E_CANTINC_g)
-#define H5E_CANTDEC          (H5OPEN H5E_CANTDEC_g)
-#define H5E_NOIDS            (H5OPEN H5E_NOIDS_g)
-H5_DLLVAR hid_t H5E_BADATOM_g;       /* Unable to find atom information (already closed?) */
-H5_DLLVAR hid_t H5E_BADGROUP_g;      /* Unable to find ID group information */
-H5_DLLVAR hid_t H5E_CANTREGISTER_g;  /* Unable to register new atom */
-H5_DLLVAR hid_t H5E_CANTINC_g;       /* Unable to increment reference count */
-H5_DLLVAR hid_t H5E_CANTDEC_g;       /* Unable to decrement reference count */
-H5_DLLVAR hid_t H5E_NOIDS_g;         /* Out of IDs for group */
-
-/* Function entry/exit interface errors */
-#define H5E_CANTINIT         (H5OPEN H5E_CANTINIT_g)
-#define H5E_ALREADYINIT      (H5OPEN H5E_ALREADYINIT_g)
-#define H5E_CANTRELEASE      (H5OPEN H5E_CANTRELEASE_g)
-H5_DLLVAR hid_t H5E_CANTINIT_g;      /* Unable to initialize object */
-H5_DLLVAR hid_t H5E_ALREADYINIT_g;   /* Object already initialized */
-H5_DLLVAR hid_t H5E_CANTRELEASE_g;   /* Unable to release object */
-
-/* Property list errors */
-#define H5E_CANTGET          (H5OPEN H5E_CANTGET_g)
-#define H5E_CANTSET          (H5OPEN H5E_CANTSET_g)
-#define H5E_DUPCLASS         (H5OPEN H5E_DUPCLASS_g)
-#define H5E_SETDISALLOWED    (H5OPEN H5E_SETDISALLOWED_g)
-H5_DLLVAR hid_t H5E_CANTGET_g;       /* Can't get value */
-H5_DLLVAR hid_t H5E_CANTSET_g;       /* Can't set value */
-H5_DLLVAR hid_t H5E_DUPCLASS_g;      /* Duplicate class name in parent class */
-H5_DLLVAR hid_t H5E_SETDISALLOWED_g; /* Disallowed operation */
+/* Plugin errors */
+#define H5E_OPENERROR        (H5OPEN H5E_OPENERROR_g)
+H5_DLLVAR hid_t H5E_OPENERROR_g;     /* Can't open directory or file */
 
 /* Generic low-level file I/O errors */
 #define H5E_SEEKERROR        (H5OPEN H5E_SEEKERROR_g)
@@ -151,6 +183,20 @@ H5_DLLVAR hid_t H5E_CLOSEERROR_g;    /* Close failed */
 H5_DLLVAR hid_t H5E_OVERFLOW_g;      /* Address overflowed */
 H5_DLLVAR hid_t H5E_FCNTL_g;         /* File control (fcntl) failed */
 
+/* Heap errors */
+#define H5E_CANTRESTORE      (H5OPEN H5E_CANTRESTORE_g)
+#define H5E_CANTCOMPUTE      (H5OPEN H5E_CANTCOMPUTE_g)
+#define H5E_CANTEXTEND       (H5OPEN H5E_CANTEXTEND_g)
+#define H5E_CANTATTACH       (H5OPEN H5E_CANTATTACH_g)
+#define H5E_CANTUPDATE       (H5OPEN H5E_CANTUPDATE_g)
+#define H5E_CANTOPERATE      (H5OPEN H5E_CANTOPERATE_g)
+H5_DLLVAR hid_t H5E_CANTRESTORE_g;   /* Can't restore condition */
+H5_DLLVAR hid_t H5E_CANTCOMPUTE_g;   /* Can't compute value */
+H5_DLLVAR hid_t H5E_CANTEXTEND_g;    /* Can't extend heap's space */
+H5_DLLVAR hid_t H5E_CANTATTACH_g;    /* Can't attach object */
+H5_DLLVAR hid_t H5E_CANTUPDATE_g;    /* Can't update object */
+H5_DLLVAR hid_t H5E_CANTOPERATE_g;   /* Can't operate on object */
+
 /* Resource errors */
 #define H5E_NOSPACE          (H5OPEN H5E_NOSPACE_g)
 #define H5E_CANTALLOC        (H5OPEN H5E_CANTALLOC_g)
@@ -173,33 +219,95 @@ H5_DLLVAR hid_t H5E_CANTGC_g;        /* Unable to garbage collect */
 H5_DLLVAR hid_t H5E_CANTGETSIZE_g;   /* Unable to compute size */
 H5_DLLVAR hid_t H5E_OBJOPEN_g;       /* Object is already open */
 
+/* I/O pipeline errors */
+#define H5E_NOFILTER         (H5OPEN H5E_NOFILTER_g)
+#define H5E_CALLBACK         (H5OPEN H5E_CALLBACK_g)
+#define H5E_CANAPPLY         (H5OPEN H5E_CANAPPLY_g)
+#define H5E_SETLOCAL         (H5OPEN H5E_SETLOCAL_g)
+#define H5E_NOENCODER        (H5OPEN H5E_NOENCODER_g)
+#define H5E_CANTFILTER       (H5OPEN H5E_CANTFILTER_g)
+H5_DLLVAR hid_t H5E_NOFILTER_g;      /* Requested filter is not available */
+H5_DLLVAR hid_t H5E_CALLBACK_g;      /* Callback failed */
+H5_DLLVAR hid_t H5E_CANAPPLY_g;      /* Error from filter 'can apply' callback */
+H5_DLLVAR hid_t H5E_SETLOCAL_g;      /* Error from filter 'set local' callback */
+H5_DLLVAR hid_t H5E_NOENCODER_g;     /* Filter present but encoding disabled */
+H5_DLLVAR hid_t H5E_CANTFILTER_g;    /* Filter operation failed */
+
+/* Dataspace errors */
+#define H5E_CANTCLIP         (H5OPEN H5E_CANTCLIP_g)
+#define H5E_CANTCOUNT        (H5OPEN H5E_CANTCOUNT_g)
+#define H5E_CANTSELECT       (H5OPEN H5E_CANTSELECT_g)
+#define H5E_CANTNEXT         (H5OPEN H5E_CANTNEXT_g)
+#define H5E_BADSELECT        (H5OPEN H5E_BADSELECT_g)
+#define H5E_CANTCOMPARE      (H5OPEN H5E_CANTCOMPARE_g)
+H5_DLLVAR hid_t H5E_CANTCLIP_g;      /* Can't clip hyperslab region */
+H5_DLLVAR hid_t H5E_CANTCOUNT_g;     /* Can't count elements */
+H5_DLLVAR hid_t H5E_CANTSELECT_g;    /* Can't select hyperslab */
+H5_DLLVAR hid_t H5E_CANTNEXT_g;      /* Can't move to next iterator location */
+H5_DLLVAR hid_t H5E_BADSELECT_g;     /* Invalid selection */
+H5_DLLVAR hid_t H5E_CANTCOMPARE_g;   /* Can't compare objects */
+
+/* Free space errors */
+#define H5E_CANTMERGE        (H5OPEN H5E_CANTMERGE_g)
+#define H5E_CANTREVIVE       (H5OPEN H5E_CANTREVIVE_g)
+#define H5E_CANTSHRINK       (H5OPEN H5E_CANTSHRINK_g)
+H5_DLLVAR hid_t H5E_CANTMERGE_g;     /* Can't merge objects */
+H5_DLLVAR hid_t H5E_CANTREVIVE_g;    /* Can't revive object */
+H5_DLLVAR hid_t H5E_CANTSHRINK_g;    /* Can't shrink container */
+
+/* Object header related errors */
+#define H5E_LINKCOUNT        (H5OPEN H5E_LINKCOUNT_g)
+#define H5E_VERSION          (H5OPEN H5E_VERSION_g)
+#define H5E_ALIGNMENT        (H5OPEN H5E_ALIGNMENT_g)
+#define H5E_BADMESG          (H5OPEN H5E_BADMESG_g)
+#define H5E_CANTDELETE       (H5OPEN H5E_CANTDELETE_g)
+#define H5E_BADITER          (H5OPEN H5E_BADITER_g)
+#define H5E_CANTPACK         (H5OPEN H5E_CANTPACK_g)
+#define H5E_CANTRESET        (H5OPEN H5E_CANTRESET_g)
+#define H5E_CANTRENAME       (H5OPEN H5E_CANTRENAME_g)
+H5_DLLVAR hid_t H5E_LINKCOUNT_g;     /* Bad object header link count */
+H5_DLLVAR hid_t H5E_VERSION_g;       /* Wrong version number */
+H5_DLLVAR hid_t H5E_ALIGNMENT_g;     /* Alignment error */
+H5_DLLVAR hid_t H5E_BADMESG_g;       /* Unrecognized message */
+H5_DLLVAR hid_t H5E_CANTDELETE_g;    /* Can't delete message */
+H5_DLLVAR hid_t H5E_BADITER_g;       /* Iteration failed */
+H5_DLLVAR hid_t H5E_CANTPACK_g;      /* Can't pack messages */
+H5_DLLVAR hid_t H5E_CANTRESET_g;     /* Can't reset object */
+H5_DLLVAR hid_t H5E_CANTRENAME_g;    /* Unable to rename object */
+
+/* System level errors */
+#define H5E_SYSERRSTR        (H5OPEN H5E_SYSERRSTR_g)
+H5_DLLVAR hid_t H5E_SYSERRSTR_g;     /* System error message */
+
 /* Datatype conversion errors */
 #define H5E_CANTCONVERT      (H5OPEN H5E_CANTCONVERT_g)
 #define H5E_BADSIZE          (H5OPEN H5E_BADSIZE_g)
 H5_DLLVAR hid_t H5E_CANTCONVERT_g;   /* Can't convert datatypes */
 H5_DLLVAR hid_t H5E_BADSIZE_g;       /* Bad size for object */
 
-/* Heap errors */
-#define H5E_CANTRESTORE      (H5OPEN H5E_CANTRESTORE_g)
-#define H5E_CANTCOMPUTE      (H5OPEN H5E_CANTCOMPUTE_g)
-#define H5E_CANTEXTEND       (H5OPEN H5E_CANTEXTEND_g)
-#define H5E_CANTATTACH       (H5OPEN H5E_CANTATTACH_g)
-#define H5E_CANTUPDATE       (H5OPEN H5E_CANTUPDATE_g)
-#define H5E_CANTOPERATE      (H5OPEN H5E_CANTOPERATE_g)
-H5_DLLVAR hid_t H5E_CANTRESTORE_g;   /* Can't restore condition */
-H5_DLLVAR hid_t H5E_CANTCOMPUTE_g;   /* Can't compute value */
-H5_DLLVAR hid_t H5E_CANTEXTEND_g;    /* Can't extend heap's space */
-H5_DLLVAR hid_t H5E_CANTATTACH_g;    /* Can't attach object */
-H5_DLLVAR hid_t H5E_CANTUPDATE_g;    /* Can't update object */
-H5_DLLVAR hid_t H5E_CANTOPERATE_g;   /* Can't operate on object */
+/* Object atom related errors */
+#define H5E_BADATOM          (H5OPEN H5E_BADATOM_g)
+#define H5E_BADGROUP         (H5OPEN H5E_BADGROUP_g)
+#define H5E_CANTREGISTER     (H5OPEN H5E_CANTREGISTER_g)
+#define H5E_CANTINC          (H5OPEN H5E_CANTINC_g)
+#define H5E_CANTDEC          (H5OPEN H5E_CANTDEC_g)
+#define H5E_NOIDS            (H5OPEN H5E_NOIDS_g)
+H5_DLLVAR hid_t H5E_BADATOM_g;       /* Unable to find atom information (already closed?) */
+H5_DLLVAR hid_t H5E_BADGROUP_g;      /* Unable to find ID group information */
+H5_DLLVAR hid_t H5E_CANTREGISTER_g;  /* Unable to register new atom */
+H5_DLLVAR hid_t H5E_CANTINC_g;       /* Unable to increment reference count */
+H5_DLLVAR hid_t H5E_CANTDEC_g;       /* Unable to decrement reference count */
+H5_DLLVAR hid_t H5E_NOIDS_g;         /* Out of IDs for group */
 
-/* Parallel MPI errors */
-#define H5E_MPI              (H5OPEN H5E_MPI_g)
-#define H5E_MPIERRSTR        (H5OPEN H5E_MPIERRSTR_g)
-#define H5E_CANTRECV         (H5OPEN H5E_CANTRECV_g)
-H5_DLLVAR hid_t H5E_MPI_g;           /* Some MPI function failed */
-H5_DLLVAR hid_t H5E_MPIERRSTR_g;     /* MPI Error String */
-H5_DLLVAR hid_t H5E_CANTRECV_g;      /* Can't receive data */
+/* Property list errors */
+#define H5E_CANTGET          (H5OPEN H5E_CANTGET_g)
+#define H5E_CANTSET          (H5OPEN H5E_CANTSET_g)
+#define H5E_DUPCLASS         (H5OPEN H5E_DUPCLASS_g)
+#define H5E_SETDISALLOWED    (H5OPEN H5E_SETDISALLOWED_g)
+H5_DLLVAR hid_t H5E_CANTGET_g;       /* Can't get value */
+H5_DLLVAR hid_t H5E_CANTSET_g;       /* Can't set value */
+H5_DLLVAR hid_t H5E_DUPCLASS_g;      /* Duplicate class name in parent class */
+H5_DLLVAR hid_t H5E_SETDISALLOWED_g; /* Disallowed operation */
 
 /* B-tree related errors */
 #define H5E_NOTFOUND         (H5OPEN H5E_NOTFOUND_g)
@@ -235,39 +343,9 @@ H5_DLLVAR hid_t H5E_CANTCLOSEOBJ_g;  /* Can't close object */
 H5_DLLVAR hid_t H5E_COMPLEN_g;       /* Name component is too long */
 H5_DLLVAR hid_t H5E_PATH_g;          /* Problem with path to object */
 
-/* Free space errors */
-#define H5E_CANTMERGE        (H5OPEN H5E_CANTMERGE_g)
-#define H5E_CANTREVIVE       (H5OPEN H5E_CANTREVIVE_g)
-#define H5E_CANTSHRINK       (H5OPEN H5E_CANTSHRINK_g)
-H5_DLLVAR hid_t H5E_CANTMERGE_g;     /* Can't merge objects */
-H5_DLLVAR hid_t H5E_CANTREVIVE_g;    /* Can't revive object */
-H5_DLLVAR hid_t H5E_CANTSHRINK_g;    /* Can't shrink container */
-
-/* I/O pipeline errors */
-#define H5E_NOFILTER         (H5OPEN H5E_NOFILTER_g)
-#define H5E_CALLBACK         (H5OPEN H5E_CALLBACK_g)
-#define H5E_CANAPPLY         (H5OPEN H5E_CANAPPLY_g)
-#define H5E_SETLOCAL         (H5OPEN H5E_SETLOCAL_g)
-#define H5E_NOENCODER        (H5OPEN H5E_NOENCODER_g)
-#define H5E_CANTFILTER       (H5OPEN H5E_CANTFILTER_g)
-H5_DLLVAR hid_t H5E_NOFILTER_g;      /* Requested filter is not available */
-H5_DLLVAR hid_t H5E_CALLBACK_g;      /* Callback failed */
-H5_DLLVAR hid_t H5E_CANAPPLY_g;      /* Error from filter 'can apply' callback */
-H5_DLLVAR hid_t H5E_SETLOCAL_g;      /* Error from filter 'set local' callback */
-H5_DLLVAR hid_t H5E_NOENCODER_g;     /* Filter present but encoding disabled */
-H5_DLLVAR hid_t H5E_CANTFILTER_g;    /* Filter operation failed */
-
-/* Link related errors */
-#define H5E_TRAVERSE         (H5OPEN H5E_TRAVERSE_g)
-#define H5E_NLINKS           (H5OPEN H5E_NLINKS_g)
-#define H5E_NOTREGISTERED    (H5OPEN H5E_NOTREGISTERED_g)
-#define H5E_CANTMOVE         (H5OPEN H5E_CANTMOVE_g)
-#define H5E_CANTSORT         (H5OPEN H5E_CANTSORT_g)
-H5_DLLVAR hid_t H5E_TRAVERSE_g;      /* Link traversal failure */
-H5_DLLVAR hid_t H5E_NLINKS_g;        /* Too many soft links in path */
-H5_DLLVAR hid_t H5E_NOTREGISTERED_g; /* Link class not registered */
-H5_DLLVAR hid_t H5E_CANTMOVE_g;      /* Can't move object */
-H5_DLLVAR hid_t H5E_CANTSORT_g;      /* Can't sort objects */
+/* No error */
+#define H5E_NONE_MINOR       (H5OPEN H5E_NONE_MINOR_g)
+H5_DLLVAR hid_t H5E_NONE_MINOR_g;    /* No error */
 
 /* File accessibilty errors */
 #define H5E_FILEEXISTS       (H5OPEN H5E_FILEEXISTS_g)
@@ -289,84 +367,6 @@ H5_DLLVAR hid_t H5E_BADFILE_g;       /* Bad file ID accessed */
 H5_DLLVAR hid_t H5E_TRUNCATED_g;     /* File has been truncated */
 H5_DLLVAR hid_t H5E_MOUNT_g;         /* File mount error */
 
-/* Cache related errors */
-#define H5E_CANTFLUSH        (H5OPEN H5E_CANTFLUSH_g)
-#define H5E_CANTSERIALIZE    (H5OPEN H5E_CANTSERIALIZE_g)
-#define H5E_CANTLOAD         (H5OPEN H5E_CANTLOAD_g)
-#define H5E_PROTECT          (H5OPEN H5E_PROTECT_g)
-#define H5E_NOTCACHED        (H5OPEN H5E_NOTCACHED_g)
-#define H5E_SYSTEM           (H5OPEN H5E_SYSTEM_g)
-#define H5E_CANTINS          (H5OPEN H5E_CANTINS_g)
-#define H5E_CANTPROTECT      (H5OPEN H5E_CANTPROTECT_g)
-#define H5E_CANTUNPROTECT    (H5OPEN H5E_CANTUNPROTECT_g)
-#define H5E_CANTPIN          (H5OPEN H5E_CANTPIN_g)
-#define H5E_CANTUNPIN        (H5OPEN H5E_CANTUNPIN_g)
-#define H5E_CANTMARKDIRTY    (H5OPEN H5E_CANTMARKDIRTY_g)
-#define H5E_CANTDIRTY        (H5OPEN H5E_CANTDIRTY_g)
-#define H5E_CANTEXPUNGE      (H5OPEN H5E_CANTEXPUNGE_g)
-#define H5E_CANTRESIZE       (H5OPEN H5E_CANTRESIZE_g)
-H5_DLLVAR hid_t H5E_CANTFLUSH_g;     /* Unable to flush data from cache */
-H5_DLLVAR hid_t H5E_CANTSERIALIZE_g; /* Unable to serialize data from cache */
-H5_DLLVAR hid_t H5E_CANTLOAD_g;      /* Unable to load metadata into cache */
-H5_DLLVAR hid_t H5E_PROTECT_g;       /* Protected metadata error */
-H5_DLLVAR hid_t H5E_NOTCACHED_g;     /* Metadata not currently cached */
-H5_DLLVAR hid_t H5E_SYSTEM_g;        /* Internal error detected */
-H5_DLLVAR hid_t H5E_CANTINS_g;       /* Unable to insert metadata into cache */
-H5_DLLVAR hid_t H5E_CANTPROTECT_g;   /* Unable to protect metadata */
-H5_DLLVAR hid_t H5E_CANTUNPROTECT_g; /* Unable to unprotect metadata */
-H5_DLLVAR hid_t H5E_CANTPIN_g;       /* Unable to pin cache entry */
-H5_DLLVAR hid_t H5E_CANTUNPIN_g;     /* Unable to un-pin cache entry */
-H5_DLLVAR hid_t H5E_CANTMARKDIRTY_g; /* Unable to mark a pinned entry as dirty */
-H5_DLLVAR hid_t H5E_CANTDIRTY_g;     /* Unable to mark metadata as dirty */
-H5_DLLVAR hid_t H5E_CANTEXPUNGE_g;   /* Unable to expunge a metadata cache entry */
-H5_DLLVAR hid_t H5E_CANTRESIZE_g;    /* Unable to resize a metadata cache entry */
-
-/* System level errors */
-#define H5E_SYSERRSTR        (H5OPEN H5E_SYSERRSTR_g)
-H5_DLLVAR hid_t H5E_SYSERRSTR_g;     /* System error message */
-
-/* No error */
-#define H5E_NONE_MINOR       (H5OPEN H5E_NONE_MINOR_g)
-H5_DLLVAR hid_t H5E_NONE_MINOR_g;    /* No error */
-
-/* Dataspace errors */
-#define H5E_CANTCLIP         (H5OPEN H5E_CANTCLIP_g)
-#define H5E_CANTCOUNT        (H5OPEN H5E_CANTCOUNT_g)
-#define H5E_CANTSELECT       (H5OPEN H5E_CANTSELECT_g)
-#define H5E_CANTNEXT         (H5OPEN H5E_CANTNEXT_g)
-#define H5E_BADSELECT        (H5OPEN H5E_BADSELECT_g)
-#define H5E_CANTCOMPARE      (H5OPEN H5E_CANTCOMPARE_g)
-H5_DLLVAR hid_t H5E_CANTCLIP_g;      /* Can't clip hyperslab region */
-H5_DLLVAR hid_t H5E_CANTCOUNT_g;     /* Can't count elements */
-H5_DLLVAR hid_t H5E_CANTSELECT_g;    /* Can't select hyperslab */
-H5_DLLVAR hid_t H5E_CANTNEXT_g;      /* Can't move to next iterator location */
-H5_DLLVAR hid_t H5E_BADSELECT_g;     /* Invalid selection */
-H5_DLLVAR hid_t H5E_CANTCOMPARE_g;   /* Can't compare objects */
-
-/* Object header related errors */
-#define H5E_LINKCOUNT        (H5OPEN H5E_LINKCOUNT_g)
-#define H5E_VERSION          (H5OPEN H5E_VERSION_g)
-#define H5E_ALIGNMENT        (H5OPEN H5E_ALIGNMENT_g)
-#define H5E_BADMESG          (H5OPEN H5E_BADMESG_g)
-#define H5E_CANTDELETE       (H5OPEN H5E_CANTDELETE_g)
-#define H5E_BADITER          (H5OPEN H5E_BADITER_g)
-#define H5E_CANTPACK         (H5OPEN H5E_CANTPACK_g)
-#define H5E_CANTRESET        (H5OPEN H5E_CANTRESET_g)
-#define H5E_CANTRENAME       (H5OPEN H5E_CANTRENAME_g)
-H5_DLLVAR hid_t H5E_LINKCOUNT_g;     /* Bad object header link count */
-H5_DLLVAR hid_t H5E_VERSION_g;       /* Wrong version number */
-H5_DLLVAR hid_t H5E_ALIGNMENT_g;     /* Alignment error */
-H5_DLLVAR hid_t H5E_BADMESG_g;       /* Unrecognized message */
-H5_DLLVAR hid_t H5E_CANTDELETE_g;    /* Can't delete message */
-H5_DLLVAR hid_t H5E_BADITER_g;       /* Iteration failed */
-H5_DLLVAR hid_t H5E_CANTPACK_g;      /* Can't pack messages */
-H5_DLLVAR hid_t H5E_CANTRESET_g;     /* Can't reset object */
-H5_DLLVAR hid_t H5E_CANTRENAME_g;    /* Unable to rename object */
-
-/* Plugin errors */
-#define H5E_OPENERROR        (H5OPEN H5E_OPENERROR_g)
-H5_DLLVAR hid_t H5E_OPENERROR_g;     /* Can't open directory or file */
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
index 36fda92..b3bdecc 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -20,41 +20,75 @@
 
 /* Reset major error IDs */
     
+H5E_IO_g=    
+H5E_SOHM_g=    
 H5E_ATTR_g=    
-H5E_NONE_MAJOR_g=    
-H5E_PLINE_g=    
-H5E_FSPACE_g=    
-H5E_RS_g=    
-H5E_DATATYPE_g=    
-H5E_FILE_g=    
+H5E_PLIST_g=    
+H5E_FUNC_g=    
+H5E_ERROR_g=    
+H5E_STORAGE_g=    
+H5E_OHDR_g=    
 H5E_PLUGIN_g=    
+H5E_TST_g=    
 H5E_DATASET_g=    
-H5E_OHDR_g=    
+H5E_BTREE_g=    
 H5E_SLIST_g=    
-H5E_LINK_g=    
-H5E_RESOURCE_g=    
-H5E_ERROR_g=    
-H5E_INTERNAL_g=    
-H5E_TST_g=    
+H5E_VFL_g=    
+H5E_DATASPACE_g=    
+H5E_DATATYPE_g=    
+H5E_RS_g=    
+H5E_ATOM_g=    
 H5E_CACHE_g=    
-H5E_EFL_g=    
+H5E_INTERNAL_g=    
 H5E_SYM_g=    
+H5E_LINK_g=    
 H5E_HEAP_g=    
+H5E_PLINE_g=    
+H5E_EFL_g=    
 H5E_REFERENCE_g=    
-H5E_FUNC_g=    
-H5E_STORAGE_g=    
-H5E_VFL_g=    
-H5E_SOHM_g=    
-H5E_ATOM_g=    
+H5E_FILE_g=    
+H5E_RESOURCE_g=    
+H5E_NONE_MAJOR_g=    
 H5E_ARGS_g=    
-H5E_BTREE_g=    
-H5E_IO_g=    
-H5E_PLIST_g=    
-H5E_DATASPACE_g= (-1);
+H5E_FSPACE_g= (-1);
 
 /* Reset minor error IDs */
 
 
+/* Function entry/exit interface errors */    
+H5E_CANTINIT_g=    
+H5E_ALREADYINIT_g=    
+H5E_CANTRELEASE_g=
+
+/* Link related errors */    
+H5E_TRAVERSE_g=    
+H5E_NLINKS_g=    
+H5E_NOTREGISTERED_g=    
+H5E_CANTMOVE_g=    
+H5E_CANTSORT_g=
+
+/* Parallel MPI errors */    
+H5E_MPI_g=    
+H5E_MPIERRSTR_g=    
+H5E_CANTRECV_g=
+
+/* Cache related errors */    
+H5E_CANTFLUSH_g=    
+H5E_CANTSERIALIZE_g=    
+H5E_CANTLOAD_g=    
+H5E_PROTECT_g=    
+H5E_NOTCACHED_g=    
+H5E_SYSTEM_g=    
+H5E_CANTINS_g=    
+H5E_CANTPROTECT_g=    
+H5E_CANTUNPROTECT_g=    
+H5E_CANTPIN_g=    
+H5E_CANTUNPIN_g=    
+H5E_CANTMARKDIRTY_g=    
+H5E_CANTDIRTY_g=    
+H5E_CANTEXPUNGE_g=    
+H5E_CANTRESIZE_g=
+
 /* Argument errors */    
 H5E_UNINITIALIZED_g=    
 H5E_UNSUPPORTED_g=    
@@ -62,24 +96,8 @@ H5E_BADTYPE_g=
 H5E_BADRANGE_g=    
 H5E_BADVALUE_g=
 
-/* Object atom related errors */    
-H5E_BADATOM_g=    
-H5E_BADGROUP_g=    
-H5E_CANTREGISTER_g=    
-H5E_CANTINC_g=    
-H5E_CANTDEC_g=    
-H5E_NOIDS_g=
-
-/* Function entry/exit interface errors */    
-H5E_CANTINIT_g=    
-H5E_ALREADYINIT_g=    
-H5E_CANTRELEASE_g=
-
-/* Property list errors */    
-H5E_CANTGET_g=    
-H5E_CANTSET_g=    
-H5E_DUPCLASS_g=    
-H5E_SETDISALLOWED_g=
+/* Plugin errors */    
+H5E_OPENERROR_g=
 
 /* Generic low-level file I/O errors */    
 H5E_SEEKERROR_g=    
@@ -89,6 +107,14 @@ H5E_CLOSEERROR_g=
 H5E_OVERFLOW_g=    
 H5E_FCNTL_g=
 
+/* Heap errors */    
+H5E_CANTRESTORE_g=    
+H5E_CANTCOMPUTE_g=    
+H5E_CANTEXTEND_g=    
+H5E_CANTATTACH_g=    
+H5E_CANTUPDATE_g=    
+H5E_CANTOPERATE_g=
+
 /* Resource errors */    
 H5E_NOSPACE_g=    
 H5E_CANTALLOC_g=    
@@ -101,22 +127,58 @@ H5E_CANTGC_g=
 H5E_CANTGETSIZE_g=    
 H5E_OBJOPEN_g=
 
+/* I/O pipeline errors */    
+H5E_NOFILTER_g=    
+H5E_CALLBACK_g=    
+H5E_CANAPPLY_g=    
+H5E_SETLOCAL_g=    
+H5E_NOENCODER_g=    
+H5E_CANTFILTER_g=
+
+/* Dataspace errors */    
+H5E_CANTCLIP_g=    
+H5E_CANTCOUNT_g=    
+H5E_CANTSELECT_g=    
+H5E_CANTNEXT_g=    
+H5E_BADSELECT_g=    
+H5E_CANTCOMPARE_g=
+
+/* Free space errors */    
+H5E_CANTMERGE_g=    
+H5E_CANTREVIVE_g=    
+H5E_CANTSHRINK_g=
+
+/* Object header related errors */    
+H5E_LINKCOUNT_g=    
+H5E_VERSION_g=    
+H5E_ALIGNMENT_g=    
+H5E_BADMESG_g=    
+H5E_CANTDELETE_g=    
+H5E_BADITER_g=    
+H5E_CANTPACK_g=    
+H5E_CANTRESET_g=    
+H5E_CANTRENAME_g=
+
+/* System level errors */    
+H5E_SYSERRSTR_g=
+
 /* Datatype conversion errors */    
 H5E_CANTCONVERT_g=    
 H5E_BADSIZE_g=
 
-/* Heap errors */    
-H5E_CANTRESTORE_g=    
-H5E_CANTCOMPUTE_g=    
-H5E_CANTEXTEND_g=    
-H5E_CANTATTACH_g=    
-H5E_CANTUPDATE_g=    
-H5E_CANTOPERATE_g=
+/* Object atom related errors */    
+H5E_BADATOM_g=    
+H5E_BADGROUP_g=    
+H5E_CANTREGISTER_g=    
+H5E_CANTINC_g=    
+H5E_CANTDEC_g=    
+H5E_NOIDS_g=
 
-/* Parallel MPI errors */    
-H5E_MPI_g=    
-H5E_MPIERRSTR_g=    
-H5E_CANTRECV_g=
+/* Property list errors */    
+H5E_CANTGET_g=    
+H5E_CANTSET_g=    
+H5E_DUPCLASS_g=    
+H5E_SETDISALLOWED_g=
 
 /* B-tree related errors */    
 H5E_NOTFOUND_g=    
@@ -137,25 +199,8 @@ H5E_CANTCLOSEOBJ_g=
 H5E_COMPLEN_g=    
 H5E_PATH_g=
 
-/* Free space errors */    
-H5E_CANTMERGE_g=    
-H5E_CANTREVIVE_g=    
-H5E_CANTSHRINK_g=
-
-/* I/O pipeline errors */    
-H5E_NOFILTER_g=    
-H5E_CALLBACK_g=    
-H5E_CANAPPLY_g=    
-H5E_SETLOCAL_g=    
-H5E_NOENCODER_g=    
-H5E_CANTFILTER_g=
-
-/* Link related errors */    
-H5E_TRAVERSE_g=    
-H5E_NLINKS_g=    
-H5E_NOTREGISTERED_g=    
-H5E_CANTMOVE_g=    
-H5E_CANTSORT_g=
+/* No error */    
+H5E_NONE_MINOR_g=
 
 /* File accessibilty errors */    
 H5E_FILEEXISTS_g=    
@@ -166,51 +211,6 @@ H5E_CANTCLOSEFILE_g=
 H5E_NOTHDF5_g=    
 H5E_BADFILE_g=    
 H5E_TRUNCATED_g=    
-H5E_MOUNT_g=
-
-/* Cache related errors */    
-H5E_CANTFLUSH_g=    
-H5E_CANTSERIALIZE_g=    
-H5E_CANTLOAD_g=    
-H5E_PROTECT_g=    
-H5E_NOTCACHED_g=    
-H5E_SYSTEM_g=    
-H5E_CANTINS_g=    
-H5E_CANTPROTECT_g=    
-H5E_CANTUNPROTECT_g=    
-H5E_CANTPIN_g=    
-H5E_CANTUNPIN_g=    
-H5E_CANTMARKDIRTY_g=    
-H5E_CANTDIRTY_g=    
-H5E_CANTEXPUNGE_g=    
-H5E_CANTRESIZE_g=
-
-/* System level errors */    
-H5E_SYSERRSTR_g=
-
-/* No error */    
-H5E_NONE_MINOR_g=
-
-/* Dataspace errors */    
-H5E_CANTCLIP_g=    
-H5E_CANTCOUNT_g=    
-H5E_CANTSELECT_g=    
-H5E_CANTNEXT_g=    
-H5E_BADSELECT_g=    
-H5E_CANTCOMPARE_g=
-
-/* Object header related errors */    
-H5E_LINKCOUNT_g=    
-H5E_VERSION_g=    
-H5E_ALIGNMENT_g=    
-H5E_BADMESG_g=    
-H5E_CANTDELETE_g=    
-H5E_BADITER_g=    
-H5E_CANTPACK_g=    
-H5E_CANTRESET_g=    
-H5E_CANTRENAME_g=
-
-/* Plugin errors */    
-H5E_OPENERROR_g= (-1);
+H5E_MOUNT_g= (-1);
 
 #endif /* H5Eterm_H */
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index b57225c..f6d770c 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -209,7 +209,7 @@ H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end)
     HDassert(start <= end);
 
 #ifdef DER
-fprintf(stderr, "Add region: (%llu, %llu)\n", start, end);
+HDfprintf(stderr, "Add region: (%llu, %llu)\n", start, end);
 #endif
 
     /* Adjust the dirty region to the nearest block boundaries */
@@ -223,7 +223,7 @@ fprintf(stderr, "Add region: (%llu, %llu)\n", start, end);
         end = (((end / file->bstore_page_size) + 1) * file->bstore_page_size) - 1;
         if(end > file->eof){
 #ifdef DER
-fprintf(stderr, "Adjusted to EOF\n");
+HDfprintf(stderr, "Adjusted to EOF\n");
 #endif
             end = file->eof - 1;
         }
@@ -234,7 +234,7 @@ fprintf(stderr, "Adjusted to EOF\n");
 
 #ifdef DER
 if(was_adjusted)
-    fprintf(stderr, "Adjusted region: (%llu, %llu)\n", start, end);
+    HDfprintf(stderr, "Adjusted region: (%llu, %llu)\n", start, end);
 #endif
 
     /* Get the regions before and after the intended insertion point */
@@ -335,7 +335,7 @@ H5FD_core_destroy_dirty_list(H5FD_core_t *file)
 {
 size_t count = H5SL_count(file->dirty_list);
 if(count != 0)
-    fprintf(stderr, "LIST NOT EMPTY AT DESTROY\n");
+    HDfprintf(stderr, "LIST NOT EMPTY AT DESTROY\n");
 }
 #endif
         while(NULL != (region = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list)))
@@ -389,12 +389,12 @@ static herr_t H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t
             bytes_in = (h5_posix_io_t)size;
 
 #ifdef DER
-fprintf(stderr, "\nNEW\n");
+HDfprintf(stderr, "\nNEW\n");
 #endif
         do {
             bytes_wrote = HDwrite(file->fd, ptr, bytes_in);
 #ifdef DER
-fprintf(stderr, "bytes wrote: %lu\n", bytes_wrote);
+HDfprintf(stderr, "bytes wrote: %lu\n", bytes_wrote);
 #endif
         } while(-1 == bytes_wrote && EINTR == errno);
 
@@ -837,7 +837,7 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
             if(NULL == (file->dirty_list = H5SL_create(H5SL_TYPE_HADDR, NULL)))
                 HGOTO_ERROR(H5E_SLIST, H5E_CANTCREATE, NULL, "can't create core vfd dirty region list");
 #ifdef DER
-fprintf(stderr, "\n");
+HDfprintf(stderr, "\n");
 #endif
         } /* end if */
     } /* end if */
@@ -1346,7 +1346,7 @@ H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UN
             size_t size;
 
 #ifdef DER
-    fprintf(stderr, "FLUSHING. DIRTY LIST:\n");
+    HDfprintf(stderr, "FLUSHING. DIRTY LIST:\n");
 #endif
             while(NULL != (item = (H5FD_core_region_t *)H5SL_remove_first(file->dirty_list))) {
 
@@ -1358,7 +1358,7 @@ H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UN
                         item->end = file->eof - 1;
                     size = (size_t)((item->end - item->start) + 1);
 #ifdef DER
-fprintf(stderr, "(%llu, %llu : %lu)\n", item->start, item->end, size);
+HDfprintf(stderr, "(%llu, %llu : %lu)\n", item->start, item->end, size);
 #endif
                     if(H5FD_core_write_to_bstore(file, item->start, size) != SUCCEED)
                         HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "unable to write to backing store")
@@ -1369,11 +1369,11 @@ fprintf(stderr, "(%llu, %llu : %lu)\n", item->start, item->end, size);
 
  
 #ifdef DER
-fprintf(stderr, "EOF: %llu\n", file->eof);
-fprintf(stderr, "EOA: %llu\n", file->eoa);
+HDfprintf(stderr, "EOF: %llu\n", file->eof);
+HDfprintf(stderr, "EOA: %llu\n", file->eoa);
 if(file->eoa > file->eof)
-    fprintf(stderr, "*** EOA BADNESS ***\n");
-fprintf(stderr, "\n");
+    HDfprintf(stderr, "*** EOA BADNESS ***\n");
+HDfprintf(stderr, "\n");
 #endif
         }
         /* Otherwise, write the entire file out at once */
@@ -1502,7 +1502,7 @@ H5FD_core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 #endif /* H5_HAVE_WIN32_API */
 
 #ifdef DER
-fprintf(stderr, "OLD: Truncated to: %llu\n", file->eoa);
+HDfprintf(stderr, "OLD: Truncated to: %llu\n", file->eoa);
 #endif
             } /* end if */
 
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index c8edb85..61add6d 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -774,7 +774,7 @@ H5FD_mpio_fapl_copy(const void *_old_fa)
     FUNC_ENTER_NOAPI_NOINIT
 #ifdef H5FDmpio_DEBUG
 if (H5FD_mpio_Debug[(int)'t'])
-fprintf(stderr, "enter H5FD_mpio_fapl_copy\n");
+HDfprintf(stderr, "enter H5FD_mpio_fapl_copy\n");
 #endif
 
     if(NULL == (new_fa = (H5FD_mpio_fapl_t *)H5MM_malloc(sizeof(H5FD_mpio_fapl_t))))
@@ -797,7 +797,7 @@ done:
 
 #ifdef H5FDmpio_DEBUG
 if (H5FD_mpio_Debug[(int)'t'])
-fprintf(stderr, "leaving H5FD_mpio_fapl_copy\n");
+HDfprintf(stderr, "leaving H5FD_mpio_fapl_copy\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_fapl_copy() */
@@ -828,7 +828,7 @@ H5FD_mpio_fapl_free(void *_fa)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 #ifdef H5FDmpio_DEBUG
 if (H5FD_mpio_Debug[(int)'t'])
-fprintf(stderr, "in H5FD_mpio_fapl_free\n");
+HDfprintf(stderr, "in H5FD_mpio_fapl_free\n");
 #endif
     HDassert(fa);
 
@@ -839,7 +839,7 @@ fprintf(stderr, "in H5FD_mpio_fapl_free\n");
 
 #ifdef H5FDmpio_DEBUG
 if (H5FD_mpio_Debug[(int)'t'])
-fprintf(stderr, "leaving H5FD_mpio_fapl_free\n");
+HDfprintf(stderr, "leaving H5FD_mpio_fapl_free\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_fapl_free() */
@@ -871,7 +871,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	fprintf(stdout, "Entering H5FD_set_mpio_atomicity\n");
+    	HDfprintf(stdout, "Entering H5FD_set_mpio_atomicity\n");
 #endif
 
     if (FALSE == flag)
@@ -886,7 +886,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	fprintf(stdout, "Leaving H5FD_set_mpio_atomicity\n");
+    	HDfprintf(stdout, "Leaving H5FD_set_mpio_atomicity\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
@@ -918,7 +918,7 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	fprintf(stdout, "Entering H5FD_get_mpio_atomicity\n");
+    	HDfprintf(stdout, "Entering H5FD_get_mpio_atomicity\n");
 #endif
 
     /* get atomicity value */
@@ -933,7 +933,7 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-    	fprintf(stdout, "Leaving H5FD_get_mpio_atomicity\n");
+    	HDfprintf(stdout, "Leaving H5FD_get_mpio_atomicity\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
@@ -1007,7 +1007,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t']) {
-      fprintf(stdout, "Entering H5FD_mpio_open(name=\"%s\", flags=0x%x, "
+      HDfprintf(stdout, "Entering H5FD_mpio_open(name=\"%s\", flags=0x%x, "
     "fapl_id=%d, maxaddr=%lu)\n", name, flags, (int)fapl_id, (unsigned long)maxaddr);
     }
 #endif
@@ -1042,7 +1042,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
         if (MPI_INFO_NULL != info_dup) {
             MPI_Info_get(fa->info, H5F_MPIO_DEBUG_KEY, sizeof(debug_str)-1, debug_str, &flag);
             if (flag) {
-                fprintf(stdout, "H5FD_mpio debug flags=%s\n", debug_str );
+                HDfprintf(stdout, "H5FD_mpio debug flags=%s\n", debug_str );
                 for (i=0;
                      debug_str[i]/*end of string*/ && i<128/*just in case*/;
                      ++i) {
@@ -1115,7 +1115,7 @@ done:
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-        fprintf(stdout, "Leaving H5FD_mpio_open\n" );
+        HDfprintf(stdout, "Leaving H5FD_mpio_open\n" );
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
@@ -1155,7 +1155,7 @@ H5FD_mpio_close(H5FD_t *_file)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      fprintf(stdout, "Entering H5FD_mpio_close\n");
+      HDfprintf(stdout, "Entering H5FD_mpio_close\n");
 #endif
     HDassert(file);
     HDassert(H5FD_MPIO==file->pub.driver_id);
@@ -1171,7 +1171,7 @@ H5FD_mpio_close(H5FD_t *_file)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      fprintf(stdout, "Leaving H5FD_mpio_close\n");
+      HDfprintf(stdout, "Leaving H5FD_mpio_close\n");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 }
@@ -1456,7 +1456,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      fprintf(stdout, "Entering H5FD_mpio_read\n" );
+      HDfprintf(stdout, "Entering H5FD_mpio_read\n" );
 #endif
     HDassert(file);
     HDassert(H5FD_MPIO==file->pub.driver_id);
@@ -1477,7 +1477,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'r'])
-        fprintf(stdout, "in H5FD_mpio_read  mpi_off=%ld  size_i=%d\n",
+        HDfprintf(stdout, "in H5FD_mpio_read  mpi_off=%ld  size_i=%d\n",
     (long)mpi_off, size_i );
 #endif
 
@@ -1530,7 +1530,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 
 #ifdef H5FDmpio_DEBUG
   if (H5FD_mpio_Debug[(int)'t'])
-      fprintf(stdout, "H5FD_mpio_read: using MPIO collective mode\n");
+      HDfprintf(stdout, "H5FD_mpio_read: using MPIO collective mode\n");
 #endif
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
         HDassert(plist);
@@ -1542,7 +1542,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
         if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
             if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_read: doing MPI collective IO\n");
+                HDfprintf(stdout, "H5FD_mpio_read: doing MPI collective IO\n");
 #endif
             if(MPI_SUCCESS != (mpi_code = MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code)
@@ -1550,7 +1550,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
         else {
 #ifdef H5FDmpio_DEBUG
             if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_read: doing MPI independent IO\n");
+                HDfprintf(stdout, "H5FD_mpio_read: doing MPI independent IO\n");
 #endif
 
             if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
@@ -1596,7 +1596,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, had
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      fprintf(stdout, "Leaving H5FD_mpio_read\n" );
+      HDfprintf(stdout, "Leaving H5FD_mpio_read\n" );
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1744,7 +1744,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_Debug[(int)'t'])
-      fprintf(stdout, "Entering H5FD_mpio_write\n" );
+      HDfprintf(stdout, "Entering H5FD_mpio_write\n" );
 #endif
     HDassert(file);
     HDassert(H5FD_MPIO==file->pub.driver_id);
@@ -1765,7 +1765,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'w'])
-        fprintf(stdout, "in H5FD_mpio_write  mpi_off=%ld  size_i=%d\n", (long)mpi_off, size_i);
+        HDfprintf(stdout, "in H5FD_mpio_write  mpi_off=%ld  size_i=%d\n", (long)mpi_off, size_i);
 #endif
 
     if(type == H5FD_MEM_DRAW) {
@@ -1827,7 +1827,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 
 #ifdef H5FDmpio_DEBUG
         if(H5FD_mpio_Debug[(int)'t'])
-            fprintf(stdout, "H5FD_mpio_write: using MPIO collective mode\n");
+            HDfprintf(stdout, "H5FD_mpio_write: using MPIO collective mode\n");
 #endif
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
         HDassert(plist);
@@ -1838,7 +1838,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
         if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
             if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_write: doing MPI collective IO\n");
+                HDfprintf(stdout, "H5FD_mpio_write: doing MPI collective IO\n");
 #endif
             if(MPI_SUCCESS != (mpi_code = MPI_File_write_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at_all failed", mpi_code)
@@ -1846,7 +1846,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
         else {
 #ifdef H5FDmpio_DEBUG
             if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_write: doing MPI independent IO\n");
+                HDfprintf(stdout, "H5FD_mpio_write: doing MPI independent IO\n");
 #endif
             if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
@@ -1886,7 +1886,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 done:
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-      fprintf(stdout, "proc %d: Leaving H5FD_mpio_write with ret_value=%d\n",
+      HDfprintf(stdout, "proc %d: Leaving H5FD_mpio_write with ret_value=%d\n",
       file->mpi_rank, ret_value );
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index c76c2c0..f784fac 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1728,26 +1728,26 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
     H5FD_mem_t		mmt;
 
     /* Debugging stuff... */
-    fprintf(stderr, "multifile access information:\n");
+    HDfprintf(stderr, "multifile access information:\n");
 
     /* print the map */
-    fprintf(stderr, "    map=");
+    HDfprintf(stderr, "    map=");
     for (mt=1; mt<H5FD_MEM_NTYPES; mt++) {
 	mmt = file->memb_map[mt];
 	if (H5FD_MEM_DEFAULT==mmt) mmt = mt;
-	fprintf(stderr, "%s%d", 1==mt?"":",", (int)mmt);
+	HDfprintf(stderr, "%s%d", 1==mt?"":",", (int)mmt);
     }
-    fprintf(stderr, "\n");
+    HDfprintf(stderr, "\n");
 
     /* print info about each file */
-    fprintf(stderr, "      File             Starting            Allocated                 Next Member\n");
-    fprintf(stderr, "    Number              Address                 Size              Address Name\n");
-    fprintf(stderr, "    ------ -------------------- -------------------- -------------------- ------------------------------\n");
+    HDfprintf(stderr, "      File             Starting            Allocated                 Next Member\n");
+    HDfprintf(stderr, "    Number              Address                 Size              Address Name\n");
+    HDfprintf(stderr, "    ------ -------------------- -------------------- -------------------- ------------------------------\n");
 
     for (mt=1; mt<H5FD_MEM_NTYPES; mt++) {
 	if (HADDR_UNDEF!=file->memb_addr[mt]) {
 	    haddr_t eoa = H5FDget_eoa(file->memb[mt], mt);
-	    fprintf(stderr, "    %6d %20llu %20llu %20llu %s\n",
+	    HDfprintf(stderr, "    %6d %20llu %20llu %20llu %s\n",
 		    (int)mt, (unsigned long long)(file->memb_addr[mt]),
 		    (unsigned long long)eoa,
 		    (unsigned long long)(file->memb_next[mt]),
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index c9593e6..fecf0b0 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -410,7 +410,7 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
 
         /* Flag overlaps */
         if (overlap)
-            fprintf(udata->stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
+            HDfprintf(udata->stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
         else
             udata->amount_free += len;
     } /* end if */
diff --git a/src/H5HL.c b/src/H5HL.c
index 01ace76..9bd1e12 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -821,7 +821,7 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
 	    if (last_fl->size < H5HL_SIZEOF_FREE(f)) {
 #ifdef H5HL_DEBUG
 		if (H5DEBUG(HL) && last_fl->size) {
-		    fprintf(H5DEBUG(HL), "H5HL: lost %lu bytes at line %d\n",
+		    HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes at line %d\n",
 			    (unsigned long)(last_fl->size), __LINE__);
 		}
 #endif
@@ -848,7 +848,7 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
 		heap->freelist = fl;
 #ifdef H5HL_DEBUG
 	    } else if (H5DEBUG(HL) && need_more > need_size) {
-		fprintf(H5DEBUG(HL),
+		HDfprintf(H5DEBUG(HL),
 			"H5HL_insert: lost %lu bytes at line %d\n",
 			(unsigned long)(need_more - need_size), __LINE__);
 #endif
@@ -857,7 +857,7 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
 
 #ifdef H5HL_DEBUG
 	if (H5DEBUG(HL)) {
-	    fprintf(H5DEBUG(HL),
+	    HDfprintf(H5DEBUG(HL),
 		    "H5HL: resize mem buf from %lu to %lu bytes\n",
 		    (unsigned long)(old_dblk_size),
 		    (unsigned long)(old_dblk_size + need_more));
@@ -1007,7 +1007,7 @@ H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size)
     if(size < H5HL_SIZEOF_FREE(f)) {
 #ifdef H5HL_DEBUG
 	if(H5DEBUG(HL)) {
-	    fprintf(H5DEBUG(HL), "H5HL: lost %lu bytes\n",
+	    HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes\n",
 		    (unsigned long) size);
 	}
 #endif
diff --git a/src/H5I.c b/src/H5I.c
index 7783985..94bad7f 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -657,7 +657,7 @@ H5I__clear_type_cb(void *_id, void H5_ATTR_UNUSED *key, void *_udata)
             if(udata->force) {
 #ifdef H5I_DEBUG
                 if(H5DEBUG(I)) {
-                    fprintf(H5DEBUG(I), "H5I: free type=%d obj=0x%08lx "
+                    HDfprintf(H5DEBUG(I), "H5I: free type=%d obj=0x%08lx "
                             "failure ignored\n",
                             (int)udata->type_ptr->cls->type_id,
                             (unsigned long)(id->obj_ptr));
@@ -2368,9 +2368,9 @@ H5I__debug_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 
     FUNC_ENTER_STATIC_NOERR
 
-    fprintf(stderr, "		 id = %lu\n", (unsigned long)(item->id));
-    fprintf(stderr, "		 count = %u\n", item->count);
-    fprintf(stderr, "		 obj   = 0x%08lx\n", (unsigned long)(item->obj_ptr));
+    HDfprintf(stderr, "		 id = %lu\n", (unsigned long)(item->id));
+    HDfprintf(stderr, "		 count = %u\n", item->count);
+    HDfprintf(stderr, "		 obj   = 0x%08lx\n", (unsigned long)(item->obj_ptr));
 
     /* Get the group location, so we get get the name */
     switch(type) {
@@ -2392,9 +2392,9 @@ H5I__debug_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 
     if(path) {
         if(path->user_path_r)
-            fprintf(stderr, "                user_path = %s\n", H5RS_get_str(path->user_path_r));
+            HDfprintf(stderr, "                user_path = %s\n", H5RS_get_str(path->user_path_r));
         if(path->full_path_r)
-            fprintf(stderr, "                full_path = %s\n", H5RS_get_str(path->full_path_r));
+            HDfprintf(stderr, "                full_path = %s\n", H5RS_get_str(path->full_path_r));
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -2421,18 +2421,18 @@ H5I__debug(H5I_type_t type)
 
     FUNC_ENTER_STATIC_NOERR
 
-    fprintf(stderr, "Dumping ID type %d\n", (int)type);
+    HDfprintf(stderr, "Dumping ID type %d\n", (int)type);
     type_ptr = H5I_id_type_list_g[type];
 
     /* Header */
-    fprintf(stderr, "	 init_count = %u\n", type_ptr->init_count);
-    fprintf(stderr, "	 reserved   = %u\n", type_ptr->cls->reserved);
-    fprintf(stderr, "	 wrapped    = %u\n", type_ptr->wrapped);
-    fprintf(stderr, "	 id_count   = %u\n", type_ptr->id_count);
-    fprintf(stderr, "	 nextid	    = %u\n", type_ptr->nextid);
+    HDfprintf(stderr, "	 init_count = %u\n", type_ptr->init_count);
+    HDfprintf(stderr, "	 reserved   = %u\n", type_ptr->cls->reserved);
+    HDfprintf(stderr, "	 wrapped    = %u\n", type_ptr->wrapped);
+    HDfprintf(stderr, "	 id_count   = %u\n", type_ptr->id_count);
+    HDfprintf(stderr, "	 nextid	    = %u\n", type_ptr->nextid);
 
     /* List */
-    fprintf(stderr, "	 List:\n");
+    HDfprintf(stderr, "	 List:\n");
     H5SL_iterate(type_ptr->ids, H5I__debug_cb, &type);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5MM.c b/src/H5MM.c
index 8b2f58a..354800b 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -13,21 +13,27 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:		H5MM.c
- *			Jul 10 1997
- *			Robb Matzke <matzke@llnl.gov>
- *
- * Purpose:		Memory management functions.
+ * Created:     H5MM.c
+ *              Jul 10 1997
+ *              Robb Matzke <matzke@llnl.gov>
  *
- * Modifications:
+ * Purpose:     Memory management functions
  *
  *-------------------------------------------------------------------------
  */
 
 
-#include "H5private.h"
-#include "H5Eprivate.h"
-#include "H5MMprivate.h"
+/****************/
+/* Module Setup */
+/****************/
+
+
+/***********/
+/* Headers */
+/***********/
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5MMprivate.h"	/* Memory management			*/
 
 
 /*-------------------------------------------------------------------------
@@ -41,9 +47,8 @@
  *              considered an error condition since allocations of zero
  *              bytes usually indicate problems.
  *  
- * Return:  Success:    Pointer new memory
- *
- *          Failure:	NULL
+ * Return:      Success:    Pointer to new memory
+ *              Failure:    NULL
  *
  * Programmer:  Quincey Koziol
  *              Nov  8 2003
@@ -82,9 +87,8 @@ H5MM_malloc(size_t size)
  *              bytes usually indicate problems.
  *
  *
- * Return:  Success:    Pointer new memory
- *
- *          Failure:	NULL
+ * Return:      Success:    Pointer to new memory
+ *              Failure:    NULL
  *
  * Programmer:	Quincey Koziol
  *              Nov  8 2003
@@ -123,10 +127,9 @@ H5MM_calloc(size_t size)
  *              Note that the (NULL, 0) combination is undefined behavior
  *              in the C standard.
  *
- * Return:  Success:    Ptr to new memory if size > 0
- *                      NULL if size is zero
- *
- *          Failure:    NULL (input buffer is unchanged on failure)
+ * Return:      Success:    Ptr to new memory if size > 0
+ *                          NULL if size is zero
+ *              Failure:    NULL (input buffer is unchanged on failure)
  *
  * Programmer:  Robb Matzke
  *              Jul 10 1997
@@ -136,7 +139,7 @@ H5MM_calloc(size_t size)
 void *
 H5MM_realloc(void *mem, size_t size)
 {
-    void *ret_value;
+    void *ret_value = NULL;
 
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -166,18 +169,16 @@ H5MM_realloc(void *mem, size_t size)
  *              NULL is an acceptable value for the input string.
  *
  * Return:      Success:    Pointer to a new string (NULL if s is NULL).
- *
- *              Failure:    abort()
+ *              Failure:    NULL
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jul 10 1997
  *-------------------------------------------------------------------------
  */
 char *
 H5MM_xstrdup(const char *s)
 {
-    char	*ret_value = NULL;
+    char    *ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -202,25 +203,23 @@ done:
  *              an error will be raised.
  *
  * Return:      Success:    Pointer to a new string
- *
- *              Failure:    abort()
+ *              Failure:    NULL
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jul 10 1997
  *-------------------------------------------------------------------------
  */
 char *
 H5MM_strdup(const char *s)
 {
-    char	*ret_value;
+    char *ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
     if(!s)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "null string")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "null string")
     if(NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     HDstrcpy(ret_value, s);
 
 done:
@@ -229,21 +228,19 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5MM_xfree
+ * Function:    H5MM_xfree
  *
- * Purpose:	Just like free(3) except null pointers are allowed as
- *		arguments, and the return value (always NULL) can be
- *		assigned to the pointer whose memory was just freed:
+ * Purpose:     Just like free(3) except null pointers are allowed as
+ *              arguments, and the return value (always NULL) can be
+ *              assigned to the pointer whose memory was just freed:
  *
- *			thing = H5MM_xfree (thing);
+ *              thing = H5MM_xfree (thing);
  *
- * Return:	Success:	NULL
+ * Return:      Success:    NULL
+ *              Failure:    never fails
  *
- *		Failure:	never fails
- *
- * Programmer:	Robb Matzke
- *		matzke@llnl.gov
- *		Jul 10 1997
+ * Programmer:  Robb Matzke
+ *              Jul 10 1997
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h
index 31bf0da..ccf05e6 100644
--- a/src/H5MMprivate.h
+++ b/src/H5MMprivate.h
@@ -19,8 +19,6 @@
  *
  * Purpose:             Private header for memory management.
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 #ifndef _H5MMprivate_H
@@ -43,4 +41,5 @@ H5_DLL char *H5MM_xstrdup(const char *s);
 H5_DLL char *H5MM_strdup(const char *s);
 H5_DLL void *H5MM_xfree(void *mem);
 
-#endif
+#endif /* _H5MMprivate_H */
+
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 85fbef4..908ee31 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -1710,56 +1710,56 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
             s = buf;
             break;
     } /* end switch */
-    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 	    "Type class:",
 	    s);
 
-    fprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth,
+    HDfprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth,
 	    "Size:",
 	    (unsigned long)(dt->shared->size), 1 == dt->shared->size ? "" : "s");
 
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
 		"Version:", dt->shared->version);
 
     if (H5T_COMPOUND == dt->shared->type) {
-	fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
 		"Number of members:",
 		dt->shared->u.compnd.nmembs);
 	for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
 	    sprintf(buf, "Member %u:", i);
-	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		    buf,
 		    dt->shared->u.compnd.memb[i].name);
-	    fprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX(0, fwidth-3),
+	    HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX(0, fwidth-3),
 		    "Byte offset:",
 		    (unsigned long)(dt->shared->u.compnd.memb[i].offset));
 	    H5O_dtype_debug(f, dxpl_id, dt->shared->u.compnd.memb[i].type, stream,
 			    indent + 3, MAX(0, fwidth - 3));
 	}
     } else if(H5T_ENUM == dt->shared->type) {
-	fprintf(stream, "%*s%s\n", indent, "", "Base type:");
+	HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
 	H5O_dtype_debug(f, dxpl_id, dt->shared->parent, stream, indent+3, MAX(0, fwidth-3));
-	fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
 		"Number of members:",
 		dt->shared->u.enumer.nmembs);
 	for(i = 0; i < dt->shared->u.enumer.nmembs; i++) {
 	    sprintf(buf, "Member %u:", i);
-	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		    buf,
 		    dt->shared->u.enumer.name[i]);
-	    fprintf(stream, "%*s%-*s 0x", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s 0x", indent, "", fwidth,
 		    "Raw bytes of value:");
 	    for(k = 0; k < dt->shared->parent->shared->size; k++)
-		fprintf(stream, "%02x",
+		HDfprintf(stream, "%02x",
 			dt->shared->u.enumer.value[i*dt->shared->parent->shared->size + k]);
-	    fprintf(stream, "\n");
+	    HDfprintf(stream, "\n");
 	} /* end for */
 
     } else if(H5T_OPAQUE == dt->shared->type) {
-	fprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth,
 		"Tag:", dt->shared->u.opaque.tag);
     } else if(H5T_REFERENCE == dt->shared->type) {
-	fprintf(stream, "%*s%-*s\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
 		"Fix dumping reference types!");
     } else if(H5T_STRING == dt->shared->type) {
         switch(dt->shared->u.atomic.u.s.cset) {
@@ -1795,7 +1795,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                 "Character Set:",
                 s);
 
@@ -1835,7 +1835,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                 "String Padding:",
                 s);
     } else if(H5T_VLEN == dt->shared->type) {
@@ -1855,7 +1855,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                 "Vlen type:", s);
 
         switch(dt->shared->u.vlen.loc) {
@@ -1874,7 +1874,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
         } /* end switch */
-        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                 "Location:", s);
 
         /* Extra information for VL-strings */
@@ -1912,7 +1912,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                     s = buf;
                     break;
             } /* end switch */
-            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                     "Character Set:",
                     s);
 
@@ -1952,19 +1952,19 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                     s = buf;
                     break;
             } /* end switch */
-            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                     "String Padding:",
                     s);
         } /* end if */
     } else if(H5T_ARRAY == dt->shared->type) {
-	fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
 		"Rank:",
 		dt->shared->u.array.ndims);
-        fprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
+        HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
         for(i = 0; i < dt->shared->u.array.ndims; i++)
-            fprintf(stream, "%s%u", (i ? ", " : ""), (unsigned)dt->shared->u.array.dim[i]);
-        fprintf(stream, "}\n");
-	fprintf(stream, "%*s%s\n", indent, "", "Base type:");
+            HDfprintf(stream, "%s%u", (i ? ", " : ""), (unsigned)dt->shared->u.array.dim[i]);
+        HDfprintf(stream, "}\n");
+	HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
 	H5O_dtype_debug(f, dxpl_id, dt->shared->parent, stream, indent + 3, MAX(0, fwidth - 3));
     } else {
 	switch (dt->shared->u.atomic.order) {
@@ -1994,16 +1994,16 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = buf;
                 break;
 	} /* end switch */
-	fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		"Byte order:",
 		s);
 
-	fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
 		"Precision:",
 		(unsigned long)(dt->shared->u.atomic.prec),
 		1==dt->shared->u.atomic.prec?"":"s");
 
-	fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
 		"Offset:",
 		(unsigned long)(dt->shared->u.atomic.offset),
 		1==dt->shared->u.atomic.offset?"":"s");
@@ -2027,7 +2027,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = "pad?";
                 break;
 	} /* end switch */
-	fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		"Low pad type:", s);
 
 	switch (dt->shared->u.atomic.msb_pad) {
@@ -2049,7 +2049,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                 s = "pad?";
                 break;
 	} /* end switch */
-	fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		"High pad type:", s);
 
 	if (H5T_FLOAT == dt->shared->type) {
@@ -2076,7 +2076,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                     s = buf;
                     break;
 	    } /* end switch */
-	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		    "Internal pad type:", s);
 
 	    switch (dt->shared->u.atomic.u.f.norm) {
@@ -2097,30 +2097,30 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                     sprintf(buf, "H5T_NORM_%d", (int) (dt->shared->u.atomic.u.f.norm));
                     s = buf;
 	    } /* end switch */
-	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		    "Normalization:", s);
 
-	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
 		    "Sign bit location:",
 		    (unsigned long) (dt->shared->u.atomic.u.f.sign));
 
-	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
 		    "Exponent location:",
 		    (unsigned long) (dt->shared->u.atomic.u.f.epos));
 
-	    fprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
 		    "Exponent bias:",
 		    (unsigned long) (dt->shared->u.atomic.u.f.ebias));
 
-	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
 		    "Exponent size:",
 		    (unsigned long) (dt->shared->u.atomic.u.f.esize));
 
-	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
 		    "Mantissa location:",
 		    (unsigned long) (dt->shared->u.atomic.u.f.mpos));
 
-	    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
 		    "Mantissa size:",
 		    (unsigned long) (dt->shared->u.atomic.u.f.msize));
 
@@ -2141,7 +2141,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
                     s = buf;
                     break;
 	    } /* end switch */
-	    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 		    "Sign scheme:", s);
 	}
     }
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 70704c5..159f730 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -822,40 +822,40 @@ H5O_fill_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Space Allocation Time:");
     switch(fill->alloc_time) {
         case H5D_ALLOC_TIME_EARLY:
-            fprintf(stream,"Early\n");
+            HDfprintf(stream,"Early\n");
             break;
 
         case H5D_ALLOC_TIME_LATE:
-            fprintf(stream,"Late\n");
+            HDfprintf(stream,"Late\n");
             break;
 
         case H5D_ALLOC_TIME_INCR:
-            fprintf(stream,"Incremental\n");
+            HDfprintf(stream,"Incremental\n");
             break;
 
         case H5D_ALLOC_TIME_DEFAULT:
         case H5D_ALLOC_TIME_ERROR:
         default:
-            fprintf(stream,"Unknown!\n");
+            HDfprintf(stream,"Unknown!\n");
             break;
     } /* end switch */
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Fill Time:");
     switch(fill->fill_time) {
         case H5D_FILL_TIME_ALLOC:
-            fprintf(stream,"On Allocation\n");
+            HDfprintf(stream,"On Allocation\n");
             break;
 
         case H5D_FILL_TIME_NEVER:
-            fprintf(stream,"Never\n");
+            HDfprintf(stream,"Never\n");
             break;
 
         case H5D_FILL_TIME_IFSET:
-            fprintf(stream,"If Set\n");
+            HDfprintf(stream,"If Set\n");
             break;
 
         case H5D_FILL_TIME_ERROR:
         default:
-            fprintf(stream,"Unknown!\n");
+            HDfprintf(stream,"Unknown!\n");
             break;
 
     } /* end switch */
@@ -863,20 +863,20 @@ H5O_fill_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     H5P_is_fill_value_defined((const H5O_fill_t *)fill, &fill_status);
     switch(fill_status) {
         case H5D_FILL_VALUE_UNDEFINED:
-            fprintf(stream,"Undefined\n");
+            HDfprintf(stream,"Undefined\n");
             break;
 
         case H5D_FILL_VALUE_DEFAULT:
-            fprintf(stream,"Default\n");
+            HDfprintf(stream,"Default\n");
             break;
 
         case H5D_FILL_VALUE_USER_DEFINED:
-            fprintf(stream,"User Defined\n");
+            HDfprintf(stream,"User Defined\n");
             break;
 
         case H5D_FILL_VALUE_ERROR:
         default:
-            fprintf(stream,"Unknown!\n");
+            HDfprintf(stream,"Unknown!\n");
             break;
 
     } /* end switch */
@@ -885,10 +885,10 @@ H5O_fill_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Data type:");
     if(fill->type) {
 	H5T_debug(fill->type, stream);
-	fprintf(stream, "\n");
+	HDfprintf(stream, "\n");
     } /* end if */
     else
-	fprintf(stream, "<dataset type>\n");
+	HDfprintf(stream, "<dataset type>\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED);
 } /* end H5O_fill_debug() */
diff --git a/src/H5Oname.c b/src/H5Oname.c
index 5248168..45635ec 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -299,7 +299,7 @@ H5O_name_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    fprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth,
+    HDfprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth,
             "Name:",
             mesg->s);
 
diff --git a/src/H5Sdbg.c b/src/H5Sdbg.c
index ca0b404..efa8b9e 100644
--- a/src/H5Sdbg.c
+++ b/src/H5Sdbg.c
@@ -95,17 +95,17 @@ H5S_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
 
     switch(H5S_GET_EXTENT_TYPE(mesg)) {
         case H5S_NULL:
-            fprintf(stream, "%*s%-*s H5S_NULL\n", indent, "", fwidth,
+            HDfprintf(stream, "%*s%-*s H5S_NULL\n", indent, "", fwidth,
                     "Space class:");
             break;
 
         case H5S_SCALAR:
-            fprintf(stream, "%*s%-*s H5S_SCALAR\n", indent, "", fwidth,
+            HDfprintf(stream, "%*s%-*s H5S_SCALAR\n", indent, "", fwidth,
                     "Space class:");
             break;
 
         case H5S_SIMPLE:
-            fprintf(stream, "%*s%-*s H5S_SIMPLE\n", indent, "", fwidth,
+            HDfprintf(stream, "%*s%-*s H5S_SIMPLE\n", indent, "", fwidth,
                     "Space class:");
             H5O_debug_id(H5O_SDSPACE_ID, f, dxpl_id, &(mesg->extent), stream,
                                  indent + 3, MAX(0, fwidth - 3));
@@ -113,7 +113,7 @@ H5S_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
 
         case H5S_NO_CLASS:
         default:
-            fprintf(stream, "%*s%-*s **UNKNOWN-%ld**\n", indent, "", fwidth,
+            HDfprintf(stream, "%*s%-*s **UNKNOWN-%ld**\n", indent, "", fwidth,
                     "Space class:", (long)(H5S_GET_EXTENT_TYPE(mesg)));
             break;
     } /* end switch */
diff --git a/src/H5T.c b/src/H5T.c
index f4c10a5..98e124f 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1412,7 +1412,7 @@ H5T_term_interface(void)
                         (size_t)0, (size_t)0, NULL, NULL,H5AC_ind_dxpl_id) < 0) {
 #ifdef H5T_DEBUG
                         if (H5DEBUG(T)) {
-                            fprintf(H5DEBUG(T), "H5T: conversion function "
+                            HDfprintf(H5DEBUG(T), "H5T: conversion function "
                                     "0x%08lx failed to free private data for "
                                     "%s (ignored)\n",
                                     (unsigned long)(path->func), path->name);
@@ -2353,7 +2353,7 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
                     (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id)<0) {
 #ifdef H5T_DEBUG
         if (H5DEBUG(T)) {
-            fprintf (H5DEBUG(T), "H5T: conversion function 0x%08lx "
+            HDfprintf (H5DEBUG(T), "H5T: conversion function 0x%08lx "
                 "failed to free private data for %s (ignored)\n",
                 (unsigned long)(old_path->func), old_path->name);
         }
@@ -2525,7 +2525,7 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
                     (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
 #ifdef H5T_DEBUG
                 if(H5DEBUG(T)) {
-                    fprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx failed "
+                    HDfprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx failed "
                             "to free private data for %s (ignored)\n",
                             (unsigned long)(path->func), path->name);
                 }
@@ -4390,7 +4390,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
         if(H5T__conv_noop((hid_t)FAIL, (hid_t)FAIL, &(H5T_g.path[0]->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
 #ifdef H5T_DEBUG
             if(H5DEBUG(T))
-            fprintf(H5DEBUG(T), "H5T: unable to initialize no-op conversion function (ignored)\n");
+            HDfprintf(H5DEBUG(T), "H5T: unable to initialize no-op conversion function (ignored)\n");
 #endif
             H5E_clear_stack(NULL); /*ignore the error*/
         } /* end if */
@@ -4549,7 +4549,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
         if((table->func)((hid_t)FAIL, (hid_t)FAIL, &(table->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
 #ifdef H5T_DEBUG
             if(H5DEBUG(T)) {
-                fprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx free "
+                HDfprintf(H5DEBUG(T), "H5T: conversion function 0x%08lx free "
                         "failed for %s (ignored)\n",
                         (unsigned long)(path->func), path->name);
             } /* end if */
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index b027f9c..2054eb5 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -2795,7 +2795,7 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
         case H5T_CONV_FREE:
 #ifdef H5T_DEBUG
             if (H5DEBUG(T)) {
-                fprintf(H5DEBUG(T), "      Using %s mapping function%s\n",
+                HDfprintf(H5DEBUG(T), "      Using %s mapping function%s\n",
                         priv->length?"O(1)":"O(log N)",
                         priv->length?"":", where N is the number of enum members");
             }
diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c
index 5477f56..41cdd4d 100644
--- a/src/H5Tdbg.c
+++ b/src/H5Tdbg.c
@@ -239,7 +239,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
             HDassert(0 && "This Should never be executed!");
     } /* end switch */
 
-    fprintf(stream, "%s%s {nbytes=%lu", s1, s2, (unsigned long)(dt->shared->size));
+    HDfprintf(stream, "%s%s {nbytes=%lu", s1, s2, (unsigned long)(dt->shared->size));
 
     if(H5T_IS_ATOMIC(dt->shared)) {
         uint64_t	tmp;
@@ -266,13 +266,13 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                 break;
 	} /* end switch */
 
-	fprintf(stream, ", %s", s1);
+	HDfprintf(stream, ", %s", s1);
 
 	if(dt->shared->u.atomic.offset)
-	    fprintf(stream, ", offset=%lu",
+	    HDfprintf(stream, ", offset=%lu",
 		    (unsigned long) (dt->shared->u.atomic.offset));
 	if(dt->shared->u.atomic.prec != 8 * dt->shared->size)
-	    fprintf(stream, ", prec=%lu",
+	    HDfprintf(stream, ", prec=%lu",
 		    (unsigned long) (dt->shared->u.atomic.prec));
 	switch(dt->shared->type) {
             case H5T_INTEGER:
@@ -291,7 +291,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
 
                 } /* end switch */
                 if(s1)
-                    fprintf(stream, ", %s", s1);
+                    HDfprintf(stream, ", %s", s1);
                 break;
 
             case H5T_FLOAT:
@@ -313,23 +313,23 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                         break;
                 } /* end switch */
 
-                fprintf(stream, ", sign=%lu+1",
+                HDfprintf(stream, ", sign=%lu+1",
                         (unsigned long)(dt->shared->u.atomic.u.f.sign));
-                fprintf(stream, ", mant=%lu+%lu (%s)",
+                HDfprintf(stream, ", mant=%lu+%lu (%s)",
                         (unsigned long)(dt->shared->u.atomic.u.f.mpos),
                         (unsigned long)(dt->shared->u.atomic.u.f.msize), s1);
-                fprintf(stream, ", exp=%lu+%lu",
+                HDfprintf(stream, ", exp=%lu+%lu",
                         (unsigned long)(dt->shared->u.atomic.u.f.epos),
                         (unsigned long)(dt->shared->u.atomic.u.f.esize));
                 tmp = dt->shared->u.atomic.u.f.ebias >> 32;
                 if(tmp) {
                     size_t hi = (size_t)tmp;
                     size_t lo = (size_t)(dt->shared->u.atomic.u.f.ebias & 0xffffffff);
-                    fprintf(stream, " bias=0x%08lx%08lx",
+                    HDfprintf(stream, " bias=0x%08lx%08lx",
                             (unsigned long)hi, (unsigned long)lo);
                 } else {
                     size_t lo = (size_t)(dt->shared->u.atomic.u.f.ebias & 0xffffffff);
-                    fprintf(stream, " bias=0x%08lx", (unsigned long)lo);
+                    HDfprintf(stream, " bias=0x%08lx", (unsigned long)lo);
                 }
                 break;
 
@@ -340,60 +340,60 @@ H5T_debug(const H5T_t *dt, FILE *stream)
     } else if(H5T_COMPOUND == dt->shared->type) {
 	/* Compound data type */
 	for(i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-	    fprintf(stream, "\n\"%s\" @%lu",
+	    HDfprintf(stream, "\n\"%s\" @%lu",
 		    dt->shared->u.compnd.memb[i].name,
 		    (unsigned long)(dt->shared->u.compnd.memb[i].offset));
-	    fprintf(stream, " ");
+	    HDfprintf(stream, " ");
 	    H5T_debug(dt->shared->u.compnd.memb[i].type, stream);
 	} /* end for */
-	fprintf(stream, "\n");
+	HDfprintf(stream, "\n");
     } else if(H5T_VLEN == dt->shared->type) {
         switch(dt->shared->u.vlen.loc) {
             case H5T_LOC_MEMORY:
-                fprintf(stream, ", loc=memory");
+                HDfprintf(stream, ", loc=memory");
                 break;
 
             case H5T_LOC_DISK:
-                fprintf(stream, ", loc=disk");
+                HDfprintf(stream, ", loc=disk");
                 break;
 
             default:
-                fprintf(stream, ", loc=UNKNOWN");
+                HDfprintf(stream, ", loc=UNKNOWN");
                 break;
         } /* end switch */
 
         if(H5T_IS_VL_STRING(dt->shared))
             /* Variable length string datatype */
-            fprintf(stream, ", variable-length");
+            HDfprintf(stream, ", variable-length");
         else {
             /* Variable length sequence datatype */
-            fprintf(stream, " VLEN ");
+            HDfprintf(stream, " VLEN ");
             H5T_debug(dt->shared->parent, stream);
-            fprintf(stream, "\n");
+            HDfprintf(stream, "\n");
         } /* end else */
     } else if(H5T_ENUM == dt->shared->type) {
         size_t	base_size;
 
 	/* Enumeration data type */
-	fprintf(stream, " ");
+	HDfprintf(stream, " ");
 	H5T_debug(dt->shared->parent, stream);
 	base_size = dt->shared->parent->shared->size;
 	for(i = 0; i < dt->shared->u.enumer.nmembs; i++) {
             size_t	k;
 
-	    fprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
+	    HDfprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
 	    for(k = 0; k < base_size; k++)
-		fprintf(stream, "%02lx",
+		HDfprintf(stream, "%02lx",
 			(unsigned long)(dt->shared->u.enumer.value + (i * base_size) + k));
 	} /* end for */
-	fprintf(stream, "\n");
+	HDfprintf(stream, "\n");
     } else if(H5T_OPAQUE == dt->shared->type) {
-	fprintf(stream, ", tag=\"%s\"", dt->shared->u.opaque.tag);
+	HDfprintf(stream, ", tag=\"%s\"", dt->shared->u.opaque.tag);
     } else {
 	/* Unknown */
-	fprintf(stream, "unknown class %d\n", (int)(dt->shared->type));
+	HDfprintf(stream, "unknown class %d\n", (int)(dt->shared->type));
     }
-    fprintf(stream, "}");
+    HDfprintf(stream, "}");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T_debug() */
diff --git a/src/H5dbg.c b/src/H5dbg.c
index dd50034..4939bca 100644
--- a/src/H5dbg.c
+++ b/src/H5dbg.c
@@ -113,7 +113,7 @@ H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf,
 		} /* end else */
 	    } /* end if */
             else
-		fprintf(stream, "   ");
+		HDfprintf(stream, "   ");
 	    if(7 == v)
 		HDfputc(' ', stream);
 	} /* end for */
diff --git a/src/H5detect.c b/src/H5detect.c
index 8edbec6..9da82f0 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -43,6 +43,9 @@ static const char *FileHeader = "\n\
  */
 #undef NDEBUG
 #include "H5private.h"
+/* Do NOT use  in this file as it is not linked with the library,
+ * which contains the H5system.c file in which the function is defined.
+ */
 #include "H5Tpublic.h"
 #include "H5Rpublic.h"
 
@@ -150,7 +153,7 @@ static H5JMP_BUF jbuf_g;
 #endif
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    precision
  *
@@ -203,7 +206,7 @@ precision (detected_t *d)
     }
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    DETECT_I/DETECT_BYTE
  *
@@ -277,7 +280,7 @@ precision (detected_t *d)
     DETECT_I_BYTE_CORE(TYPE,VAR,INFO,TYPE)                                    \
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    DETECT_F
  *
@@ -374,7 +377,7 @@ precision (detected_t *d)
     }                                                                         \
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    DETECT_M
  *
@@ -450,7 +453,7 @@ precision (detected_t *d)
 
 
 #if defined(H5LONGJMP) && defined(H5_HAVE_SIGNAL)
-
+
 /*-------------------------------------------------------------------------
  * Function:    sigsegv_handler
  *
@@ -483,7 +486,7 @@ sigsegv_handler(int H5_ATTR_UNUSED signo)
 
 
 #if defined(H5LONGJMP) && defined(H5_HAVE_SIGNAL)
-
+
 /*-------------------------------------------------------------------------
  * Function:    sigbus_handler
  *
@@ -516,7 +519,7 @@ sigbus_handler(int H5_ATTR_UNUSED signo)
 
 
 #if defined(H5LONGJMP) && defined(H5_HAVE_SIGNAL)
-
+
 /*-------------------------------------------------------------------------
  * Function:    sigill_handler
  *
@@ -547,7 +550,7 @@ sigill_handler(int H5_ATTR_UNUSED signo)
 }
 #endif
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    print_results
  *
@@ -627,7 +630,7 @@ print_results(int nd, detected_t *d, int na, malign_t *misc_align)
     fprintf(rawoutstream, "\n\
 \n\
 /*-------------------------------------------------------------------------\n\
- * Function:	H5TN_init_interface\n\
+ * Function:    H5TN_init_interface\n\
  *\n\
  * Purpose:    Initialize pre-defined native datatypes from code generated\n\
  *              during the library configuration by H5detect.\n\
@@ -807,7 +810,7 @@ done:\n\
 #ifdef H5_HAVE_SIGLONGJMP
     fprintf(rawoutstream, "/* siglongjmp() support: yes */\n");
 #else
-    fprintf(rawoutstream, "/* siglongjmp() support: no */\n");
+    (rawoutstream, "/* siglongjmp() support: no */\n");
 #endif
 #ifdef H5_HAVE_SIGPROCMASK
     fprintf(rawoutstream, "/* sigprocmask() support: yes */\n");
@@ -826,7 +829,7 @@ done:\n\
     fprintf(rawoutstream, "/* sigill_handler called: %d times */\n", sigill_handler_called_g);
 } /* end print_results() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    iprint
  *
@@ -905,7 +908,7 @@ iprint(detected_t *d)
      * Alignment
      */
     if(0 == d->align) {
-        fprintf(rawoutstream, "    * Alignment: NOT CALCULATED\n");
+        (rawoutstream, "    * Alignment: NOT CALCULATED\n");
     }
     else if(1 == d->align) {
         fprintf(rawoutstream, "    * Alignment: none\n");
@@ -916,7 +919,7 @@ iprint(detected_t *d)
 
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    byte_cmp
  *
@@ -943,7 +946,7 @@ byte_cmp(int n, const void *_a, const void *_b, const unsigned char *pad_mask)
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    bit_cmp
  *
@@ -984,7 +987,7 @@ bit_cmp(unsigned int nbytes, int *perm, void *_a, void *_b,
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    fix_order
  *
@@ -1052,7 +1055,7 @@ fix_order(int n, int last, int *perm, const char **mesg)
     }
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    imp_bit
  *
@@ -1106,7 +1109,7 @@ imp_bit(unsigned int n, int *perm, void *_a, void *_b, const unsigned char *pad_
     return (a[perm[major]] >> minor) & 0x01 ? 0 : 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  find_bias
  *
@@ -1137,7 +1140,7 @@ find_bias(unsigned int epos, unsigned int esize, int *perm, void *_a)
     return bias;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    print_header
  *
@@ -1250,7 +1253,7 @@ bit.\n";
     if(pwd || real_name[0] || host_name[0]) {
         fprintf(rawoutstream, " *\t\t\t");
         if(real_name[0])
-            fprintf(rawoutstream, "%s <", real_name);
+            (rawoutstream, "%s <", real_name);
 #ifdef H5_HAVE_GETPWUID
         if(pwd) HDfputs(pwd->pw_name, rawoutstream);
 #endif
@@ -1278,7 +1281,7 @@ bit.\n";
 
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C89_integers
  *
@@ -1300,7 +1303,7 @@ detect_C89_integers(void)
     DETECT_I(unsigned long,    ULONG,        d_g[nd_g]); nd_g++;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C89_floats
  *
@@ -1316,7 +1319,7 @@ detect_C89_floats(void)
     DETECT_F(double,    DOUBLE,     d_g[nd_g]); nd_g++;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers8
  *
@@ -1372,7 +1375,7 @@ detect_C99_integers8(void)
 #endif
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers16
  *
@@ -1404,7 +1407,7 @@ detect_C99_integers16(void)
 #endif
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers32
  *
@@ -1436,7 +1439,7 @@ detect_C99_integers32(void)
 #endif
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers64
  *
@@ -1482,7 +1485,7 @@ detect_C99_integers64(void)
 #endif
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_integers
  *
@@ -1502,7 +1505,7 @@ detect_C99_integers(void)
     detect_C99_integers64();
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_C99_floats
  *
@@ -1527,7 +1530,7 @@ detect_C99_floats(void)
 #endif
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    detect_alignments
  *
@@ -1604,7 +1607,7 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
 }
 #endif
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
index da7c8d9..2f3224e 100644
--- a/src/H5make_libsettings.c
+++ b/src/H5make_libsettings.c
@@ -35,12 +35,15 @@ static const char *FileHeader = "\n\
 #include <stdio.h>
 #include <time.h>
 #include "H5private.h"
+/* Do NOT use HDfprintf in this file as it is not linked with the library,
+ * which contains the H5system.c file in which the function is defined.
+ */
 
 #define LIBSETTINGSFNAME "libhdf5.settings"
 
 FILE       *rawoutstream = NULL;
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  insert_libhdf5_settings
  *
@@ -105,7 +108,7 @@ insert_libhdf5_settings(FILE *flibinfo)
 #endif
 } /* insert_libhdf5_settings() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  make_libinfo
  *
@@ -123,7 +126,7 @@ make_libinfo(void)
     insert_libhdf5_settings(rawoutstream);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  print_header
  *
@@ -196,8 +199,7 @@ information about the library build configuration\n";
     fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n");
     HDfputs(FileHeader, rawoutstream);        /*the copyright notice--see top of this file */
 
-    fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n",
-    month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year);
+    fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year);
     if(pwd || real_name[0] || host_name[0]) {
         fprintf(rawoutstream, " *\t\t\t");
         if(real_name[0])
@@ -229,7 +231,7 @@ information about the library build configuration\n";
     fprintf(rawoutstream, "\n */\n\n");
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  print_footer
  *
@@ -244,7 +246,7 @@ print_footer(void)
     /* nothing */
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  main
  *
diff --git a/src/H5public.h b/src/H5public.h
index d2a772f..a9de4e5 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -26,7 +26,7 @@
  * it via H5public.h.  The #ifndef _H5public_H guard above would
  * prevent repeated include.
  */
-#include "H5pubconf.h"		/*from configure                             */
+#include "H5pubconf.h"        /*from configure                             */
 
 /* API Version macro wrapper definitions */
 #include "H5version.h"
@@ -38,15 +38,15 @@
 #include <sys/types.h>
 #endif
 #ifdef H5_STDC_HEADERS
-#   include <limits.h>		/*for H5T_NATIVE_CHAR defn in H5Tpublic.h    */
+#   include <limits.h>        /*for H5T_NATIVE_CHAR defn in H5Tpublic.h    */
 #endif
 #ifndef __cplusplus
 # ifdef H5_HAVE_STDINT_H
-#   include <stdint.h>		/*for C9x types				     */
+#   include <stdint.h>        /*for C9x types                     */
 # endif
 #else
 # ifdef H5_HAVE_STDINT_H_CXX
-#   include <stdint.h>		/*for C9x types	when include from C++	     */
+#   include <stdint.h>        /*for C9x types    when include from C++         */
 # endif
 #endif
 #ifdef H5_HAVE_INTTYPES_H
@@ -57,7 +57,7 @@
 #endif
 #ifdef H5_HAVE_PARALLEL
 #   include <mpi.h>
-#ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
+#ifndef MPI_FILE_NULL        /*MPIO may be defined in mpi.h already       */
 #   include <mpio.h>
 #endif
 #endif
@@ -90,15 +90,15 @@ extern "C" {
 #endif
 
 /* Version numbers */
-#define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
-#define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	22	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap1"	/* For pre-releases like snap0       */
-				/* Empty string for real releases.           */
+#define H5_VERS_MAJOR    1    /* For major interface/format changes           */
+#define H5_VERS_MINOR    8    /* For minor interface/format changes           */
+#define H5_VERS_RELEASE    22    /* For tweaks, bug-fixes, or development     */
+#define H5_VERS_SUBRELEASE "snap1"    /* For pre-releases like snap0       */
+                /* Empty string for real releases.           */
 #define H5_VERS_INFO    "HDF5 library version: 1.8.22-snap1"      /* Full version string */
 
-#define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
-				        H5_VERS_RELEASE)
+#define H5check()    H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,          \
+                        H5_VERS_RELEASE)
 
 /* macros for comparing the version */
 #define H5_VERSION_GE(Maj,Min,Rel) \
@@ -118,8 +118,8 @@ extern "C" {
  * The negative failure value is most commonly -1, but don't bet on it.  The
  * proper way to detect failure is something like:
  *
- * 	if((dset = H5Dopen2(file, name)) < 0)
- *	    fprintf(stderr, "unable to open the requested dataset\n");
+ *     if((dset = H5Dopen2(file, name)) < 0)
+ *        fprintf(stderr, "unable to open the requested dataset\n");
  */
 typedef int herr_t;
 
@@ -131,13 +131,13 @@ typedef int herr_t;
  * (false), positive (true), or negative (failure). The proper way to test
  * for truth from a htri_t function is:
  *
- * 	if ((retval = H5Tcommitted(type))>0) {
- *	    printf("data type is committed\n");
- *	} else if (!retval) {
- * 	    printf("data type is not committed\n");
- *	} else {
- * 	    printf("error determining whether data type is committed\n");
- *	}
+ *     if ((retval = H5Tcommitted(type))>0) {
+ *        printf("data type is committed\n");
+ *    } else if (!retval) {
+ *         printf("data type is not committed\n");
+ *    } else {
+ *         printf("error determining whether data type is committed\n");
+ *    }
  */
 typedef unsigned int hbool_t;
 typedef int htri_t;
@@ -166,8 +166,8 @@ typedef long long ssize_t;
  */
 #if H5_SIZEOF_LONG_LONG >= 8
 H5_GCC_DIAG_OFF(long-long)
-typedef unsigned long long 	hsize_t;
-typedef signed long long	hssize_t;
+typedef unsigned long long     hsize_t;
+typedef signed long long    hssize_t;
 H5_GCC_DIAG_ON(long-long)
 #       define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
 #       define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
@@ -218,7 +218,7 @@ H5_GCC_DIAG_ON(long-long)
 #else
 #   error "nothing appropriate for H5_PRINTF_HADDR_FMT"
 #endif
-#define HADDR_MAX		(HADDR_UNDEF-1)
+#define HADDR_MAX        (HADDR_UNDEF-1)
 
 /* uint32_t type is used for creation order field for messages.  It may be
  * defined in Posix.1g, otherwise it is defined here.
@@ -286,7 +286,7 @@ typedef enum {
     H5_ITER_INC,                /* Increasing order */
     H5_ITER_DEC,                /* Decreasing order */
     H5_ITER_NATIVE,             /* No particular order, whatever is fastest */
-    H5_ITER_N		        /* Number of iteration orders */
+    H5_ITER_N                /* Number of iteration orders */
 } H5_iter_order_t;
 
 /* Iteration callback values */
@@ -303,10 +303,10 @@ typedef enum {
  * links in groups/attributes on objects.
  */
 typedef enum H5_index_t {
-    H5_INDEX_UNKNOWN = -1,	/* Unknown index type			*/
-    H5_INDEX_NAME,		/* Index on names 			*/
-    H5_INDEX_CRT_ORDER,		/* Index on creation order 		*/
-    H5_INDEX_N			/* Number of indices defined 		*/
+    H5_INDEX_UNKNOWN = -1,    /* Unknown index type            */
+    H5_INDEX_NAME,        /* Index on names             */
+    H5_INDEX_CRT_ORDER,        /* Index on creation order         */
+    H5_INDEX_N            /* Number of indices defined         */
 } H5_index_t;
 
 /*
@@ -326,9 +326,9 @@ H5_DLL herr_t H5set_free_list_limits (int reg_global_lim, int reg_list_lim,
                 int arr_global_lim, int arr_list_lim, int blk_global_lim,
                 int blk_list_lim);
 H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum,
-				unsigned *relnum);
+                unsigned *relnum);
 H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum,
-			       unsigned relnum);
+                unsigned relnum);
 H5_DLL herr_t H5is_library_threadsafe(hbool_t *is_ts);
 H5_DLL herr_t H5free_memory(void *mem);
 H5_DLL void *H5allocate_memory(size_t size, hbool_t clear);
@@ -338,5 +338,5 @@ H5_DLL void *H5resize_memory(void *mem, size_t size);
 }
 #endif
 #endif /* _H5public_H */
- 
+
 
diff --git a/src/H5timer.c b/src/H5timer.c
index d309ae7..4f9f893 100644
--- a/src/H5timer.c
+++ b/src/H5timer.c
@@ -213,26 +213,26 @@ H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
         if(H5_DBL_ABS_EQUAL(bw, 0.0F))
 	        HDstrcpy(buf, "0.000  B/s");
         else if(bw < 1.0F)
-            sprintf(buf, "%10.4e", bw);
+            HDsprintf(buf, "%10.4e", bw);
         else if(bw < H5_KB) {
-            sprintf(buf, "%05.4f", bw);
+            HDsprintf(buf, "%05.4f", bw);
             HDstrcpy(buf+5, "  B/s");
         } else if(bw < H5_MB) {
-            sprintf(buf, "%05.4f", bw / H5_KB);
+            HDsprintf(buf, "%05.4f", bw / H5_KB);
             HDstrcpy(buf+5, " kB/s");
         } else if(bw < H5_GB) {
-            sprintf(buf, "%05.4f", bw / H5_MB);
+            HDsprintf(buf, "%05.4f", bw / H5_MB);
             HDstrcpy(buf+5, " MB/s");
         } else if(bw < H5_TB) {
-            sprintf(buf, "%05.4f", bw / H5_GB);
+            HDsprintf(buf, "%05.4f", bw / H5_GB);
             HDstrcpy(buf+5, " GB/s");
         } else if(bw < H5_EB) {
-            sprintf(buf, "%05.4f", bw / H5_TB);
+            HDsprintf(buf, "%05.4f", bw / H5_TB);
             HDstrcpy(buf+5, " TB/s");
         } else {
-            sprintf(buf, "%10.4e", bw);
+            HDsprintf(buf, "%10.4e", bw);
             if(HDstrlen(buf) > 10)
-                sprintf(buf, "%10.3e", bw);
+                HDsprintf(buf, "%10.3e", bw);
         }
     }
 } /* end H5_bandwidth() */
diff --git a/src/H5trace.c b/src/H5trace.c
index 0e3c9ff..30da8de 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -176,26 +176,26 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             if(H5_debug_g.ttimes) {
                 char tmp[128];
 
-                sprintf(tmp, "%.6f", event_time.etime-first_time.etime);
-                fprintf(out, " %*s ", (int)HDstrlen(tmp), "");
+                HDsprintf(tmp, "%.6f", event_time.etime-first_time.etime);
+                HDfprintf(out, " %*s ", (int)HDstrlen(tmp), "");
             } /* end if */
             for(i = 0; i < current_depth; i++)
                 HDfputc('+', out);
-            fprintf(out, "%*s%s = ", 2*current_depth, "", func);
+            HDfprintf(out, "%*s%s = ", 2*current_depth, "", func);
         } /* end if */
         else {
             /* Continue current line with return value */
-            fprintf(out, " = ");
+            HDfprintf(out, " = ");
         } /* end else */
     } /* end if */
     else {
         if(current_depth>last_call_depth)
             HDfputs(" = <delayed>\n", out);
         if(H5_debug_g.ttimes)
-            fprintf(out, "@%.6f ", event_time.etime - first_time.etime);
+            HDfprintf(out, "@%.6f ", event_time.etime - first_time.etime);
         for(i = 0; i < current_depth; i++)
             HDfputc('+', out);
-        fprintf(out, "%*s%s(", 2*current_depth, "", func);
+        HDfprintf(out, "%*s%s(", 2*current_depth, "", func);
     } /* end else */
 
     /* Clear array sizes */
@@ -237,7 +237,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
 		buf[MIN((int)sizeof(buf) - 1, n)] = '\0';
 		argname = buf;
 	    } /* end if */
-	    fprintf(out, "%s%s=", argno?", ":"", argname);
+	    HDfprintf(out, "%s%s=", argno?", ":"", argname);
 	} /* end if */
         else
 	    argname = "";
@@ -249,9 +249,9 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'a':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     haddr_t addr = va_arg(ap, haddr_t); /*lint !e732 Loss of sign not really occuring */
@@ -263,33 +263,33 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'b':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     hbool_t bool_var = va_arg(ap, hbool_t); /*lint !e732 Loss of sign not really occuring */
 
                     if(TRUE == bool_var)
-                        fprintf(out, "TRUE");
+                        HDfprintf(out, "TRUE");
                     else if(!bool_var)
-                        fprintf(out, "FALSE");
+                        HDfprintf(out, "FALSE");
                     else
-                        fprintf(out, "TRUE(%u)", (unsigned)bool_var);
+                        HDfprintf(out, "TRUE(%u)", (unsigned)bool_var);
                 }
                 break;
 
             case 'd':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     double dbl = va_arg(ap, double);
 
-                    fprintf(out, "%g", dbl);
+                    HDfprintf(out, "%g", dbl);
                 } /* end else */
                 break;
 
@@ -298,36 +298,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'a':
                         if(ptr) {
                             if(vp)
-                                fprintf (out, "0x%lx", (unsigned long)vp);
+                                HDfprintf (out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_alloc_time_t alloc_time = (H5D_alloc_time_t)va_arg(ap, int);
 
                             switch(alloc_time) {
                                 case H5D_ALLOC_TIME_ERROR:
-                                    fprintf(out, "H5D_ALLOC_TIME_ERROR");
+                                    HDfprintf(out, "H5D_ALLOC_TIME_ERROR");
                                     break;
 
                                 case H5D_ALLOC_TIME_DEFAULT:
-                                    fprintf(out, "H5D_ALLOC_TIME_DEFAULT");
+                                    HDfprintf(out, "H5D_ALLOC_TIME_DEFAULT");
                                     break;
 
                                 case H5D_ALLOC_TIME_EARLY:
-                                    fprintf(out, "H5D_ALLOC_TIME_EARLY");
+                                    HDfprintf(out, "H5D_ALLOC_TIME_EARLY");
                                     break;
 
                                 case H5D_ALLOC_TIME_LATE:
-                                    fprintf(out, "H5D_ALLOC_TIME_LATE");
+                                    HDfprintf(out, "H5D_ALLOC_TIME_LATE");
                                     break;
 
                                 case H5D_ALLOC_TIME_INCR:
-                                    fprintf(out, "H5D_ALLOC_TIME_INCR");
+                                    HDfprintf(out, "H5D_ALLOC_TIME_INCR");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)alloc_time);
+                                    HDfprintf(out, "%ld", (long)alloc_time);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -336,24 +336,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'c':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5FD_mpio_collective_opt_t opt = (H5FD_mpio_collective_opt_t)va_arg(ap, int);
 
                             switch(opt) {
                                 case H5FD_MPIO_COLLECTIVE_IO:
-                                    fprintf(out, "H5FD_MPIO_COLLECTIVE_IO");
+                                    HDfprintf(out, "H5FD_MPIO_COLLECTIVE_IO");
                                     break;
 
                                 case H5FD_MPIO_INDIVIDUAL_IO:
-                                    fprintf(out, "H5FD_MPIO_INDIVIDUAL_IO");
+                                    HDfprintf(out, "H5FD_MPIO_INDIVIDUAL_IO");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)opt);
+                                    HDfprintf(out, "%ld", (long)opt);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -362,32 +362,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'f':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_fill_time_t fill_time = (H5D_fill_time_t)va_arg(ap, int);
 
                             switch(fill_time) {
                                 case H5D_FILL_TIME_ERROR:
-                                    fprintf(out, "H5D_FILL_TIME_ERROR");
+                                    HDfprintf(out, "H5D_FILL_TIME_ERROR");
                                     break;
 
                                 case H5D_FILL_TIME_ALLOC:
-                                    fprintf(out, "H5D_FILL_TIME_ALLOC");
+                                    HDfprintf(out, "H5D_FILL_TIME_ALLOC");
                                     break;
 
                                 case H5D_FILL_TIME_NEVER:
-                                    fprintf(out, "H5D_FILL_TIME_NEVER");
+                                    HDfprintf(out, "H5D_FILL_TIME_NEVER");
                                     break;
 
                                 case H5D_FILL_TIME_IFSET:
-                                    fprintf(out, "H5D_FILL_TIME_IFSET");
+                                    HDfprintf(out, "H5D_FILL_TIME_IFSET");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)fill_time);
+                                    HDfprintf(out, "%ld", (long)fill_time);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -396,32 +396,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'F':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_fill_value_t fill_value = (H5D_fill_value_t)va_arg(ap, int);
 
                             switch(fill_value) {
                                 case H5D_FILL_VALUE_ERROR:
-                                    fprintf(out, "H5D_FILL_VALUE_ERROR");
+                                    HDfprintf(out, "H5D_FILL_VALUE_ERROR");
                                     break;
 
                                 case H5D_FILL_VALUE_UNDEFINED:
-                                    fprintf(out, "H5D_FILL_VALUE_UNDEFINED");
+                                    HDfprintf(out, "H5D_FILL_VALUE_UNDEFINED");
                                     break;
 
                                 case H5D_FILL_VALUE_DEFAULT:
-                                    fprintf(out, "H5D_FILL_VALUE_DEFAULT");
+                                    HDfprintf(out, "H5D_FILL_VALUE_DEFAULT");
                                     break;
 
                                 case H5D_FILL_VALUE_USER_DEFINED:
-                                    fprintf(out, "H5D_FILL_VALUE_USER_DEFINED");
+                                    HDfprintf(out, "H5D_FILL_VALUE_USER_DEFINED");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)fill_value);
+                                    HDfprintf(out, "%ld", (long)fill_value);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -430,28 +430,28 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'h':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5FD_mpio_chunk_opt_t opt = (H5FD_mpio_chunk_opt_t)va_arg(ap, int);
 
                             switch(opt) {
                                 case H5FD_MPIO_CHUNK_DEFAULT:
-                                    fprintf(out, "H5FD_MPIO_CHUNK_DEFAULT");
+                                    HDfprintf(out, "H5FD_MPIO_CHUNK_DEFAULT");
                                     break;
 
                                 case H5FD_MPIO_CHUNK_ONE_IO:
-                                    fprintf(out, "H5FD_MPIO_CHUNK_ONE_IO");
+                                    HDfprintf(out, "H5FD_MPIO_CHUNK_ONE_IO");
                                     break;
 
                                 case H5FD_MPIO_CHUNK_MULTI_IO:
-                                    fprintf(out, "H5FD_MPIO_CHUNK_MULTI_IO");
+                                    HDfprintf(out, "H5FD_MPIO_CHUNK_MULTI_IO");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)opt);
+                                    HDfprintf(out, "%ld", (long)opt);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -460,36 +460,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'i':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_mpio_actual_io_mode_t actual_io_mode = (H5D_mpio_actual_io_mode_t)va_arg(ap, int);
 
                             switch(actual_io_mode) {
                                 case H5D_MPIO_NO_COLLECTIVE:
-                                    fprintf(out, "H5D_MPIO_NO_COLLECTIVE");
+                                    HDfprintf(out, "H5D_MPIO_NO_COLLECTIVE");
                                     break;
 
                                 case H5D_MPIO_CHUNK_INDEPENDENT:
-                                    fprintf(out, "H5D_MPIO_CHUNK_INDEPENDENT");
+                                    HDfprintf(out, "H5D_MPIO_CHUNK_INDEPENDENT");
                                     break;
 
                                 case H5D_MPIO_CHUNK_COLLECTIVE:
-                                    fprintf(out, "H5D_MPIO_CHUNK_COLLECTIVE");
+                                    HDfprintf(out, "H5D_MPIO_CHUNK_COLLECTIVE");
                                     break;
 
                                 case H5D_MPIO_CHUNK_MIXED:
-                                    fprintf(out, "H5D_MPIO_CHUNK_MIXED");
+                                    HDfprintf(out, "H5D_MPIO_CHUNK_MIXED");
                                     break;
 
                                 case H5D_MPIO_CONTIGUOUS_COLLECTIVE:
-                                    fprintf(out, "H5D_MPIO_CONTIGUOUS_COLLECTIVE");
+                                    HDfprintf(out, "H5D_MPIO_CONTIGUOUS_COLLECTIVE");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)actual_io_mode);
+                                    HDfprintf(out, "%ld", (long)actual_io_mode);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -498,36 +498,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'l':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_layout_t layout = (H5D_layout_t)va_arg(ap, int);
 
                             switch(layout) {
                                 case H5D_LAYOUT_ERROR:
-                                    fprintf(out, "H5D_LAYOUT_ERROR");
+                                    HDfprintf(out, "H5D_LAYOUT_ERROR");
                                     break;
 
                                 case H5D_COMPACT:
-                                    fprintf(out, "H5D_COMPACT");
+                                    HDfprintf(out, "H5D_COMPACT");
                                     break;
 
                                 case H5D_CONTIGUOUS:
-                                    fprintf(out, "H5D_CONTIGUOUS");
+                                    HDfprintf(out, "H5D_CONTIGUOUS");
                                     break;
 
                                 case H5D_CHUNKED:
-                                    fprintf(out, "H5D_CHUNKED");
+                                    HDfprintf(out, "H5D_CHUNKED");
                                     break;
 
                                 case H5D_NLAYOUTS:
-                                    fprintf(out, "H5D_NLAYOUTS");
+                                    HDfprintf(out, "H5D_NLAYOUTS");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)layout);
+                                    HDfprintf(out, "%ld", (long)layout);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -536,9 +536,9 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'n':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_mpio_no_collective_cause_t nocol_cause_mode = (H5D_mpio_no_collective_cause_t)va_arg(ap, int);
@@ -546,69 +546,69 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
 
                             /* Check for all bit-flags which might be set */
                             if(nocol_cause_mode & H5D_MPIO_COLLECTIVE) {
-                                fprintf(out, "H5D_MPIO_COLLECTIVE");
+                                HDfprintf(out, "H5D_MPIO_COLLECTIVE");
                                 flag_already_displayed = TRUE;
                             } /* end if */
                             if(nocol_cause_mode & H5D_MPIO_SET_INDEPENDENT) {
-                                fprintf(out, "%sH5D_MPIO_SET_INDEPENDENT", flag_already_displayed ? " | " : "");
+                                HDfprintf(out, "%sH5D_MPIO_SET_INDEPENDENT", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
                             if(nocol_cause_mode & H5D_MPIO_DATATYPE_CONVERSION) {
-                                fprintf(out, "%sH5D_MPIO_DATATYPE_CONVERSION", flag_already_displayed ? " | " : "");
+                                HDfprintf(out, "%sH5D_MPIO_DATATYPE_CONVERSION", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
                             if(nocol_cause_mode & H5D_MPIO_DATA_TRANSFORMS) {
-                                fprintf(out, "%sH5D_MPIO_DATA_TRANSFORMS", flag_already_displayed ? " | " : "");
+                                HDfprintf(out, "%sH5D_MPIO_DATA_TRANSFORMS", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
                             if(nocol_cause_mode & H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED) {
-                                fprintf(out, "%sH5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED", flag_already_displayed ? " | " : "");
+                                HDfprintf(out, "%sH5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
                             if(nocol_cause_mode & H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES) {
-                                fprintf(out, "%sH5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES", flag_already_displayed ? " | " : "");
+                                HDfprintf(out, "%sH5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
                             if(nocol_cause_mode & H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET) {
-                                fprintf(out, "%sH5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET", flag_already_displayed ? " | " : "");
+                                HDfprintf(out, "%sH5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
                             if(nocol_cause_mode & H5D_MPIO_FILTERS) {
-                                fprintf(out, "%sH5D_MPIO_FILTERS", flag_already_displayed ? " | " : "");
+                                HDfprintf(out, "%sH5D_MPIO_FILTERS", flag_already_displayed ? " | " : "");
                                 flag_already_displayed = TRUE;
                             } /* end if */
 
                             /* Display '<none>' if there's no flags set */
                             if(!flag_already_displayed)
-                                fprintf(out, "<none>");
+                                HDfprintf(out, "<none>");
                         } /* end else */
                         break;
 
                     case 'o':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode = (H5D_mpio_actual_chunk_opt_mode_t)va_arg(ap, int);
 
                             switch(chunk_opt_mode) {
                                 case H5D_MPIO_NO_CHUNK_OPTIMIZATION:
-                                    fprintf(out, "H5D_MPIO_NO_CHUNK_OPTIMIZATION");
+                                    HDfprintf(out, "H5D_MPIO_NO_CHUNK_OPTIMIZATION");
                                     break;
 
                                 case H5D_MPIO_LINK_CHUNK:
-                                    fprintf(out, "H5D_MPIO_LINK_CHUNK");
+                                    HDfprintf(out, "H5D_MPIO_LINK_CHUNK");
                                     break;
 
                                 case H5D_MPIO_MULTI_CHUNK:
-                                    fprintf(out, "H5D_MPIO_MULTI_CHUNK");
+                                    HDfprintf(out, "H5D_MPIO_MULTI_CHUNK");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)chunk_opt_mode);
+                                    HDfprintf(out, "%ld", (long)chunk_opt_mode);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -617,32 +617,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 's':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5D_space_status_t space_status = (H5D_space_status_t)va_arg(ap, int);
 
                             switch(space_status) {
                                 case H5D_SPACE_STATUS_NOT_ALLOCATED:
-                                    fprintf(out, "H5D_SPACE_STATUS_NOT_ALLOCATED");
+                                    HDfprintf(out, "H5D_SPACE_STATUS_NOT_ALLOCATED");
                                     break;
 
                                 case H5D_SPACE_STATUS_PART_ALLOCATED:
-                                    fprintf(out, "H5D_SPACE_STATUS_PART_ALLOCATED");
+                                    HDfprintf(out, "H5D_SPACE_STATUS_PART_ALLOCATED");
                                     break;
 
                                 case H5D_SPACE_STATUS_ALLOCATED:
-                                    fprintf(out, "H5D_SPACE_STATUS_ALLOCATED");
+                                    HDfprintf(out, "H5D_SPACE_STATUS_ALLOCATED");
                                     break;
 
                                 case H5D_SPACE_STATUS_ERROR:
-                                    fprintf(out, "H5D_SPACE_STATUS_ERROR");
+                                    HDfprintf(out, "H5D_SPACE_STATUS_ERROR");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)space_status);
+                                    HDfprintf(out, "%ld", (long)space_status);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -651,31 +651,31 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5FD_mpio_xfer_t transfer = (H5FD_mpio_xfer_t)va_arg(ap, int);
 
                             switch(transfer) {
                                 case H5FD_MPIO_INDEPENDENT:
-                                    fprintf(out, "H5FD_MPIO_INDEPENDENT");
+                                    HDfprintf(out, "H5FD_MPIO_INDEPENDENT");
                                     break;
 
                                 case H5FD_MPIO_COLLECTIVE:
-                                    fprintf(out, "H5FD_MPIO_COLLECTIVE");
+                                    HDfprintf(out, "H5FD_MPIO_COLLECTIVE");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)transfer);
+                                    HDfprintf(out, "%ld", (long)transfer);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf (out, "BADTYPE(D%c)", type[1]);
+                        HDfprintf (out, "BADTYPE(D%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -683,17 +683,17 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'e':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     herr_t status = va_arg(ap, herr_t);
 
                     if(status >= 0)
-                        fprintf(out, "SUCCEED");
+                        HDfprintf(out, "SUCCEED");
                     else 
-                        fprintf(out, "FAIL");
+                        HDfprintf(out, "FAIL");
                 } /* end else */
                 break;
 
@@ -702,24 +702,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'd':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5E_direction_t direction = (H5E_direction_t)va_arg(ap, int);
 
                             switch(direction) {
                                 case H5E_WALK_UPWARD:
-                                    fprintf(out, "H5E_WALK_UPWARD");
+                                    HDfprintf(out, "H5E_WALK_UPWARD");
                                     break;
 
                                 case H5E_WALK_DOWNWARD:
-                                    fprintf(out, "H5E_WALK_DOWNWARD");
+                                    HDfprintf(out, "H5E_WALK_DOWNWARD");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)direction);
+                                    HDfprintf(out, "%ld", (long)direction);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -728,45 +728,45 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'e':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5E_error2_t *error = va_arg(ap, H5E_error2_t *); /*lint !e64 Type mismatch not really occuring */
 
-                            fprintf(out, "0x%lx", (unsigned long)error);
+                            HDfprintf(out, "0x%lx", (unsigned long)error);
                         } /* end else */
                         break;
 
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5E_type_t etype = (H5E_type_t)va_arg(ap, int);
 
                             switch(etype) {
                                 case H5E_MAJOR:
-                                    fprintf(out, "H5E_MAJOR");
+                                    HDfprintf(out, "H5E_MAJOR");
                                     break;
 
                                 case H5E_MINOR:
-                                    fprintf(out, "H5E_MINOR");
+                                    HDfprintf(out, "H5E_MINOR");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)etype);
+                                    HDfprintf(out, "%ld", (long)etype);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf(out, "BADTYPE(E%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(E%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -776,32 +776,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'd':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5F_close_degree_t degree = (H5F_close_degree_t)va_arg(ap, int);
 
                             switch(degree) {
                                 case H5F_CLOSE_DEFAULT:
-                                    fprintf(out, "H5F_CLOSE_DEFAULT");
+                                    HDfprintf(out, "H5F_CLOSE_DEFAULT");
                                     break;
 
                                 case H5F_CLOSE_WEAK:
-                                    fprintf(out, "H5F_CLOSE_WEAK");
+                                    HDfprintf(out, "H5F_CLOSE_WEAK");
                                     break;
 
                                 case H5F_CLOSE_SEMI:
-                                    fprintf(out, "H5F_CLOSE_SEMI");
+                                    HDfprintf(out, "H5F_CLOSE_SEMI");
                                     break;
 
                                 case H5F_CLOSE_STRONG:
-                                    fprintf(out, "H5F_CLOSE_STRONG");
+                                    HDfprintf(out, "H5F_CLOSE_STRONG");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)degree);
+                                    HDfprintf(out, "%ld", (long)degree);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -810,49 +810,49 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'm':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5F_mem_t mem_type = (H5F_mem_t)va_arg(ap, int);
 
                             switch(mem_type) {
                                 case H5FD_MEM_NOLIST:
-                                    fprintf(out, "H5FD_MEM_NOLIST");
+                                    HDfprintf(out, "H5FD_MEM_NOLIST");
                                     break;
 
                                 case H5FD_MEM_DEFAULT:
-                                    fprintf(out, "H5FD_MEM_DEFAULT");
+                                    HDfprintf(out, "H5FD_MEM_DEFAULT");
                                     break;
 
                                 case H5FD_MEM_SUPER:
-                                    fprintf(out, "H5FD_MEM_SUPER");
+                                    HDfprintf(out, "H5FD_MEM_SUPER");
                                     break;
 
                                 case H5FD_MEM_BTREE:
-                                    fprintf(out, "H5FD_MEM_BTREE");
+                                    HDfprintf(out, "H5FD_MEM_BTREE");
                                     break;
 
                                 case H5FD_MEM_DRAW:
-                                    fprintf(out, "H5FD_MEM_DRAW");
+                                    HDfprintf(out, "H5FD_MEM_DRAW");
                                     break;
 
                                 case H5FD_MEM_GHEAP:
-                                    fprintf(out, "H5FD_MEM_GHEAP");
+                                    HDfprintf(out, "H5FD_MEM_GHEAP");
                                     break;
 
                                 case H5FD_MEM_LHEAP:
-                                    fprintf(out, "H5FD_MEM_LHEAP");
+                                    HDfprintf(out, "H5FD_MEM_LHEAP");
                                     break;
 
                                 case H5FD_MEM_OHDR:
-                                    fprintf(out, "H5FD_MEM_OHDR");
+                                    HDfprintf(out, "H5FD_MEM_OHDR");
                                     break;
 
                                 case H5FD_MEM_NTYPES:
                                 default:
-                                    fprintf(out, "%ld", (long)mem_type);
+                                    HDfprintf(out, "%ld", (long)mem_type);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -861,24 +861,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 's':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5F_scope_t scope = (H5F_scope_t)va_arg(ap, int);
 
                             switch(scope) {
                                 case H5F_SCOPE_LOCAL:
-                                    fprintf(out, "H5F_SCOPE_LOCAL");
+                                    HDfprintf(out, "H5F_SCOPE_LOCAL");
                                     break;
 
                                 case H5F_SCOPE_GLOBAL:
-                                    fprintf(out, "H5F_SCOPE_GLOBAL");
+                                    HDfprintf(out, "H5F_SCOPE_GLOBAL");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)scope);
+                                    HDfprintf(out, "%ld", (long)scope);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -887,31 +887,31 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'v':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5F_libver_t libver_vers = (H5F_libver_t)va_arg(ap, int);
 
                             switch(libver_vers) {
                                 case H5F_LIBVER_EARLIEST:
-                                    fprintf(out, "H5F_LIBVER_EARLIEST");
+                                    HDfprintf(out, "H5F_LIBVER_EARLIEST");
                                     break;
 
                                 case H5F_LIBVER_LATEST:
-                                    fprintf(out, "H5F_LIBVER_LATEST");
+                                    HDfprintf(out, "H5F_LIBVER_LATEST");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)libver_vers);
+                                    HDfprintf(out, "%ld", (long)libver_vers);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf(out, "BADTYPE(F%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(F%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -922,46 +922,46 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'o':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5G_obj_t obj_type = (H5G_obj_t)va_arg(ap, int);
 
                             switch(obj_type) {
                                 case H5G_UNKNOWN:
-                                    fprintf(out, "H5G_UNKNOWN");
+                                    HDfprintf(out, "H5G_UNKNOWN");
                                     break;
 
                                 case H5G_GROUP:
-                                    fprintf(out, "H5G_GROUP");
+                                    HDfprintf(out, "H5G_GROUP");
                                     break;
 
                                 case H5G_DATASET:
-                                    fprintf(out, "H5G_DATASET");
+                                    HDfprintf(out, "H5G_DATASET");
                                     break;
 
                                 case H5G_TYPE:
-                                    fprintf(out, "H5G_TYPE");
+                                    HDfprintf(out, "H5G_TYPE");
                                     break;
 
                                 case H5G_LINK:
-                                    fprintf(out, "H5G_LINK");
+                                    HDfprintf(out, "H5G_LINK");
                                     break;
 
                                 case H5G_UDLINK:
-                                    fprintf(out, "H5G_UDLINK");
+                                    HDfprintf(out, "H5G_UDLINK");
                                     break;
 
                                 case H5G_RESERVED_5:
                                 case H5G_RESERVED_6:
                                 case H5G_RESERVED_7:
-                                    fprintf(out, "H5G_RESERVED(%ld)", (long)obj_type);
+                                    HDfprintf(out, "H5G_RESERVED(%ld)", (long)obj_type);
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)obj_type);
+                                    HDfprintf(out, "%ld", (long)obj_type);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -970,20 +970,20 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 's':
                         if(ptr) {
                             if(vp)
-                                fprintf (out, "0x%lx", (unsigned long)vp);
+                                HDfprintf (out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5G_stat_t *statbuf = va_arg(ap, H5G_stat_t*); /*lint !e64 Type mismatch not really occuring */
 
-                            fprintf(out, "0x%lx", (unsigned long)statbuf);
+                            HDfprintf(out, "0x%lx", (unsigned long)statbuf);
                         }
                         break;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
                     default:
-                        fprintf(out, "BADTYPE(G%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(G%c)", type[1]);
                         goto error;
                 }
                 break;
@@ -991,22 +991,22 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'h':
                 if(ptr) {
                     if(vp) {
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                         if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                             hsize_t *p = (hsize_t *)vp;
 
-                            fprintf(out, " {");
+                            HDfprintf(out, " {");
                             for(i = 0; i < asize[asize_idx]; i++) {
                                 if(H5S_UNLIMITED == p[i])
                                     HDfprintf(out, "%sH5S_UNLIMITED", (i ? ", " : ""));
                                 else
                                     HDfprintf(out, "%s%Hu", (i ? ", " : ""), p[i]);
                             } /* end for */
-                            fprintf(out, "}");
+                            HDfprintf(out, "}");
                         } /* end if */
                     } /* end if */
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     hsize_t hsize = va_arg(ap, hsize_t); /*lint !e732 Loss of sign not really occuring */
@@ -1025,18 +1025,18 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 's':
                         if(ptr) {
                             if(vp) {
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                                 if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     hssize_t *p = (hssize_t *)vp;
 
-                                    fprintf(out, " {");
+                                    HDfprintf(out, " {");
                                     for(i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%Hd", (i ? ", " : ""), p[i]);
-                                    fprintf(out, "}");
+                                    HDfprintf(out, "}");
                                 } /* end if */
                             } /* end if */
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             hssize_t hssize = va_arg(ap, hssize_t);
@@ -1047,7 +1047,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     default:
-                        fprintf (out, "BADTYPE(H%c)", type[1]);
+                        HDfprintf (out, "BADTYPE(H%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -1055,130 +1055,130 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'i':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     hid_t obj = va_arg(ap, hid_t);
 
                     if(H5P_DEFAULT == obj)
-                        fprintf(out, "H5P_DEFAULT");
+                        HDfprintf(out, "H5P_DEFAULT");
                     else if(obj < 0)
-                        fprintf(out, "FAIL");
+                        HDfprintf(out, "FAIL");
                     else {
                         switch(H5I_TYPE(obj)) { /* Use internal H5I macro instead of function call */
                             case H5I_UNINIT:
-                                fprintf(out, "%ld (uninit - error)", (long)obj);
+                                HDfprintf(out, "%ld (uninit - error)", (long)obj);
                                 break;
 
                             case H5I_BADID:
-                                fprintf(out, "%ld (error)", (long)obj);
+                                HDfprintf(out, "%ld (error)", (long)obj);
                                 break;
 
                             case H5I_FILE:
-                                fprintf(out, "%ld (file)", (long)obj);
+                                HDfprintf(out, "%ld (file)", (long)obj);
                                 break;
 
                             case H5I_GROUP:
-                                fprintf(out, "%ld (group)", (long)obj);
+                                HDfprintf(out, "%ld (group)", (long)obj);
                                 break;
 
                             case H5I_DATATYPE:
                                 if(obj == H5T_NATIVE_SCHAR_g)
-                                    fprintf(out, "H5T_NATIVE_SCHAR");
+                                    HDfprintf(out, "H5T_NATIVE_SCHAR");
                                 else if(obj == H5T_NATIVE_UCHAR_g)
-                                    fprintf(out, "H5T_NATIVE_UCHAR");
+                                    HDfprintf(out, "H5T_NATIVE_UCHAR");
                                 else if(obj == H5T_NATIVE_SHORT_g)
-                                    fprintf(out, "H5T_NATIVE_SHORT");
+                                    HDfprintf(out, "H5T_NATIVE_SHORT");
                                 else if(obj == H5T_NATIVE_USHORT_g)
-                                    fprintf(out, "H5T_NATIVE_USHORT");
+                                    HDfprintf(out, "H5T_NATIVE_USHORT");
                                 else if(obj == H5T_NATIVE_INT_g)
-                                    fprintf(out, "H5T_NATIVE_INT");
+                                    HDfprintf(out, "H5T_NATIVE_INT");
                                 else if(obj == H5T_NATIVE_UINT_g)
-                                    fprintf(out, "H5T_NATIVE_UINT");
+                                    HDfprintf(out, "H5T_NATIVE_UINT");
                                 else if(obj == H5T_NATIVE_LONG_g)
-                                    fprintf(out, "H5T_NATIVE_LONG");
+                                    HDfprintf(out, "H5T_NATIVE_LONG");
                                 else if(obj == H5T_NATIVE_ULONG_g)
-                                    fprintf(out, "H5T_NATIVE_ULONG");
+                                    HDfprintf(out, "H5T_NATIVE_ULONG");
                                 else if(obj == H5T_NATIVE_LLONG_g)
-                                    fprintf(out, "H5T_NATIVE_LLONG");
+                                    HDfprintf(out, "H5T_NATIVE_LLONG");
                                 else if(obj == H5T_NATIVE_ULLONG_g)
-                                    fprintf(out, "H5T_NATIVE_ULLONG");
+                                    HDfprintf(out, "H5T_NATIVE_ULLONG");
                                 else if(obj == H5T_NATIVE_FLOAT_g)
-                                    fprintf(out, "H5T_NATIVE_FLOAT");
+                                    HDfprintf(out, "H5T_NATIVE_FLOAT");
                                 else if(obj == H5T_NATIVE_DOUBLE_g)
-                                    fprintf(out, "H5T_NATIVE_DOUBLE");
+                                    HDfprintf(out, "H5T_NATIVE_DOUBLE");
 #if H5_SIZEOF_LONG_DOUBLE !=0
                                 else if(obj == H5T_NATIVE_LDOUBLE_g)
-                                    fprintf(out, "H5T_NATIVE_LDOUBLE");
+                                    HDfprintf(out, "H5T_NATIVE_LDOUBLE");
 #endif
                                 else if(obj == H5T_IEEE_F32BE_g)
-                                    fprintf(out, "H5T_IEEE_F32BE");
+                                    HDfprintf(out, "H5T_IEEE_F32BE");
                                 else if(obj == H5T_IEEE_F32LE_g)
-                                    fprintf(out, "H5T_IEEE_F32LE");
+                                    HDfprintf(out, "H5T_IEEE_F32LE");
                                 else if(obj == H5T_IEEE_F64BE_g)
-                                    fprintf(out, "H5T_IEEE_F64BE");
+                                    HDfprintf(out, "H5T_IEEE_F64BE");
                                 else if(obj == H5T_IEEE_F64LE_g)
-                                    fprintf(out, "H5T_IEEE_F64LE");
+                                    HDfprintf(out, "H5T_IEEE_F64LE");
                                 else if(obj == H5T_STD_I8BE_g)
-                                    fprintf(out, "H5T_STD_I8BE");
+                                    HDfprintf(out, "H5T_STD_I8BE");
                                 else if(obj == H5T_STD_I8LE_g)
-                                    fprintf(out, "H5T_STD_I8LE");
+                                    HDfprintf(out, "H5T_STD_I8LE");
                                 else if(obj == H5T_STD_I16BE_g)
-                                    fprintf(out, "H5T_STD_I16BE");
+                                    HDfprintf(out, "H5T_STD_I16BE");
                                 else if(obj == H5T_STD_I16LE_g)
-                                    fprintf(out, "H5T_STD_I16LE");
+                                    HDfprintf(out, "H5T_STD_I16LE");
                                 else if(obj == H5T_STD_I32BE_g)
-                                    fprintf(out, "H5T_STD_I32BE");
+                                    HDfprintf(out, "H5T_STD_I32BE");
                                 else if(obj == H5T_STD_I32LE_g)
-                                    fprintf(out, "H5T_STD_I32LE");
+                                    HDfprintf(out, "H5T_STD_I32LE");
                                 else if(obj == H5T_STD_I64BE_g)
-                                    fprintf(out, "H5T_STD_I64BE");
+                                    HDfprintf(out, "H5T_STD_I64BE");
                                 else if(obj == H5T_STD_I64LE_g)
-                                    fprintf(out, "H5T_STD_I64LE");
+                                    HDfprintf(out, "H5T_STD_I64LE");
                                 else if(obj == H5T_STD_U8BE_g)
-                                    fprintf(out, "H5T_STD_U8BE");
+                                    HDfprintf(out, "H5T_STD_U8BE");
                                 else if(obj == H5T_STD_U8LE_g)
-                                    fprintf(out, "H5T_STD_U8LE");
+                                    HDfprintf(out, "H5T_STD_U8LE");
                                 else if(obj == H5T_STD_U16BE_g)
-                                    fprintf(out, "H5T_STD_U16BE");
+                                    HDfprintf(out, "H5T_STD_U16BE");
                                 else if(obj == H5T_STD_U16LE_g)
-                                    fprintf(out, "H5T_STD_U16LE");
+                                    HDfprintf(out, "H5T_STD_U16LE");
                                 else if(obj == H5T_STD_U32BE_g)
-                                    fprintf(out, "H5T_STD_U32BE");
+                                    HDfprintf(out, "H5T_STD_U32BE");
                                 else if(obj == H5T_STD_U32LE_g)
-                                    fprintf(out, "H5T_STD_U32LE");
+                                    HDfprintf(out, "H5T_STD_U32LE");
                                 else if(obj == H5T_STD_U64BE_g)
-                                    fprintf(out, "H5T_STD_U64BE");
+                                    HDfprintf(out, "H5T_STD_U64BE");
                                 else if(obj == H5T_STD_U64LE_g)
-                                    fprintf(out, "H5T_STD_U64LE");
+                                    HDfprintf(out, "H5T_STD_U64LE");
                                 else if(obj == H5T_STD_B8BE_g)
-                                    fprintf(out, "H5T_STD_B8BE");
+                                    HDfprintf(out, "H5T_STD_B8BE");
                                 else if(obj == H5T_STD_B8LE_g)
-                                    fprintf(out, "H5T_STD_B8LE");
+                                    HDfprintf(out, "H5T_STD_B8LE");
                                 else if(obj == H5T_STD_B16BE_g)
-                                    fprintf(out, "H5T_STD_B16BE");
+                                    HDfprintf(out, "H5T_STD_B16BE");
                                 else if(obj == H5T_STD_B16LE_g)
-                                    fprintf(out, "H5T_STD_B16LE");
+                                    HDfprintf(out, "H5T_STD_B16LE");
                                 else if(obj == H5T_STD_B32BE_g)
-                                    fprintf(out, "H5T_STD_B32BE");
+                                    HDfprintf(out, "H5T_STD_B32BE");
                                 else if(obj == H5T_STD_B32LE_g)
-                                    fprintf(out, "H5T_STD_B32LE");
+                                    HDfprintf(out, "H5T_STD_B32LE");
                                 else if(obj == H5T_STD_B64BE_g)
-                                    fprintf(out, "H5T_STD_B64BE");
+                                    HDfprintf(out, "H5T_STD_B64BE");
                                 else if(obj == H5T_STD_B64LE_g)
-                                    fprintf(out, "H5T_STD_B64LE");
+                                    HDfprintf(out, "H5T_STD_B64LE");
                                 else if(obj == H5T_C_S1_g)
-                                    fprintf(out, "H5T_C_S1");
+                                    HDfprintf(out, "H5T_C_S1");
                                 else if(obj == H5T_FORTRAN_S1_g)
-                                    fprintf(out, "H5T_FORTRAN_S1");
+                                    HDfprintf(out, "H5T_FORTRAN_S1");
                                 else
-                                    fprintf(out, "%ld (dtype)", (long)obj);
+                                    HDfprintf(out, "%ld (dtype)", (long)obj);
                                 break;
 
                             case H5I_DATASPACE:
-                                fprintf(out, "%ld (dspace)", (long)obj);
+                                HDfprintf(out, "%ld (dspace)", (long)obj);
                                 /* Save the rank of simple dataspaces for arrays */
                                 /* This may generate recursive call to the library... -QAK */
                                 {
@@ -1191,47 +1191,47 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 break;
 
                             case H5I_DATASET:
-                                fprintf(out, "%ld (dset)", (long)obj);
+                                HDfprintf(out, "%ld (dset)", (long)obj);
                                 break;
 
                             case H5I_ATTR:
-                                fprintf(out, "%ld (attr)", (long)obj);
+                                HDfprintf(out, "%ld (attr)", (long)obj);
                                 break;
 
                             case H5I_REFERENCE:
-                                fprintf(out, "%ld (reference)", (long)obj);
+                                HDfprintf(out, "%ld (reference)", (long)obj);
                                 break;
 
                             case H5I_VFL:
-                                fprintf(out, "%ld (file driver)", (long)obj);
+                                HDfprintf(out, "%ld (file driver)", (long)obj);
                                 break;
 
                             case H5I_GENPROP_CLS:
-                                fprintf(out, "%ld (genprop class)", (long)obj);
+                                HDfprintf(out, "%ld (genprop class)", (long)obj);
                                 break;
 
                             case H5I_GENPROP_LST:
-                                fprintf(out, "%ld (genprop list)", (long)obj);
+                                HDfprintf(out, "%ld (genprop list)", (long)obj);
                                 break;
 
                             case H5I_ERROR_CLASS:
-                                fprintf(out, "%ld (err class)", (long)obj);
+                                HDfprintf(out, "%ld (err class)", (long)obj);
                                 break;
 
                             case H5I_ERROR_MSG:
-                                fprintf(out, "%ld (err msg)", (long)obj);
+                                HDfprintf(out, "%ld (err msg)", (long)obj);
                                 break;
 
                             case H5I_ERROR_STACK:
-                                fprintf(out, "%ld (err stack)", (long)obj);
+                                HDfprintf(out, "%ld (err stack)", (long)obj);
                                 break;
 
                             case H5I_NTYPES:
-                                fprintf (out, "%ld (ntypes - error)", (long)obj);
+                                HDfprintf (out, "%ld (ntypes - error)", (long)obj);
                                 break;
 
                             default:
-                                fprintf(out, "%ld (unknown class)", (long)obj);
+                                HDfprintf(out, "%ld (unknown class)", (long)obj);
                                 break;
                         } /* end switch */
                     } /* end else */
@@ -1243,32 +1243,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'i':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5_index_t idx_type = (H5_index_t)va_arg(ap, int);
 
                             switch(idx_type) {
                                 case H5_INDEX_UNKNOWN:
-                                    fprintf(out, "H5_INDEX_UNKNOWN");
+                                    HDfprintf(out, "H5_INDEX_UNKNOWN");
                                     break;
 
                                 case H5_INDEX_NAME:
-                                    fprintf(out, "H5_INDEX_NAME");
+                                    HDfprintf(out, "H5_INDEX_NAME");
                                     break;
 
                                 case H5_INDEX_CRT_ORDER:
-                                    fprintf(out, "H5_INDEX_CRT_ORDER");
+                                    HDfprintf(out, "H5_INDEX_CRT_ORDER");
                                     break;
 
                                 case H5_INDEX_N:
-                                    fprintf(out, "H5_INDEX_N");
+                                    HDfprintf(out, "H5_INDEX_N");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)idx_type);
+                                    HDfprintf(out, "%ld", (long)idx_type);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1277,36 +1277,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'o':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5_iter_order_t order = (H5_iter_order_t)va_arg(ap, int);
 
                             switch(order) {
                                 case H5_ITER_UNKNOWN:
-                                    fprintf(out, "H5_ITER_UNKNOWN");
+                                    HDfprintf(out, "H5_ITER_UNKNOWN");
                                     break;
 
                                 case H5_ITER_INC:
-                                    fprintf(out, "H5_ITER_INC");
+                                    HDfprintf(out, "H5_ITER_INC");
                                     break;
 
                                 case H5_ITER_DEC:
-                                    fprintf(out, "H5_ITER_DEC");
+                                    HDfprintf(out, "H5_ITER_DEC");
                                     break;
 
                                 case H5_ITER_NATIVE:
-                                    fprintf(out, "H5_ITER_NATIVE");
+                                    HDfprintf(out, "H5_ITER_NATIVE");
                                     break;
 
                                 case H5_ITER_N:
-                                    fprintf(out, "H5_ITER_N");
+                                    HDfprintf(out, "H5_ITER_N");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)order);
+                                    HDfprintf(out, "%ld", (long)order);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1315,23 +1315,23 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 's':
                         if(ptr) {
                             if(vp) {
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                                 if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     int *p = (int*)vp;
 
-                                    fprintf(out, " {");
+                                    HDfprintf(out, " {");
                                     for(i = 0; i < asize[asize_idx]; i++)
-                                        fprintf(out, "%s%d", (i ? ", " : ""), p[i]);
-                                    fprintf(out, "}");
+                                        HDfprintf(out, "%s%d", (i ? ", " : ""), p[i]);
+                                    HDfprintf(out, "}");
                                 } /* end if */
                             } /* end if */
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             int is = va_arg(ap, int);
 
-                            fprintf (out, "%d", is);
+                            HDfprintf (out, "%d", is);
                             asize[argno] = is;
                         } /* end else */
                         break;
@@ -1339,80 +1339,80 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5I_type_t id_type = (H5I_type_t)va_arg(ap, int);
 
                             switch (id_type) {
                                 case H5I_UNINIT:
-                                    fprintf(out, "H5I_UNINIT");
+                                    HDfprintf(out, "H5I_UNINIT");
                                     break;
 
                                 case H5I_BADID:
-                                    fprintf(out, "H5I_BADID");
+                                    HDfprintf(out, "H5I_BADID");
                                     break;
 
                                 case H5I_FILE:
-                                    fprintf(out, "H5I_FILE");
+                                    HDfprintf(out, "H5I_FILE");
                                     break;
 
                                 case H5I_GROUP:
-                                    fprintf(out, "H5I_GROUP");
+                                    HDfprintf(out, "H5I_GROUP");
                                     break;
 
                                 case H5I_DATATYPE:
-                                    fprintf(out, "H5I_DATATYPE");
+                                    HDfprintf(out, "H5I_DATATYPE");
                                     break;
 
                                 case H5I_DATASPACE:
-                                    fprintf(out, "H5I_DATASPACE");
+                                    HDfprintf(out, "H5I_DATASPACE");
                                     break;
 
                                 case H5I_DATASET:
-                                    fprintf(out, "H5I_DATASET");
+                                    HDfprintf(out, "H5I_DATASET");
                                     break;
 
                                 case H5I_ATTR:
-                                    fprintf(out, "H5I_ATTR");
+                                    HDfprintf(out, "H5I_ATTR");
                                     break;
 
                                 case H5I_REFERENCE:
-                                    fprintf(out, "H5I_REFERENCE");
+                                    HDfprintf(out, "H5I_REFERENCE");
                                     break;
 
                                 case H5I_VFL:
-                                    fprintf(out, "H5I_VFL");
+                                    HDfprintf(out, "H5I_VFL");
                                     break;
 
                                 case H5I_GENPROP_CLS:
-                                    fprintf(out, "H5I_GENPROP_CLS");
+                                    HDfprintf(out, "H5I_GENPROP_CLS");
                                     break;
 
                                 case H5I_GENPROP_LST:
-                                    fprintf(out, "H5I_GENPROP_LST");
+                                    HDfprintf(out, "H5I_GENPROP_LST");
                                     break;
 
                                 case H5I_ERROR_CLASS:
-                                    fprintf(out, "H5I_ERROR_CLASS");
+                                    HDfprintf(out, "H5I_ERROR_CLASS");
                                     break;
 
                                 case H5I_ERROR_MSG:
-                                    fprintf(out, "H5I_ERROR_MSG");
+                                    HDfprintf(out, "H5I_ERROR_MSG");
                                     break;
 
                                 case H5I_ERROR_STACK:
-                                    fprintf(out, "H5I_ERROR_STACK");
+                                    HDfprintf(out, "H5I_ERROR_STACK");
                                     break;
 
                                 case H5I_NTYPES:
-                                    fprintf(out, "H5I_NTYPES");
+                                    HDfprintf(out, "H5I_NTYPES");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)id_type);
+                                    HDfprintf(out, "%ld", (long)id_type);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1421,29 +1421,29 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'u':
                         if(ptr) {
                             if(vp) {
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                                 if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     unsigned *p = (unsigned*)vp;
 
-                                    fprintf(out, " {");
+                                    HDfprintf(out, " {");
                                     for(i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%u", i?", ":"", p[i]);
-                                    fprintf(out, "}");
+                                    HDfprintf(out, "}");
                                 } /* end if */
                             } /* end if */
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             unsigned iu = va_arg(ap, unsigned); /*lint !e732 Loss of sign not really occuring */
 
-                            fprintf(out, "%u", iu);
+                            HDfprintf(out, "%u", iu);
                             asize[argno] = iu;
                         } /* end else */
                         break;
 
                     default:
-                        fprintf (out, "BADTYPE(I%c)", type[1]);
+                        HDfprintf (out, "BADTYPE(I%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -1453,43 +1453,43 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'l':
                         if(ptr) {
                             if(vp)
-                                fprintf (out, "0x%lx", (unsigned long)vp);
+                                HDfprintf (out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5L_type_t link_type = (H5L_type_t)va_arg(ap, int);
 
                             switch(link_type) {
                                 case H5L_TYPE_ERROR:
-                                    fprintf(out, "H5L_TYPE_ERROR");
+                                    HDfprintf(out, "H5L_TYPE_ERROR");
                                     break;
 
                                 case H5L_TYPE_HARD:
-                                    fprintf(out, "H5L_TYPE_HARD");
+                                    HDfprintf(out, "H5L_TYPE_HARD");
                                     break;
 
                                 case H5L_TYPE_SOFT:
-                                    fprintf(out, "H5L_TYPE_SOFT");
+                                    HDfprintf(out, "H5L_TYPE_SOFT");
                                     break;
 
                                 case H5L_TYPE_EXTERNAL:
-                                    fprintf(out, "H5L_TYPE_EXTERNAL");
+                                    HDfprintf(out, "H5L_TYPE_EXTERNAL");
                                     break;
 
                                 case H5L_TYPE_MAX:
-                                    fprintf(out, "H5L_TYPE_MAX");
+                                    HDfprintf(out, "H5L_TYPE_MAX");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)link_type);
+                                    HDfprintf(out, "%ld", (long)link_type);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf(out, "BADTYPE(G%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(G%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -1499,15 +1499,15 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'c':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
 #ifdef H5_HAVE_PARALLEL
                         else {
                             MPI_Comm comm = va_arg(ap, MPI_Comm);
 
-                            fprintf(out, "%ld", (long)comm);
+                            HDfprintf(out, "%ld", (long)comm);
                         } /* end else */
 #endif /* H5_HAVE_PARALLEL */
                         break;
@@ -1515,15 +1515,15 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'i':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
 #ifdef H5_HAVE_PARALLEL
                         else {
                             MPI_Info info = va_arg(ap, MPI_Info);
 
-                            fprintf(out, "%ld", (long)info);
+                            HDfprintf(out, "%ld", (long)info);
                         } /* end else */
 #endif /* H5_HAVE_PARALLEL */
                         break;
@@ -1531,52 +1531,52 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5FD_mem_t mt = (H5FD_mem_t)va_arg(ap, int);
 
                             switch(mt) {
                                 case H5FD_MEM_NOLIST:
-                                    fprintf(out, "H5FD_MEM_NOLIST");
+                                    HDfprintf(out, "H5FD_MEM_NOLIST");
                                     break;
 
                                 case H5FD_MEM_DEFAULT:
-                                    fprintf(out, "H5FD_MEM_DEFAULT");
+                                    HDfprintf(out, "H5FD_MEM_DEFAULT");
                                     break;
 
                                 case H5FD_MEM_SUPER:
-                                    fprintf(out, "H5FD_MEM_SUPER");
+                                    HDfprintf(out, "H5FD_MEM_SUPER");
                                     break;
 
                                 case H5FD_MEM_BTREE:
-                                    fprintf(out, "H5FD_MEM_BTREE");
+                                    HDfprintf(out, "H5FD_MEM_BTREE");
                                     break;
 
                                 case H5FD_MEM_DRAW:
-                                    fprintf(out, "H5FD_MEM_DRAW");
+                                    HDfprintf(out, "H5FD_MEM_DRAW");
                                     break;
 
                                 case H5FD_MEM_GHEAP:
-                                    fprintf(out, "H5FD_MEM_GHEAP");
+                                    HDfprintf(out, "H5FD_MEM_GHEAP");
                                     break;
 
                                 case H5FD_MEM_LHEAP:
-                                    fprintf(out, "H5FD_MEM_LHEAP");
+                                    HDfprintf(out, "H5FD_MEM_LHEAP");
                                     break;
 
                                 case H5FD_MEM_OHDR:
-                                    fprintf(out, "H5FD_MEM_OHDR");
+                                    HDfprintf(out, "H5FD_MEM_OHDR");
                                     break;
 
                                 case H5FD_MEM_NTYPES:
-                                    fprintf(out, "H5FD_MEM_NTYPES");
+                                    HDfprintf(out, "H5FD_MEM_NTYPES");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)mt);
+                                    HDfprintf(out, "%ld", (long)mt);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1590,14 +1590,14 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'o':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     off_t offset = va_arg(ap, off_t);
 
-                    fprintf (out, "%ld", (long)offset);
+                    HDfprintf (out, "%ld", (long)offset);
                 } /* end else */
                 break;
 
@@ -1606,43 +1606,43 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5O_type_t objtype = (H5O_type_t)va_arg(ap, int);
 
                             switch(objtype) {
                                 case H5O_TYPE_UNKNOWN:
-                                    fprintf(out, "H5O_TYPE_UNKNOWN");
+                                    HDfprintf(out, "H5O_TYPE_UNKNOWN");
                                     break;
 
                                 case H5O_TYPE_GROUP:
-                                    fprintf(out, "H5O_TYPE_GROUP");
+                                    HDfprintf(out, "H5O_TYPE_GROUP");
                                     break;
 
                                 case H5O_TYPE_DATASET:
-                                    fprintf(out, "H5O_TYPE_DATASET");
+                                    HDfprintf(out, "H5O_TYPE_DATASET");
                                     break;
 
                                 case H5O_TYPE_NAMED_DATATYPE:
-                                    fprintf(out, "H5O_TYPE_NAMED_DATATYPE");
+                                    HDfprintf(out, "H5O_TYPE_NAMED_DATATYPE");
                                     break;
 
                                 case H5O_TYPE_NTYPES:
-                                    fprintf(out, "H5O_TYPE_TYPES");
+                                    HDfprintf(out, "H5O_TYPE_TYPES");
                                     break;
 
                                 default:
-                                    fprintf(out, "BADTYPE(%ld)", (long)objtype);
+                                    HDfprintf(out, "BADTYPE(%ld)", (long)objtype);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf(out, "BADTYPE(S%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(S%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -1650,9 +1650,9 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'p':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     hid_t pclass_id = va_arg(ap, hid_t);
@@ -1663,20 +1663,20 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     /* (This may generate recursive call to the library... -QAK) */
                     if(NULL != (pclass = (H5P_genclass_t *)H5I_object(pclass_id)) &&
                             NULL != (class_name = H5P_get_class_name(pclass))) {
-                        fprintf(out, "%s", class_name);
+                        HDfprintf(out, "%s", class_name);
                         H5MM_xfree(class_name);
                     } /* end if */
                     else
-                        fprintf(out, "%ld", (long)pclass_id);
+                        HDfprintf(out, "%ld", (long)pclass_id);
                 } /* end else */
                 break;
 
             case 'r':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     hobj_ref_t ref = va_arg(ap, hobj_ref_t); /*lint !e732 Loss of sign not really occuring */
@@ -1690,39 +1690,39 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5R_type_t reftype = (H5R_type_t)va_arg(ap, int);
 
                             switch(reftype) {
                                 case H5R_BADTYPE:
-                                    fprintf(out, "H5R_BADTYPE");
+                                    HDfprintf(out, "H5R_BADTYPE");
                                     break;
 
                                 case H5R_OBJECT:
-                                    fprintf(out, "H5R_OBJECT");
+                                    HDfprintf(out, "H5R_OBJECT");
                                     break;
 
                                 case H5R_DATASET_REGION:
-                                    fprintf(out, "H5R_DATASET_REGION");
+                                    HDfprintf(out, "H5R_DATASET_REGION");
                                     break;
 
                                 case H5R_MAXTYPE:
-                                    fprintf(out, "H5R_MAXTYPE");
+                                    HDfprintf(out, "H5R_MAXTYPE");
                                     break;
 
                                 default:
-                                    fprintf(out, "BADTYPE(%ld)", (long)reftype);
+                                    HDfprintf(out, "BADTYPE(%ld)", (long)reftype);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf(out, "BADTYPE(S%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(S%c)", type[1]);
                         goto error;
                 }
                 break;
@@ -1732,32 +1732,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'c':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5S_class_t cls = (H5S_class_t)va_arg(ap, int);
 
                             switch(cls) {
                                 case H5S_NO_CLASS:
-                                    fprintf(out, "H5S_NO_CLASS");
+                                    HDfprintf(out, "H5S_NO_CLASS");
                                     break;
 
                                 case H5S_SCALAR:
-                                    fprintf(out, "H5S_SCALAR");
+                                    HDfprintf(out, "H5S_SCALAR");
                                     break;
 
                                 case H5S_SIMPLE:
-                                    fprintf(out, "H5S_SIMPLE");
+                                    HDfprintf(out, "H5S_SIMPLE");
                                     break;
 
                                 case H5S_NULL:
-                                    fprintf(out, "H5S_NULL");
+                                    HDfprintf(out, "H5S_NULL");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)cls);
+                                    HDfprintf(out, "%ld", (long)cls);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1766,56 +1766,56 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 's':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5S_seloper_t so = (H5S_seloper_t)va_arg(ap, int);
 
                             switch(so) {
                                 case H5S_SELECT_NOOP:
-                                    fprintf(out, "H5S_NOOP");
+                                    HDfprintf(out, "H5S_NOOP");
                                     break;
 
                                 case H5S_SELECT_SET:
-                                    fprintf(out, "H5S_SELECT_SET");
+                                    HDfprintf(out, "H5S_SELECT_SET");
                                     break;
 
                                 case H5S_SELECT_OR:
-                                    fprintf(out, "H5S_SELECT_OR");
+                                    HDfprintf(out, "H5S_SELECT_OR");
                                     break;
 
                                 case H5S_SELECT_AND:
-                                    fprintf(out, "H5S_SELECT_AND");
+                                    HDfprintf(out, "H5S_SELECT_AND");
                                     break;
 
                                 case H5S_SELECT_XOR:
-                                    fprintf(out, "H5S_SELECT_XOR");
+                                    HDfprintf(out, "H5S_SELECT_XOR");
                                     break;
 
                                 case H5S_SELECT_NOTB:
-                                    fprintf(out, "H5S_SELECT_NOTB");
+                                    HDfprintf(out, "H5S_SELECT_NOTB");
                                     break;
 
                                 case H5S_SELECT_NOTA:
-                                    fprintf(out, "H5S_SELECT_NOTA");
+                                    HDfprintf(out, "H5S_SELECT_NOTA");
                                     break;
 
                                 case H5S_SELECT_APPEND:
-                                    fprintf(out, "H5S_SELECT_APPEND");
+                                    HDfprintf(out, "H5S_SELECT_APPEND");
                                     break;
 
                                 case H5S_SELECT_PREPEND:
-                                    fprintf(out, "H5S_SELECT_PREPEND");
+                                    HDfprintf(out, "H5S_SELECT_PREPEND");
                                     break;
 
                                 case H5S_SELECT_INVALID:
-                                    fprintf(out, "H5S_SELECT_INVALID");
+                                    HDfprintf(out, "H5S_SELECT_INVALID");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)so);
+                                    HDfprintf(out, "%ld", (long)so);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1824,47 +1824,47 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5S_sel_type st = (H5S_sel_type)va_arg(ap, int);
 
                             switch(st) {
                                 case H5S_SEL_ERROR:
-                                    fprintf(out, "H5S_SEL_ERROR");
+                                    HDfprintf(out, "H5S_SEL_ERROR");
                                     break;
 
                                 case H5S_SEL_NONE:
-                                    fprintf(out, "H5S_SEL_NONE");
+                                    HDfprintf(out, "H5S_SEL_NONE");
                                     break;
 
                                 case H5S_SEL_POINTS:
-                                    fprintf(out, "H5S_SEL_POINTS");
+                                    HDfprintf(out, "H5S_SEL_POINTS");
                                     break;
 
                                 case H5S_SEL_HYPERSLABS:
-                                    fprintf(out, "H5S_SEL_HYPERSLABS");
+                                    HDfprintf(out, "H5S_SEL_HYPERSLABS");
                                     break;
 
                                 case H5S_SEL_ALL:
-                                    fprintf(out, "H5S_SEL_ALL");
+                                    HDfprintf(out, "H5S_SEL_ALL");
                                     break;
 
                                 case H5S_SEL_N:
-                                    fprintf(out, "H5S_SEL_N");
+                                    HDfprintf(out, "H5S_SEL_N");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)st);
+                                    HDfprintf(out, "%ld", (long)st);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf(out, "BADTYPE(S%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(S%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -1872,14 +1872,14 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 's':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     const char *str = va_arg(ap, const char *); /*lint !e64 Type mismatch not really occuring */
 
-                    fprintf(out, "\"%s\"", str);
+                    HDfprintf(out, "\"%s\"", str);
                 } /* end else */
                 break;
 
@@ -1888,24 +1888,24 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'c':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_cset_t cset = (H5T_cset_t)va_arg(ap, int);
 
                             switch(cset) {
                                 case H5T_CSET_ERROR:
-                                    fprintf(out, "H5T_CSET_ERROR");
+                                    HDfprintf(out, "H5T_CSET_ERROR");
                                     break;
 
                                 case H5T_CSET_ASCII:
-                                    fprintf(out, "H5T_CSET_ASCII");
+                                    HDfprintf(out, "H5T_CSET_ASCII");
                                     break;
 
                                 case H5T_CSET_UTF8:
-                                    fprintf(out, "H5T_CSET_UTF8");
+                                    HDfprintf(out, "H5T_CSET_UTF8");
                                     break;
 
                                 case H5T_CSET_RESERVED_2:
@@ -1922,11 +1922,11 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 case H5T_CSET_RESERVED_13:
                                 case H5T_CSET_RESERVED_14:
                                 case H5T_CSET_RESERVED_15:
-                                    fprintf(out, "H5T_CSET_RESERVED_%ld", (long)cset);
+                                    HDfprintf(out, "H5T_CSET_RESERVED_%ld", (long)cset);
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)cset);
+                                    HDfprintf(out, "%ld", (long)cset);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1935,28 +1935,28 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'd':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_direction_t direct = (H5T_direction_t)va_arg(ap, int);
 
                             switch(direct) {
                                 case H5T_DIR_DEFAULT:
-                                    fprintf(out, "H5T_DIR_DEFAULT");
+                                    HDfprintf(out, "H5T_DIR_DEFAULT");
                                     break;
 
                                 case H5T_DIR_ASCEND:
-                                    fprintf(out, "H5T_DIR_ASCEND");
+                                    HDfprintf(out, "H5T_DIR_ASCEND");
                                     break;
 
                                 case H5T_DIR_DESCEND:
-                                    fprintf(out, "H5T_DIR_DESCEND");
+                                    HDfprintf(out, "H5T_DIR_DESCEND");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)direct);
+                                    HDfprintf(out, "%ld", (long)direct);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1965,28 +1965,28 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'e':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_pers_t pers = (H5T_pers_t)va_arg(ap, int);
 
                             switch(pers) {
                                 case H5T_PERS_DONTCARE:
-                                    fprintf(out, "H5T_PERS_DONTCARE");
+                                    HDfprintf(out, "H5T_PERS_DONTCARE");
                                     break;
 
                                 case H5T_PERS_SOFT:
-                                    fprintf(out, "H5T_PERS_SOFT");
+                                    HDfprintf(out, "H5T_PERS_SOFT");
                                     break;
 
                                 case H5T_PERS_HARD:
-                                    fprintf(out, "H5T_PERS_HARD");
+                                    HDfprintf(out, "H5T_PERS_HARD");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)pers);
+                                    HDfprintf(out, "%ld", (long)pers);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -1995,32 +1995,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'n':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_norm_t norm = (H5T_norm_t)va_arg(ap, int);
 
                             switch(norm) {
                                 case H5T_NORM_ERROR:
-                                    fprintf(out, "H5T_NORM_ERROR");
+                                    HDfprintf(out, "H5T_NORM_ERROR");
                                     break;
 
                                 case H5T_NORM_IMPLIED:
-                                    fprintf(out, "H5T_NORM_IMPLIED");
+                                    HDfprintf(out, "H5T_NORM_IMPLIED");
                                     break;
 
                                 case H5T_NORM_MSBSET:
-                                    fprintf(out, "H5T_NORM_MSBSET");
+                                    HDfprintf(out, "H5T_NORM_MSBSET");
                                     break;
 
                                 case H5T_NORM_NONE:
-                                    fprintf(out, "H5T_NORM_NONE");
+                                    HDfprintf(out, "H5T_NORM_NONE");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)norm);
+                                    HDfprintf(out, "%ld", (long)norm);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -2029,40 +2029,40 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'o':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_order_t order = (H5T_order_t)va_arg(ap, int);
 
                             switch(order) {
                                 case H5T_ORDER_ERROR:
-                                    fprintf(out, "H5T_ORDER_ERROR");
+                                    HDfprintf(out, "H5T_ORDER_ERROR");
                                     break;
 
                                 case H5T_ORDER_LE:
-                                    fprintf(out, "H5T_ORDER_LE");
+                                    HDfprintf(out, "H5T_ORDER_LE");
                                     break;
 
                                 case H5T_ORDER_BE:
-                                    fprintf(out, "H5T_ORDER_BE");
+                                    HDfprintf(out, "H5T_ORDER_BE");
                                     break;
 
                                 case H5T_ORDER_VAX:
-                                    fprintf(out, "H5T_ORDER_VAX");
+                                    HDfprintf(out, "H5T_ORDER_VAX");
                                     break;
 
                                 case H5T_ORDER_MIXED:
-                                    fprintf(out, "H5T_ORDER_MIXED");
+                                    HDfprintf(out, "H5T_ORDER_MIXED");
                                     break;
 
                                 case H5T_ORDER_NONE:
-                                    fprintf(out, "H5T_ORDER_NONE");
+                                    HDfprintf(out, "H5T_ORDER_NONE");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)order);
+                                    HDfprintf(out, "%ld", (long)order);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -2071,36 +2071,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'p':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_pad_t pad = (H5T_pad_t)va_arg(ap, int);
 
                             switch(pad) {
                                 case H5T_PAD_ERROR:
-                                    fprintf(out, "H5T_PAD_ERROR");
+                                    HDfprintf(out, "H5T_PAD_ERROR");
                                     break;
 
                                 case H5T_PAD_ZERO:
-                                    fprintf(out, "H5T_PAD_ZERO");
+                                    HDfprintf(out, "H5T_PAD_ZERO");
                                     break;
 
                                 case H5T_PAD_ONE:
-                                    fprintf(out, "H5T_PAD_ONE");
+                                    HDfprintf(out, "H5T_PAD_ONE");
                                     break;
 
                                 case H5T_PAD_BACKGROUND:
-                                    fprintf(out, "H5T_PAD_BACKGROUND");
+                                    HDfprintf(out, "H5T_PAD_BACKGROUND");
                                     break;
 
                                 case H5T_NPAD:
-                                    fprintf(out, "H5T_NPAD");
+                                    HDfprintf(out, "H5T_NPAD");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)pad);
+                                    HDfprintf(out, "%ld", (long)pad);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -2109,32 +2109,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 's':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_sign_t sign = (H5T_sign_t)va_arg(ap, int);
 
                             switch(sign) {
                                 case H5T_SGN_ERROR:
-                                    fprintf(out, "H5T_SGN_ERROR");
+                                    HDfprintf(out, "H5T_SGN_ERROR");
                                     break;
 
                                 case H5T_SGN_NONE:
-                                    fprintf(out, "H5T_SGN_NONE");
+                                    HDfprintf(out, "H5T_SGN_NONE");
                                     break;
 
                                 case H5T_SGN_2:
-                                    fprintf(out, "H5T_SGN_2");
+                                    HDfprintf(out, "H5T_SGN_2");
                                     break;
 
                                 case H5T_NSGN:
-                                    fprintf(out, "H5T_NSGN");
+                                    HDfprintf(out, "H5T_NSGN");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)sign);
+                                    HDfprintf(out, "%ld", (long)sign);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -2143,68 +2143,68 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 't':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_class_t type_class = (H5T_class_t)va_arg(ap, int);
 
                             switch(type_class) {
                                 case H5T_NO_CLASS:
-                                    fprintf(out, "H5T_NO_CLASS");
+                                    HDfprintf(out, "H5T_NO_CLASS");
                                     break;
 
                                 case H5T_INTEGER:
-                                    fprintf(out, "H5T_INTEGER");
+                                    HDfprintf(out, "H5T_INTEGER");
                                     break;
 
                                 case H5T_FLOAT:
-                                    fprintf(out, "H5T_FLOAT");
+                                    HDfprintf(out, "H5T_FLOAT");
                                     break;
 
                                 case H5T_TIME:
-                                    fprintf(out, "H5T_TIME");
+                                    HDfprintf(out, "H5T_TIME");
                                     break;
 
                                 case H5T_STRING:
-                                    fprintf(out, "H5T_STRING");
+                                    HDfprintf(out, "H5T_STRING");
                                     break;
 
                                 case H5T_BITFIELD:
-                                    fprintf(out, "H5T_BITFIELD");
+                                    HDfprintf(out, "H5T_BITFIELD");
                                     break;
 
                                 case H5T_OPAQUE:
-                                    fprintf(out, "H5T_OPAQUE");
+                                    HDfprintf(out, "H5T_OPAQUE");
                                     break;
 
                                 case H5T_COMPOUND:
-                                    fprintf(out, "H5T_COMPOUND");
+                                    HDfprintf(out, "H5T_COMPOUND");
                                     break;
 
                                 case H5T_REFERENCE:
-                                    fprintf(out, "H5T_REFERENCE");
+                                    HDfprintf(out, "H5T_REFERENCE");
                                     break;
 
                                 case H5T_ENUM:
-                                    fprintf(out, "H5T_ENUM");
+                                    HDfprintf(out, "H5T_ENUM");
                                     break;
 
                                 case H5T_VLEN:
-                                    fprintf(out, "H5T_VLEN");
+                                    HDfprintf(out, "H5T_VLEN");
                                     break;
 
                                 case H5T_ARRAY:
-                                    fprintf(out, "H5T_ARRAY");
+                                    HDfprintf(out, "H5T_ARRAY");
                                     break;
 
                                 case H5T_NCLASSES:
-                                    fprintf(out, "H5T_NCLASSES");
+                                    HDfprintf(out, "H5T_NCLASSES");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)type_class);
+                                    HDfprintf(out, "%ld", (long)type_class);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -2213,28 +2213,28 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'z':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5T_str_t str = (H5T_str_t)va_arg(ap, int);
 
                             switch(str) {
                                 case H5T_STR_ERROR:
-                                    fprintf(out, "H5T_STR_ERROR");
+                                    HDfprintf(out, "H5T_STR_ERROR");
                                     break;
 
                                 case H5T_STR_NULLTERM:
-                                    fprintf(out, "H5T_STR_NULLTERM");
+                                    HDfprintf(out, "H5T_STR_NULLTERM");
                                     break;
 
                                 case H5T_STR_NULLPAD:
-                                    fprintf(out, "H5T_STR_NULLPAD");
+                                    HDfprintf(out, "H5T_STR_NULLPAD");
                                     break;
 
                                 case H5T_STR_SPACEPAD:
-                                    fprintf(out, "H5T_STR_SPACEPAD");
+                                    HDfprintf(out, "H5T_STR_SPACEPAD");
                                     break;
 
                                 case H5T_STR_RESERVED_3:
@@ -2250,18 +2250,18 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 case H5T_STR_RESERVED_13:
                                 case H5T_STR_RESERVED_14:
                                 case H5T_STR_RESERVED_15:
-                                    fprintf(out, "H5T_STR_RESERVED(%ld)",(long)str);
+                                    HDfprintf(out, "H5T_STR_RESERVED(%ld)",(long)str);
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)str);
+                                    HDfprintf(out, "%ld", (long)str);
                                     break;
                             } /* end switch */
                         } /* end else */
                         break;
 
                     default:
-                        fprintf (out, "BADTYPE(T%c)", type[1]);
+                        HDfprintf (out, "BADTYPE(T%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -2269,19 +2269,19 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 't':
                 if(ptr) {
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     htri_t tri_var = va_arg (ap, htri_t);
 
                     if(tri_var>0)
-                        fprintf (out, "TRUE");
+                        HDfprintf (out, "TRUE");
                     else if(!tri_var)
-                        fprintf (out, "FALSE");
+                        HDfprintf (out, "FALSE");
                     else
-                        fprintf(out, "FAIL(%d)", (int)tri_var);
+                        HDfprintf(out, "FAIL(%d)", (int)tri_var);
                 } /* end else */
                 break;
 
@@ -2290,23 +2290,23 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'l':
                         if(ptr) {
                             if(vp) {
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                                 if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     unsigned long *p = (unsigned long *)vp;
 
-                                    fprintf(out, " {");
+                                    HDfprintf(out, " {");
                                     for(i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%lu", i?", ":"", p[i]);
-                                    fprintf(out, "}");
+                                    HDfprintf(out, "}");
                                 } /* end if */
                             } /* end if */
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             unsigned long iul = va_arg(ap, unsigned long); /*lint !e732 Loss of sign not really occuring */
 
-                            fprintf(out, "%lu", iul);
+                            HDfprintf(out, "%lu", iul);
                             asize[argno] = iul;
                         } /* end else */
                         break;
@@ -2314,29 +2314,29 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'L':
                         if(ptr) {
                             if(vp) {
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                                 if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     unsigned long long *p = (unsigned long long *)vp;
 
-                                    fprintf(out, " {");
+                                    HDfprintf(out, " {");
                                     for(i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%llu", i?", ":"", p[i]);
-                                    fprintf(out, "}");
+                                    HDfprintf(out, "}");
                                 } /* end if */
                             } /* end if */
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             unsigned long long iull = va_arg(ap, unsigned long long); /*lint !e732 Loss of sign not really occuring */
 
-                            fprintf(out, "%llu", iull);
+                            HDfprintf(out, "%llu", iull);
                             asize[argno] = iull;
                         } /* end else */
                         break;
 
                     default:
-                        fprintf (out, "BADTYPE(U%c)", type[1]);
+                        HDfprintf (out, "BADTYPE(U%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
@@ -2344,48 +2344,48 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
             case 'x':
                 if(ptr) {
                     if(vp) {
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                         if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                             void **p = (void**)vp;
 
-                            fprintf(out, " {");
+                            HDfprintf(out, " {");
                             for(i = 0; i < asize[asize_idx]; i++) {
                                 if(p[i])
-                                    fprintf(out, "%s0x%lx", (i ? ", " : ""), (unsigned long)(p[i]));
+                                    HDfprintf(out, "%s0x%lx", (i ? ", " : ""), (unsigned long)(p[i]));
                                 else
-                                    fprintf(out, "%sNULL", (i ? ", " : ""));
+                                    HDfprintf(out, "%sNULL", (i ? ", " : ""));
                             } /* end for */
-                            fprintf(out, "}");
+                            HDfprintf(out, "}");
                         } /* end if */
                     } /* end if */
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     vp = va_arg (ap, void *); /*lint !e64 Type mismatch not really occuring */
 
                     if(vp)
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end else */
                 break;
 
             case 'z':
                 if(ptr) {
                     if(vp) {
-                        fprintf(out, "0x%lx", (unsigned long)vp);
+                        HDfprintf(out, "0x%lx", (unsigned long)vp);
                         if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                             size_t *p = (size_t *)vp;
 
-                            fprintf(out, " {");
+                            HDfprintf(out, " {");
                             for(i = 0; i < asize[asize_idx]; i++)
                                 HDfprintf(out, "%s%Zu", (i ? ", " : ""), p[i]);
-                            fprintf(out, "}");
+                            HDfprintf(out, "}");
                         } /* end if */
                     } /* end if */
                     else
-                        fprintf(out, "NULL");
+                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
                     size_t size = va_arg(ap, size_t); /*lint !e732 Loss of sign not really occuring */
@@ -2400,28 +2400,28 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'a':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5Z_SO_scale_type_t scale_type = (H5Z_SO_scale_type_t)va_arg(ap, int);
 
                             switch(scale_type) {
                                 case H5Z_SO_FLOAT_DSCALE:
-                                    fprintf(out, "H5Z_SO_FLOAT_DSCALE");
+                                    HDfprintf(out, "H5Z_SO_FLOAT_DSCALE");
                                     break;
 
                                 case H5Z_SO_FLOAT_ESCALE:
-                                    fprintf(out, "H5Z_SO_FLOAT_ESCALE");
+                                    HDfprintf(out, "H5Z_SO_FLOAT_ESCALE");
                                     break;
 
                                 case H5Z_SO_INT:
-                                    fprintf(out, "H5Z_SO_INT");
+                                    HDfprintf(out, "H5Z_SO_INT");
                                     break;
 
                                 default:
-                                    fprintf(out, "%ld", (long)scale_type);
+                                    HDfprintf(out, "%ld", (long)scale_type);
                                     break;
                             } /* end switch */
                         } /* end else */
@@ -2430,68 +2430,68 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                     case 'c':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5Z_class2_t *filter = va_arg(ap, H5Z_class2_t*); /*lint !e64 Type mismatch not really occuring */
 
-                            fprintf(out, "0x%lx", (unsigned long)filter);
+                            HDfprintf(out, "0x%lx", (unsigned long)filter);
                         } /* end else */
                         break;
 
                     case 'e':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5Z_EDC_t edc = (H5Z_EDC_t)va_arg(ap, int);
 
                             if(H5Z_DISABLE_EDC == edc)
-                                fprintf(out, "H5Z_DISABLE_EDC");
+                                HDfprintf(out, "H5Z_DISABLE_EDC");
                             else if (H5Z_ENABLE_EDC == edc)
-                                fprintf(out, "H5Z_ENABLE_EDC");
+                                HDfprintf(out, "H5Z_ENABLE_EDC");
                             else
-                                fprintf(out, "%ld", (long)edc);
+                                HDfprintf(out, "%ld", (long)edc);
                         } /* end else */
                         break;
 
                     case 'f':
                         if(ptr) {
                             if(vp)
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             H5Z_filter_t id = va_arg(ap, H5Z_filter_t);
 
                             if(H5Z_FILTER_DEFLATE == id)
-                                fprintf(out, "H5Z_FILTER_DEFLATE");
+                                HDfprintf(out, "H5Z_FILTER_DEFLATE");
                             else
-                                fprintf(out, "%ld", (long)id);
+                                HDfprintf(out, "%ld", (long)id);
                         } /* end else */
                         break;
 
                     case 's':
                         if(ptr) {
                             if(vp) {
-                                fprintf(out, "0x%lx", (unsigned long)vp);
+                                HDfprintf(out, "0x%lx", (unsigned long)vp);
                                 if(asize_idx >= 0 && asize[asize_idx] >= 0) {
                                     ssize_t *p = (ssize_t *)vp;
 
-                                    fprintf(out, " {");
+                                    HDfprintf(out, " {");
                                     for(i = 0; i < asize[asize_idx]; i++)
                                         HDfprintf(out, "%s%Zd", (i ? ", " : ""), p[i]);
-                                    fprintf(out, "}");
+                                    HDfprintf(out, "}");
                                 } /* end if */
                             } /* end if */
                             else
-                                fprintf(out, "NULL");
+                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
                             ssize_t ssize = va_arg(ap, ssize_t);
@@ -2502,32 +2502,32 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         break;
 
                     default:
-                        fprintf(out, "BADTYPE(Z%c)", type[1]);
+                        HDfprintf(out, "BADTYPE(Z%c)", type[1]);
                         goto error;
                 } /* end switch */
                 break;
 
             default:
                 if(HDisupper(type[0]))
-                    fprintf(out, "BADTYPE(%c%c)", type[0], type[1]);
+                    HDfprintf(out, "BADTYPE(%c%c)", type[0], type[1]);
                 else
-                    fprintf(out, "BADTYPE(%c)", type[0]);
+                    HDfprintf(out, "BADTYPE(%c)", type[0]);
                 goto error;
 	} /* end switch */
     } /* end for */
 
     /* Display event time for return */
     if(returning && H5_debug_g.ttimes)
-        fprintf(out, " @%.6f [dt=%.6f]", (event_time.etime - first_time.etime),
+        HDfprintf(out, " @%.6f [dt=%.6f]", (event_time.etime - first_time.etime),
                 (event_time.etime - *returning));
 
 error:
     va_end(ap);
     if(returning)
-	fprintf(out, ";\n");
+	HDfprintf(out, ";\n");
     else {
 	last_call_depth = current_depth++;
-	fprintf (out, ")");
+	HDfprintf (out, ")");
     } /* end else */
     HDfflush(out);
 
diff --git a/test/btree2.c b/test/btree2.c
index fa56f24..8e2aa04 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -7576,7 +7576,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 v2 B-tree creation parameters */
     init_cparam(&cparam);
@@ -7585,11 +7585,11 @@ main(void)
     /* Loop over re-opening B-tree during tests */
     for(reopen = FALSE; reopen <= TRUE; reopen++) {
         if(reopen) {
-            fprintf(stdout, "Testing with reopening B-tree:\n");
+            HDfprintf(stdout, "Testing with reopening B-tree:\n");
             tparam.reopen_btree = TRUE;
         } /* end if */
         else {
-            fprintf(stdout, "Testing without reopening B-tree:\n");
+            HDfprintf(stdout, "Testing without reopening B-tree:\n");
             tparam.reopen_btree = FALSE;
         } /* end else */
 
@@ -7609,7 +7609,7 @@ main(void)
         nerrors += test_insert_level2_3internal_redistrib(fapl, &cparam, &tparam);
         nerrors += test_insert_level2_3internal_split(fapl, &cparam, &tparam);
         if(ExpressMode > 1)
-            printf("***Express test mode on.  test_insert_lots skipped\n");
+            HDprintf("***Express test mode on.  test_insert_lots skipped\n");
         else
             nerrors += test_insert_lots(fapl, &cparam, &tparam);
 
@@ -7636,7 +7636,7 @@ main(void)
         nerrors += test_remove_level2_3internal_merge(fapl, &cparam, &tparam);
         nerrors += test_remove_level2_collapse_right(fapl, &cparam, &tparam);
         if(ExpressMode > 1)
-            printf("***Express test mode on.  test_remove_lots skipped\n");
+            HDprintf("***Express test mode on.  test_remove_lots skipped\n");
         else
             nerrors += test_remove_lots(envval, fapl, &cparam);
 
diff --git a/test/cache_api.c b/test/cache_api.c
index 9b791cf..cd1176f 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -14,8 +14,8 @@
 /* Programmer:  John Mainzer
  *              11/10/05
  *
- *		This file contains tests for the API calls associated
- *		with the cache implemented in H5C.c
+ *        This file contains tests for the API calls associated
+ *        with the cache implemented in H5C.c
  */
 
 #include "cache_common.h"
@@ -38,7 +38,7 @@ static void check_fapl_mdc_api_errs(void);
 
 static void check_file_mdc_api_errs(void);
 
-
+
 /**************************************************************************/
 /**************************************************************************/
 /********************************* tests: *********************************/
@@ -56,7 +56,7 @@ static void check_file_mdc_api_errs(void);
  *              be sufficient to verify that the desired configuration
  *              data is getting to the cache.
  *
- * Return:	void
+ * Return:    void
  *
  * Programmer:  John Mainzer
  *              4/12/04
@@ -107,8 +107,8 @@ check_fapl_mdc_api_calls(void)
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t scratch;
     H5C_auto_size_ctl_t default_auto_size_ctl;
@@ -485,7 +485,7 @@ check_fapl_mdc_api_calls(void)
 
 } /* check_fapl_mdc_api_calls() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_file_mdc_api_calls()
  *
@@ -500,7 +500,7 @@ check_fapl_mdc_api_calls(void)
  *              We shouldn't need to verify data correctness beyond that
  *              point.
  *
- * Return:	void
+ * Return:    void
  *
  * Programmer:  John Mainzer
  *              4/14/04
@@ -552,8 +552,8 @@ check_file_mdc_api_calls(void)
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_2 =
     {
@@ -587,8 +587,8 @@ check_file_mdc_api_calls(void)
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_3 =
     {
@@ -622,8 +622,8 @@ check_file_mdc_api_calls(void)
       /* hbool_t     apply_empty_reserve    = */ FALSE,
       /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_4 =
     {
@@ -658,8 +658,8 @@ check_file_mdc_api_calls(void)
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.1f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
 
     TESTING("MDC/FILE related API calls");
@@ -802,9 +802,9 @@ check_file_mdc_api_calls(void)
         else {
 
             HDfprintf(stdout, "H5Fget_mdc_size() reports:\n");
-            HDfprintf(stdout, "	max_size: %ld, min_clean_size: %ld\n",
+            HDfprintf(stdout, "    max_size: %ld, min_clean_size: %ld\n",
                       (long)max_size, (long)min_clean_size);
-	    HDfprintf(stdout, "	cur_size: %ld, cur_num_entries: %d\n",
+        HDfprintf(stdout, "    cur_size: %ld, cur_num_entries: %d\n",
                       (long)cur_size, cur_num_entries);
         }
 #endif
@@ -833,14 +833,14 @@ check_file_mdc_api_calls(void)
 
 } /* check_file_mdc_api_calls() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	mdc_api_call_smoke_check()
+ * Function:    mdc_api_call_smoke_check()
  *
  * Purpose:     Initial basic functional test to see if there are problems
  *              with the cache API calls.
  *
- *              NOTE: This test takes some time to run and checks the 
+ *              NOTE: This test takes some time to run and checks the
  *                    HDF5TestExpress environment variable.
  *
  * Return:      void
@@ -913,8 +913,8 @@ mdc_api_call_smoke_check(int express_test)
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_2 =
     {
@@ -948,8 +948,8 @@ mdc_api_call_smoke_check(int express_test)
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_3 =
     {
@@ -983,8 +983,8 @@ mdc_api_call_smoke_check(int express_test)
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
-      /* int	    metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+      /* int        metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
 
     TESTING("MDC API smoke check");
@@ -1094,9 +1094,9 @@ mdc_api_call_smoke_check(int express_test)
             /* create the dataset */
             if ( pass ) {
 
-                sprintf(dset_name, "/dset%03d", i);
+                HDsprintf(dset_name, "/dset%03d", i);
                 dataset_ids[i] = H5Dcreate2(file_id, dset_name, H5T_STD_I32BE,
-				            dataspace_id, H5P_DEFAULT, properties, H5P_DEFAULT);
+                            dataspace_id, H5P_DEFAULT, properties, H5P_DEFAULT);
 
                 if ( dataset_ids[i] < 0 ) {
 
@@ -1304,7 +1304,7 @@ mdc_api_call_smoke_check(int express_test)
                 pass = FALSE;
                 failure_mssg = "slab validation failed.";
 #else /* as above */
-                fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n",
+                HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n",
                         i, j, m);
 #endif
             }
@@ -1425,7 +1425,7 @@ mdc_api_call_smoke_check(int express_test)
                 pass = FALSE;
                 failure_mssg = "slab validation failed.";
 #if 0 /* as above */
-                fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n",
+                HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n",
                         i, j, m);
 #endif
             }
@@ -1513,7 +1513,7 @@ mdc_api_call_smoke_check(int express_test)
  * used to test error rejection in the MDC related API calls.
  */
 
-#define NUM_INVALID_CONFIGS	42
+#define NUM_INVALID_CONFIGS    42
 
 H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
 {
@@ -1549,8 +1549,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 1 -- bad rpt_fcn_enabled */
@@ -1584,8 +1584,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 2 -- bad open_trace_file */
@@ -1619,8 +1619,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 3 -- bad close_trace_file */
@@ -1654,8 +1654,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 4 -- open_trace_file == TRUE and empty trace_file_name */
@@ -1689,8 +1689,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 5 -- bad set_initial_size */
@@ -1724,8 +1724,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 6 -- max_size too big */
@@ -1759,8 +1759,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 7 -- min_size too small */
@@ -1794,8 +1794,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 8 -- min_size > max_size */
@@ -1829,8 +1829,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 9 -- initial size out of range (too big) */
@@ -1864,8 +1864,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 10 -- initial_size out of range (too small) */
@@ -1899,8 +1899,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 11 -- min_clean_fraction too big */
@@ -1934,8 +1934,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 12 -- min_clean_fraction too small */
@@ -1969,8 +1969,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 13 -- epoch_length too small */
@@ -2004,8 +2004,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 14 -- epoch_length too big */
@@ -2039,8 +2039,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 15 -- invalid incr_mode */
@@ -2074,8 +2074,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 16 -- lower_hr_threshold too small */
@@ -2109,8 +2109,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 17 -- lower_hr_threshold too big */
@@ -2144,8 +2144,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 18 -- increment too small */
@@ -2179,8 +2179,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 19 -- bad apply_max_increment */
@@ -2214,8 +2214,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 20 -- invalid flash_incr_mode */
@@ -2249,8 +2249,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 21 -- flash_multiple too small */
@@ -2284,8 +2284,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 22 -- flash_multiple too big */
@@ -2319,8 +2319,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 23 -- flash_threshold too small */
@@ -2354,8 +2354,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 24 -- flash_threshold too big */
@@ -2389,8 +2389,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 25 -- bad decr_mode */
@@ -2424,8 +2424,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 26 -- upper_hr_threshold too big */
@@ -2459,8 +2459,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 27 -- decrement too small */
@@ -2494,8 +2494,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 28 -- decrement too big */
@@ -2529,8 +2529,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 29 -- epochs_before_eviction too small */
@@ -2564,8 +2564,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 30 -- epochs_before_eviction too big */
@@ -2599,8 +2599,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 31 -- invalid apply_empty_reserve */
@@ -2634,8 +2634,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ 2,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 32 -- empty_reserve too small */
@@ -2669,8 +2669,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ -0.0000000001f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 33 -- empty_reserve too big */
@@ -2704,8 +2704,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ H5_DOUBLE(1.00000000001),
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 34 -- upper_hr_threshold too small */
@@ -2739,8 +2739,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 35 -- upper_hr_threshold too big */
@@ -2774,8 +2774,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 36 -- upper_hr_threshold <= lower_hr_threshold */
@@ -2809,8 +2809,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 37 -- dirty_bytes_threshold too small */
@@ -2844,8 +2844,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (H5C__MIN_MAX_CACHE_SIZE / 2) - 1,
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 38 -- dirty_bytes_threshold too big */
@@ -2879,8 +2879,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (H5C__MAX_MAX_CACHE_SIZE / 4) + 1,
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 39 -- attempt to disable evictions when auto incr enabled */
@@ -2914,8 +2914,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 40 -- attempt to disable evictions when auto decr enabled */
@@ -2949,8 +2949,8 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */
-				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+    /* int      metadata_write_strategy = */
+                    H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 41 -- unknown metadata write strategy */
@@ -2984,18 +2984,18 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
-    /* int	  metadata_write_strategy = */ -1
+    /* int      metadata_write_strategy = */ -1
   }
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_fapl_mdc_api_errs()
  *
  * Purpose:     Verify that the FAPL related MDC API calls reject input
  *              errors gracefully.
  *
- * Return:	void
+ * Return:    void
  *
  * Programmer:  John Mainzer
  *              4/19/04
@@ -3156,14 +3156,14 @@ check_fapl_mdc_api_errs(void)
 
 } /* check_fapl_mdc_api_errs() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_file_mdc_api_errs()
  *
  * Purpose:     Verify that the file related MDC API calls reject input
  *              errors gracefully.
  *
- * Return:	void
+ * Return:    void
  *
  * Programmer:  John Mainzer
  *              4/19/04
@@ -3202,8 +3202,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: calling h5_fixname().\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: calling h5_fixname().\n", fcn_name);
+    }
 
         if ( h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof(filename))
             == NULL ) {
@@ -3217,8 +3217,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: calling H5Fcreate().\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: calling H5Fcreate().\n", fcn_name);
+    }
 
         file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -3239,8 +3239,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fget_mdc_config((hid_t)-1, &scratch);
@@ -3257,8 +3257,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fget_mdc_config(file_id, NULL);
@@ -3276,8 +3276,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fget_mdc_config(file_id, &scratch);
@@ -3298,8 +3298,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fset_mdc_config((hid_t)-1, &default_config);
@@ -3316,8 +3316,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fset_mdc_config(file_id, NULL);
@@ -3335,10 +3335,10 @@ check_file_mdc_api_errs(void)
     {
         if ( show_progress ) {
 
-	    HDfprintf(stdout,
-		    "%s: testing H5Fset_mdc_config() with invalid config %d.\n",
-		    fcn_name, i);
-	}
+        HDfprintf(stdout,
+            "%s: testing H5Fset_mdc_config() with invalid config %d.\n",
+            fcn_name, i);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fset_mdc_config(file_id, &(invalid_configs[i]));
@@ -3365,9 +3365,9 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n",
-		      fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n",
+            fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fget_mdc_hit_rate((hid_t)-1, &hit_rate);
@@ -3384,9 +3384,9 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n",
-		      fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n",
+            fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fget_mdc_hit_rate(file_id, NULL);
@@ -3405,9 +3405,9 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n",
-		      fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n",
+            fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Freset_mdc_hit_rate_stats((hid_t)-1);
@@ -3427,8 +3427,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", fcn_name);
+    }
 
         H5E_BEGIN_TRY {
             result = H5Fget_mdc_size((hid_t)-1, &max_size, &min_clean_size,
@@ -3446,8 +3446,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", fcn_name);
+    }
 
         if ( ( H5Fget_mdc_size(file_id, &max_size, NULL, NULL, NULL) < 0 ) ||
              ( H5Fget_mdc_size(file_id, NULL, &min_clean_size,
@@ -3468,8 +3468,8 @@ check_file_mdc_api_errs(void)
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: cleaning up from tests.\n", fcn_name);
-	}
+        HDfprintf(stdout, "%s: cleaning up from tests.\n", fcn_name);
+    }
 
         if ( H5Fclose(file_id) < 0  ) {
 
@@ -3491,13 +3491,13 @@ check_file_mdc_api_errs(void)
 
 } /* check_file_mdc_api_errs() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
  * Purpose:     Run tests on the cache code contained in H5C.c
  *
- * Return:	Success:
+ * Return:    Success:
  *
  * Programmer:  John Mainzer
  *              6/24/04
diff --git a/test/cache_common.c b/test/cache_common.c
index a5dd485..c4ecb6d 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -1891,7 +1891,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	       ( expected[i].is_pinned ) ) ) {
 
 	    pass = FALSE;
-	    sprintf(msg, "%d: Contradictory data in expected[%d].\n", tag, i);
+	    HDsprintf(msg, "%d: Contradictory data in expected[%d].\n", tag, i);
 	    failure_mssg = msg;
 	}
 
@@ -1903,7 +1903,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( in_cache != expected[i].in_cache ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
 		      "%d entry (%d, %d) in cache actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -1919,7 +1919,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->size != expected[i].size ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                         "%d entry (%d, %d) size actualexpected = %ld/%ld.\n",
 			tag,
 	                (int)expected[i].entry_type,
@@ -1935,7 +1935,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.size != expected[i].size ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                         "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n",
 			tag,
 		        (int)expected[i].entry_type,
@@ -1951,7 +1951,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->at_main_addr != expected[i].at_main_addr ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                       "%d entry (%d, %d) at main addr actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -1967,7 +1967,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->is_dirty != expected[i].is_dirty ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                       "%d entry (%d, %d) is_dirty actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -1983,7 +1983,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.is_dirty != expected[i].is_dirty ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                       "%d entry (%d, %d) header is_dirty actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -1999,7 +1999,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->is_protected != expected[i].is_protected ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                       "%d entry (%d, %d) is_protected actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2015,7 +2015,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.is_protected != expected[i].is_protected ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                       "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2031,7 +2031,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->is_pinned != expected[i].is_pinned ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                       "%d entry (%d, %d) is_pinned actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2047,7 +2047,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.is_pinned != expected[i].is_pinned ) {
 
 	        pass = FALSE;
-	        sprintf(msg,
+	        HDsprintf(msg,
                   "%d entry (%d, %d) header is_pinned actual/expected = %d/%d.\n",
 		  tag,
 		  (int)expected[i].entry_type,
@@ -2066,7 +2066,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	         ( entry_ptr->destroyed != expected[i].destroyed ) ) {
 
 	        pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                         "%d entry (%d,%d) loaded = %d(%d), clrd = %d(%d), flshd = %d(%d), dest = %d(%d)\n",
 			tag,
 		        (int)expected[i].entry_type,
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index fd3bb30..37ee076 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -214,13 +214,13 @@ test_compound (char *filename, hid_t fapl)
     /* Also verify H5Pset_preserve is initially 0 and then is set to 1. */
     if ((PRESERVE = H5Pcreate (H5P_DATASET_XFER))<0) goto error;
     if ((ret_code=H5Pget_preserve (PRESERVE)) != 0){
-	printf("Preserve status of dataset transfer property list should be"
+	HDprintf("Preserve status of dataset transfer property list should be"
 	   " 0 (FALSE), got %d\n", ret_code);
 	goto error;
     }
     if (H5Pset_preserve (PRESERVE, 1)<0) goto error;
     if ((ret_code=H5Pget_preserve (PRESERVE)) != 1){
-	printf("Preserve status of dataset transfer property list should be"
+	HDprintf("Preserve status of dataset transfer property list should be"
 	   " 1 (TRUE), got %d\n", ret_code);
 	goto error;
     }
@@ -550,11 +550,11 @@ test_compound (char *filename, hid_t fapl)
 	    s1[i].d != 8*i+6 ||
 	    s1[i].e != 8*i+7) {
 	    H5_FAILED();
-	    printf("    i==%u, row=%u, col=%u\n", i, i/NY, i%NY);
-	    printf("    got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n",
+	    HDprintf("    i==%u, row=%u, col=%u\n", i, i/NY, i%NY);
+	    HDprintf("    got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n",
 		   s1[i].a, s1[i].b, s1[i].c[0], s1[i].c[1], s1[i].c[2],
 		   s1[i].c[3], s1[i].d, s1[i].e);
-	    printf("    ans: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n",
+	    HDprintf("    ans: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n",
 		   8*i+0, 8*i+1, 8*i+2, 8*i+3, 8*i+4, 8*i+5, 8*i+6, 8*i+7);
 	    goto error;
 	}
@@ -1298,15 +1298,15 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset)
             !DBL_ABS_EQUAL(s_ptr->n, d_ptr->n) ) {
 
 	    H5_FAILED();
-	    printf("    i=%d\n", i);
-	    printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n",
+	    HDprintf("    i=%d\n", i);
+	    HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n",
 		   s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
 		   s_ptr->c[3], s_ptr->c[4], s_ptr->c[5], s_ptr->c[6], s_ptr->c[7],
                    s_ptr->d, s_ptr->e, s_ptr->f, s_ptr->g,s_ptr->h[0],s_ptr->h[1],s_ptr->h[2],
                    s_ptr->h[3],s_ptr->h[4],s_ptr->h[5],s_ptr->h[6],s_ptr->h[7],s_ptr->h[8],
                    s_ptr->h[9],s_ptr->h[10],s_ptr->h[11],s_ptr->h[12],s_ptr->h[13],s_ptr->h[14],
                    s_ptr->h[15], s_ptr->i,s_ptr->j,s_ptr->k,s_ptr->l,s_ptr->m,s_ptr->n);
-	    printf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n",
+	    HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n",
 		   d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
 		   d_ptr->c[3], d_ptr->c[4], d_ptr->c[5], d_ptr->c[6], d_ptr->c[7],
                    d_ptr->d, d_ptr->e, d_ptr->f, d_ptr->g,d_ptr->h[0],d_ptr->h[1],d_ptr->h[2],
@@ -1738,10 +1738,10 @@ error:
 {                                                                              \
     int _i;                                                                    \
     H5_FAILED(); AT();                                                         \
-    printf("    Insertion order =");                                           \
+    HDprintf("    Insertion order =");                                           \
     for(_i=0; _i<PACK_NMEMBS; _i++)                                            \
-        printf(" %d", order[_i]);                                              \
-    printf("\n    Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]); \
+        HDprintf(" %d", order[_i]);                                              \
+    HDprintf("\n    Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]); \
     fflush(stdout);                                                            \
     goto error;                                                                \
 }
@@ -1819,7 +1819,7 @@ test_pack_ooo(void)
 
         /* Insert the compound members in the random order previously generated */
         for(i=0; i<PACK_NMEMBS; i++) {
-            sprintf(name, "%05d", i);
+            HDsprintf(name, "%05d", i);
             if(i == sub_cmpd_order) {
                 if(H5Tinsert(cmpd, name, (size_t)(4 * order[i]), sub_cmpd) < 0) PACK_OOO_ERROR
             } else
@@ -1845,7 +1845,7 @@ test_pack_ooo(void)
 
         /* Insert the compound members in the random order previously generated */
         for(i=0; i<PACK_NMEMBS; i++) {
-            sprintf(name, "%05d", i);
+            HDsprintf(name, "%05d", i);
             if(i == sub_cmpd_order) {
                 if(H5Tinsert(cmpd, name, (size_t)(4 * order[i]), sub_cmpd) < 0) PACK_OOO_ERROR
             } else
@@ -1872,7 +1872,7 @@ test_pack_ooo(void)
 
         /* Insert the compound members in reverse order, with compound last */
         for(i=0; i<PACK_NMEMBS; i++) {
-            sprintf(name, "%05d", i);
+            HDsprintf(name, "%05d", i);
             if(i == PACK_NMEMBS - 1) {
                 if(H5Tinsert(cmpd, name, (size_t)(4 * (PACK_NMEMBS - i - 1)), sub_cmpd) < 0) PACK_OOO_ERROR
             } else
@@ -1898,7 +1898,7 @@ test_pack_ooo(void)
 
         /* Insert the compound members in reverse order, with compound last */
         for(i=0; i<PACK_NMEMBS; i++) {
-            sprintf(name, "%05d", i);
+            HDsprintf(name, "%05d", i);
             if(i == PACK_NMEMBS - 1) {
                 if(H5Tinsert(cmpd, name, (size_t)(4 * (PACK_NMEMBS - i - 1)), sub_cmpd) < 0) PACK_OOO_ERROR
             } else
@@ -1925,7 +1925,7 @@ test_pack_ooo(void)
 
         /* Insert the compound members in forward order, with compound first */
         for(i=0; i<PACK_NMEMBS; i++) {
-            sprintf(name, "%05d", i);
+            HDsprintf(name, "%05d", i);
             if(i == 0) {
                 if(H5Tinsert(cmpd, name, (size_t)(4 * i), sub_cmpd) < 0) PACK_OOO_ERROR
             } else
@@ -1951,7 +1951,7 @@ test_pack_ooo(void)
 
         /* Insert the compound members in forward order */
         for(i=0; i<PACK_NMEMBS; i++) {
-            sprintf(name, "%05d", i);
+            HDsprintf(name, "%05d", i);
             if(i == 0) {
                 if(H5Tinsert(cmpd, name, (size_t)(4 * i), sub_cmpd) < 0) PACK_OOO_ERROR
             } else
@@ -2181,7 +2181,7 @@ main (int argc, char *argv[])
     /* Turn off optimized compound converter? */
     if (argc>1) {
 	if (argc>2 || strcmp("--noopt", argv[1])) {
-	    fprintf(stderr, "usage: %s [--noopt]\n", argv[0]);
+	    HDfprintf(stderr, "usage: %s [--noopt]\n", argv[0]);
 	    exit(1);
 	}
 	H5Tunregister(H5T_PERS_DONTCARE, NULL, (hid_t)-1, (hid_t)-1, H5T__conv_struct_opt);
@@ -2213,7 +2213,7 @@ main (int argc, char *argv[])
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl_id) < 0 ? 1 : 0);
 
     if (nerrors) {
-        printf("***** %u FAILURE%s! *****\n",
+        HDprintf("***** %u FAILURE%s! *****\n",
                nerrors, 1==nerrors?"":"S");
         HDexit(1);
     }
diff --git a/test/cross_read.c b/test/cross_read.c
index 503cd28..1b08c3a 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -127,7 +127,7 @@ static int check_data(const char *dsetname, hid_t fid, hbool_t floating_number)
 		if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001F)) {
 		    if (!nerrors++) {
 			H5_FAILED();
-			printf("element [%d][%d] is %g but should have been %g\n",
+			HDprintf("element [%d][%d] is %g but should have been %g\n",
 			       j, i, data_out[j][i], data_in[j][i]);
 		    }
 		}
@@ -144,7 +144,7 @@ static int check_data(const char *dsetname, hid_t fid, hbool_t floating_number)
 		if (int_data_out[j][i] != int_data_in[j][i]) {
 		    if (!nerrors++) {
 			H5_FAILED();
-			printf("element [%d][%d] is %d but should have been %d\n",
+			HDprintf("element [%d][%d] is %d but should have been %d\n",
 			       j, i, (int)int_data_out[j][i],
 			       (int)int_data_in[j][i]);
 		    }
@@ -161,7 +161,7 @@ static int check_data(const char *dsetname, hid_t fid, hbool_t floating_number)
 
     /* Failure */
     if (nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        HDprintf("total of %d errors out of %d elements\n", nerrors, NX*NY);
         return 1;
     }
 
@@ -337,11 +337,11 @@ int main(void)
     nerrors += open_dataset(filename);
 
     if (nerrors) {
-        printf("***** %u FAILURE%s! *****\n",
+        HDprintf("***** %u FAILURE%s! *****\n",
                nerrors, 1==nerrors?"":"S");
         HDexit(1);
     }
 
-    printf("All data type tests passed.\n");
+    HDprintf("All data type tests passed.\n");
     return 0;
 }
diff --git a/test/dtransform.c b/test/dtransform.c
index f022699..2882c8f 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -72,7 +72,7 @@ const int transformData[ROWS][COLS] =
             if(!( (((VAR1)[i][j] >= (TYPE)((VAR2)[i][j])) && ( ((VAR1)[i][j] - TOL) < (TYPE)((VAR2)[i][j]))) || (  ((VAR1)[i][j] <= (TYPE)((VAR2)[i][j])) && ( ((VAR1)[i][j] + TOL) > (TYPE)((VAR2)[i][j])))))	\
             {						\
                 H5_FAILED();				\
-                fprintf(stderr, "    ERROR: Conversion failed to match computed data\n");	\
+                HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");	\
                 goto error;					\
             }						\
         }							\
@@ -89,7 +89,7 @@ const int transformData[ROWS][COLS] =
             if( !(((VAR1)[i][j] <= ((TYPE)(VAR2)[i][j] + TOL)) && ((VAR1)[i][j] >= ((TYPE)(VAR2)[i][j] - TOL))) )	\
             {						\
                 H5_FAILED();				\
-                fprintf(stderr, "    ERROR: Conversion failed to match computed data\n");	\
+                HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");	\
                 goto error;					\
             }						\
         }							\
@@ -106,7 +106,7 @@ const int transformData[ROWS][COLS] =
             if( (VAR1)[i][j] != (VAR2)[i][j] )	        \
             {						\
                 H5_FAILED();				\
-                fprintf(stderr, "    ERROR: data  failed to match computed data\n");	\
+                HDfprintf(stderr, "    ERROR: data  failed to match computed data\n");	\
                 goto error;				\
             }						\
         }						\
@@ -248,7 +248,7 @@ const int transformData[ROWS][COLS] =
     else						\
     {							\
 	H5_FAILED();					\
-	fprintf(stderr, "    ERROR: Data transform allowed invalid TRANSFORM transform to be set\n");	\
+	HDfprintf(stderr, "    ERROR: Data transform allowed invalid TRANSFORM transform to be set\n");	\
 	goto error;					\
     }							\
 }
diff --git a/test/dtypes.c b/test/dtypes.c
index 25cc890..9747af7 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -61,7 +61,7 @@
         FAIL_STACK_ERROR                                                       \
     if((NMEMBS) != H5I_nmembers(H5I_DATATYPE)) {                               \
         H5_FAILED();                                                           \
-        printf("    #dtype ids expected: %lld; found: %lld\n",                 \
+        HDprintf("    #dtype ids expected: %lld; found: %lld\n",                 \
                (long long)NMEMBS, (long long)H5I_nmembers(H5I_DATATYPE));      \
         goto error;                                                            \
     }
@@ -747,11 +747,11 @@ test_compound_2(void)
 	    s_ptr->d    != d_ptr->d    ||
 	    s_ptr->e    != d_ptr->e) {
 	    H5_FAILED();
-	    printf("    i=%d\n", i);
-	    printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+	    HDprintf("    i=%d\n", i);
+	    HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
 		   s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
 		   s_ptr->c[3], s_ptr->d, s_ptr->e);
-	    printf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+	    HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
 		   d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
 		   d_ptr->c[3], d_ptr->d, d_ptr->e);
 	    goto error;
@@ -875,11 +875,11 @@ test_compound_3(void)
 	    s_ptr->c[3] != d_ptr->c[3] ||
 	    s_ptr->e    != d_ptr->e) {
 	    H5_FAILED();
-	    printf("    i=%d\n", i);
-	    printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+	    HDprintf("    i=%d\n", i);
+	    HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
 		   s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
 		   s_ptr->c[3], s_ptr->d, s_ptr->e);
-	    printf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n",
+	    HDprintf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n",
 		   d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
 		   d_ptr->c[3], d_ptr->e);
 	    goto error;
@@ -1010,11 +1010,11 @@ test_compound_4(void)
 	    s_ptr->d    != d_ptr->d    ||
 	    s_ptr->e    != d_ptr->e) {
 	    H5_FAILED();
-	    printf("    i=%d\n", i);
-	    printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+	    HDprintf("    i=%d\n", i);
+	    HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
 		   s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2],
 		   s_ptr->c[3], s_ptr->d, s_ptr->e);
-	    printf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
+	    HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n",
 		   d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
 		   d_ptr->c[3], d_ptr->d, d_ptr->e);
 	    goto error;
@@ -1231,10 +1231,10 @@ test_compound_6(void)
 	if (s_ptr->b    != d_ptr->b    ||
 	    s_ptr->d    != d_ptr->d) {
 	    H5_FAILED();
-	    printf("    i=%d\n", i);
-	    printf("    src={b=%d, d=%d\n",
+	    HDprintf("    i=%d\n", i);
+	    HDprintf("    src={b=%d, d=%d\n",
            (int)s_ptr->b, (int)s_ptr->d);
-	    printf("    dst={b=%ld, d=%ld\n",
+	    HDprintf("    dst={b=%ld, d=%ld\n",
            d_ptr->b, d_ptr->d);
 	    goto error;
 	}
@@ -1307,43 +1307,43 @@ test_compound_7(void)
 
     if((tid1= H5Tcreate( H5T_COMPOUND, sizeof(struct s1))) < 0) {
         H5_FAILED();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(tid1,"a",HOFFSET(struct s1,a),H5T_NATIVE_INT) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'a'\n");
+        HDprintf("Can't insert field 'a'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(tid1,"b",HOFFSET(struct s1,b),H5T_NATIVE_FLOAT) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'b'\n");
+        HDprintf("Can't insert field 'b'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(tid1,"c",HOFFSET(struct s1,c),H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'c'\n");
+        HDprintf("Can't insert field 'c'\n");
         goto error;
     } /* end if */
 
     if(H5Tget_size(tid1)!=sizeof(struct s1)) {
         H5_FAILED();
-        printf("Incorrect size for struct 1\n");
+        HDprintf("Incorrect size for struct 1\n");
         goto error;
     } /* end if */
 
     if((tid2= H5Tcopy(tid1)) < 0) {
         H5_FAILED();
-        printf("Can't copy datatype\n");
+        HDprintf("Can't copy datatype\n");
         goto error;
     } /* end if */
 
     if(H5Tget_size(tid2)==sizeof(struct s2)) {
         H5_FAILED();
-        printf("Incorrect size for struct 2\n");
+        HDprintf("Incorrect size for struct 2\n");
         goto error;
     } /* end if */
 
@@ -1353,7 +1353,7 @@ test_compound_7(void)
     } H5E_END_TRY;
     if(ret>=0) {
         H5_FAILED();
-        printf("Inserted field 'd'?\n");
+        HDprintf("Inserted field 'd'?\n");
         goto error;
     } /* end if */
 
@@ -1363,33 +1363,33 @@ test_compound_7(void)
     } H5E_END_TRY;
     if(ret>=0) {
         H5_FAILED();
-        printf("Shrunk compound type?\n");
+        HDprintf("Shrunk compound type?\n");
         goto error;
     } /* end if */
 
     /* Increase compound type size and try inserting field again */
     if(H5Tset_size(tid2, sizeof(struct s2)) < 0) {
         H5_FAILED();
-        printf("Can't increase size for compound type\n");
+        HDprintf("Can't increase size for compound type\n");
         goto error;
     } /* end if */
 
     if( H5Tinsert(tid2,"d",HOFFSET(struct s2,d),H5T_NATIVE_DOUBLE) < 0) {
         H5_FAILED();
-        printf("Can't expand compound datatype\n");
+        HDprintf("Can't expand compound datatype\n");
         goto error;
     } /* end if */
 
     if(H5Tget_size(tid2)!=sizeof(struct s2)) {
         H5_FAILED();
-        printf("Incorrect size for struct 2\n");
+        HDprintf("Incorrect size for struct 2\n");
         goto error;
     } /* end if */
 
     /* Release resources */
     if (H5Tclose(tid1) < 0 || H5Tclose(tid2) < 0) {
         H5_FAILED();
-        printf("Can't close datatypes\n");
+        HDprintf("Can't close datatypes\n");
         goto error;
     } /* end if */
 
@@ -1455,59 +1455,59 @@ test_compound_8(void)
     /* Create first compound datatype */
     if((tid1 = H5Tcreate( H5T_COMPOUND, sizeof(struct s1))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(tid1,"a",HOFFSET(struct s1,a),H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'a'\n");
+        HDprintf("Can't insert field 'a'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(tid1,"b",HOFFSET(struct s1,b),H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'b'\n");
+        HDprintf("Can't insert field 'b'\n");
         goto error;
     } /* end if */
 
     /* Make a copy of the type for later use */
     if((tid1_copy = H5Tcopy(tid1)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't copy type #1\n");
+        HDprintf("Can't copy type #1\n");
         goto error;
     } /* end if */
 
     /* Test H5Tpack for the first compound type */
     if(H5Tpack(tid1) < 0) {
         H5_FAILED(); AT();
-        printf("Can't pack the compound datatype\n");
+        HDprintf("Can't pack the compound datatype\n");
         goto error;
     } /* end if */
 
     if(H5Tlock(tid1) < 0) {
         H5_FAILED(); AT();
-        printf("Can't lock the compound datatype\n");
+        HDprintf("Can't lock the compound datatype\n");
         goto error;
     } /* end if */
 
     /* If the type is already packed, packing a locked type is OK */
     if(H5Tpack(tid1) < 0) {
         H5_FAILED(); AT();
-        printf("Can't pack the compound datatype for second time\n");
+        HDprintf("Can't pack the compound datatype for second time\n");
         goto error;
     } /* end if */
 
     /* Verify the size of packed compound type */
     if((tsize = H5Tget_size(tid1)) == 0) {
         H5_FAILED(); AT();
-        printf("Can't get size of the compound datatype\n");
+        HDprintf("Can't get size of the compound datatype\n");
         goto error;
     } /* end if */
 
     if(tsize != (sizeof(char) + sizeof(int))) {
         H5_FAILED(); AT();
-        printf("The size of the packed compound datatype is incorrect\n");
+        HDprintf("The size of the packed compound datatype is incorrect\n");
         goto error;
     } /* end if */
 
@@ -1517,61 +1517,61 @@ test_compound_8(void)
     /* Create second compound datatype */
     if((tid2 = H5Tcreate( H5T_COMPOUND, sizeof(struct s2))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(tid2,"c",HOFFSET(struct s2,c),H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c'\n");
+        HDprintf("Can't insert field 'c'\n");
         goto error;
     } /* end if */
 
     /* Insert the member of unpacked compound type */
     if(H5Tinsert(tid2,"d",HOFFSET(struct s2,d),tid1_copy) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'd'\n");
+        HDprintf("Can't insert field 'd'\n");
         goto error;
     } /* end if */
 
     /* Make a copy of the type for later */
     if((tid3=H5Tcopy(tid2)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't copy type #2\n");
+        HDprintf("Can't copy type #2\n");
         goto error;
     } /* end if */
 
     /* Make a copy of the type for later */
     if((tid2_copy = H5Tcopy(tid2)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't copy type #2\n");
+        HDprintf("Can't copy type #2\n");
         goto error;
     } /* end if */
 
     /* Test H5Tpack for the second compound type */
     if(H5Tpack(tid2) < 0) {
         H5_FAILED(); AT();
-        printf("Can't pack the compound datatype\n");
+        HDprintf("Can't pack the compound datatype\n");
         goto error;
     } /* end if */
 
     if(H5Tlock(tid2) < 0) {
         H5_FAILED(); AT();
-        printf("Can't lock the compound datatype\n");
+        HDprintf("Can't lock the compound datatype\n");
         goto error;
     } /* end if */
 
     /* If the type is already packed, packing a locked type is OK */
     if(H5Tpack(tid2) < 0) {
         H5_FAILED(); AT();
-        printf("Can't pack the compound datatype for second time\n");
+        HDprintf("Can't pack the compound datatype for second time\n");
         goto error;
     } /* end if */
 
     /* Lock unpacked type */
     if(H5Tlock(tid3) < 0) {
         H5_FAILED(); AT();
-        printf("Can't lock the compound datatype\n");
+        HDprintf("Can't lock the compound datatype\n");
         goto error;
     } /* end if */
 
@@ -1581,20 +1581,20 @@ test_compound_8(void)
     } H5E_END_TRY;
     if(ret>=0) {
         H5_FAILED(); AT();
-        printf("Packing locked datatype worked?\n");
+        HDprintf("Packing locked datatype worked?\n");
         goto error;
     } /* end if */
 
     /* Verify the size of packed compound type */
     if((tsize = H5Tget_size(tid2)) == 0) {
         H5_FAILED(); AT();
-        printf("Can't get size of the compound datatype\n");
+        HDprintf("Can't get size of the compound datatype\n");
         goto error;
     } /* end if */
 
     if(tsize != (sizeof(char) + sizeof(char) + sizeof(int))) {
         H5_FAILED(); AT();
-        printf("The size of the packed compound datatype is incorrect: tsize = %zu\n", tsize);
+        HDprintf("The size of the packed compound datatype is incorrect: tsize = %zu\n", tsize);
         goto error;
     } /* end if */
 
@@ -1604,46 +1604,46 @@ test_compound_8(void)
     /* Create an array type of compound type */
     if((arr_tid = H5Tarray_create2(tid2_copy, 1, dims)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create an array datatype\n");
+        HDprintf("Can't create an array datatype\n");
         goto error;
     } /* end if */
 
     /* Test H5Tpack for the array type */
     if(H5Tpack(arr_tid) < 0) {
         H5_FAILED(); AT();
-        printf("Can't pack the array datatype\n");
+        HDprintf("Can't pack the array datatype\n");
         goto error;
     } /* end if */
 
     /* Verify the size of packed compound type */
     if((tsize = H5Tget_size(arr_tid)) == 0) {
         H5_FAILED(); AT();
-        printf("Can't get size of the array datatype\n");
+        HDprintf("Can't get size of the array datatype\n");
         goto error;
     } /* end if */
 
     if(tsize != ARRAY_DIM * (sizeof(char) + sizeof(char) + sizeof(int))) {
         H5_FAILED(); AT();
-        printf("The size of the packed array datatype is incorrect\n");
+        HDprintf("The size of the packed array datatype is incorrect\n");
         goto error;
     } /* end if */
 
 
     if(H5Tclose(tid1_copy) < 0) {
         H5_FAILED(); AT();
-        printf("Can't close the compound datatype\n");
+        HDprintf("Can't close the compound datatype\n");
         goto error;
     } /* end if */
 
     if(H5Tclose(tid2_copy) < 0) {
         H5_FAILED(); AT();
-        printf("Can't close the compound datatype\n");
+        HDprintf("Can't close the compound datatype\n");
         goto error;
     } /* end if */
 
     if(H5Tclose(arr_tid) < 0) {
         H5_FAILED(); AT();
-        printf("Can't close the array datatype\n");
+        HDprintf("Can't close the array datatype\n");
         goto error;
     } /* end if */
 
@@ -1697,51 +1697,51 @@ test_compound_9(void)
     h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename);
     if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create file!\n");
+        HDprintf("Can't create file!\n");
         goto error;
     } /* end if */
 
     /* Create first compound datatype */
     if((cmpd_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_tid,"i1",HOFFSET(struct cmpd_struct,i1),H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i1'\n");
+        HDprintf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
     str_id = H5Tcopy(H5T_C_S1);
     if(H5Tset_size(str_id,H5T_VARIABLE) < 0) {
         H5_FAILED(); AT();
-        printf("Can't set size for VL string\n");
+        HDprintf("Can't set size for VL string\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct, str), str_id) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i1'\n");
+        HDprintf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct, i2), H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i2'\n");
+        HDprintf("Can't insert field 'i2'\n");
         goto error;
     } /* end if */
 
     if(H5Tcommit2(file, "compound", cmpd_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't commit datatype\n");
+        HDprintf("Can't commit datatype\n");
         goto error;
     } /* end if */
 
     if(H5Tclose(cmpd_tid) < 0) {
         H5_FAILED(); AT();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
 
@@ -1750,44 +1750,44 @@ test_compound_9(void)
 
     if((dup_tid = H5Tcopy(cmpd_tid)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't copy datatype\n");
+        HDprintf("Can't copy datatype\n");
         goto error;
     } /* end if */
 
     dim1[0] = 1;
     if((space_id = H5Screate_simple(1, dim1, NULL)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create space\n");
+        HDprintf("Can't create space\n");
         goto error;
     } /* end if */
 
     if((dset_id = H5Dcreate2(file, "Dataset", dup_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create dataset\n");
+        HDprintf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if(H5Dwrite(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't write data\n");
+        HDprintf("Can't write data\n");
         goto error;
     } /* end if */
 
     if(H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str)) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         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");
+        HDprintf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata.str = NULL;
@@ -1808,31 +1808,31 @@ test_compound_9(void)
 
     if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("cannot open file\n");
+        HDprintf("cannot open file\n");
         goto error;
     } /* end if */
 
     if((dset_id = H5Dopen2(file, "Dataset", H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("cannot open dataset\n");
+        HDprintf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if((space_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't get space\n");
+        HDprintf("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");
+        HDprintf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if((dup_tid = H5Tcopy(cmpd_tid)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't copy datatype\n");
+        HDprintf("Can't copy datatype\n");
         goto error;
     } /* end if */
 
@@ -1841,19 +1841,19 @@ test_compound_9(void)
 
     if(H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(rdata.i1!=wdata.i1 || rdata.i2!=wdata.i2 || strcmp(rdata.str, wdata.str)) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
 
     if(H5Dvlen_reclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
     rdata.str = NULL;
@@ -1936,84 +1936,84 @@ test_compound_10(void)
     h5_fixname(FILENAME[4], H5P_DEFAULT, filename, sizeof filename);
     if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create file!\n");
+        HDprintf("Can't create file!\n");
         goto error;
     } /* end if */
 
     /* Create first compound datatype */
     if((cmpd_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_tid,"i1",HOFFSET(struct cmpd_struct,i1),H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i1'\n");
+        HDprintf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
     cstr_id = H5Tcopy(H5T_C_S1);
     if(H5Tset_size(cstr_id,H5T_VARIABLE) < 0) {
         H5_FAILED(); AT();
-        printf("Can't set size for C string\n");
+        HDprintf("Can't set size for C string\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_tid,"c_string",HOFFSET(cmpd_struct,str),cstr_id) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'str'\n");
+        HDprintf("Can't insert field 'str'\n");
         goto error;
     } /* end if */
 
     /* Create vl-string datatype */
     if((vlstr_id =  H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create VL string\n");
+        HDprintf("Can't create VL string\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_tid, "vl_string",HOFFSET(cmpd_struct, text), vlstr_id) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'text'\n");
+        HDprintf("Can't insert field 'text'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_tid,"i2",HOFFSET(struct cmpd_struct,i2),H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i2'\n");
+        HDprintf("Can't insert field 'i2'\n");
         goto error;
     } /* end if */
 
     /* Create the array datatype for c_string data */
     if((arr_tid = H5Tarray_create2(cmpd_tid, 1, arr_dim)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create array type\n");
+        HDprintf("Can't create array type\n");
         goto error;
     } /* end if */
 
     dim1[0] = 1;
     if((space_id = H5Screate_simple(1,dim1,NULL)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create space\n");
+        HDprintf("Can't create space\n");
         goto error;
     } /* end if */
 
     if((dset_id = H5Dcreate2(file, "Dataset", arr_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create dataset\n");
+        HDprintf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if(H5Dwrite(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't write data\n");
+        HDprintf("Can't write data\n");
         goto error;
     } /* end if */
 
     if(H5Dread(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
@@ -2021,13 +2021,13 @@ test_compound_10(void)
         if(rdata[i].i1 != wdata[i].i1 || rdata[i].i2 != wdata[i].i2 ||
             HDstrcmp(rdata[i].str, wdata[i].str)) {
             H5_FAILED(); AT();
-            printf("incorrect read data\n");
+            HDprintf("incorrect read data\n");
             goto error;
         } /* end if */
 
         if(rdata[i].text.len!=wdata[i].text.len) {
             H5_FAILED(); AT();
-            printf("incorrect VL length\n");
+            HDprintf("incorrect VL length\n");
             goto error;
         } /* end if */
 
@@ -2035,18 +2035,18 @@ test_compound_10(void)
         t2 = wdata[i].text.p;
         if(strcmp((char*)t1, (char*)t2)) {
             H5_FAILED(); AT();
-            printf("incorrect VL read data\n");
+            HDprintf("incorrect VL read data\n");
             goto error;
         }
     } /* end for */
     if(H5Dvlen_reclaim(arr_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't reclaim read data\n");
+        HDprintf("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");
+        HDprintf("Can't reclaim read data\n");
         goto error;
     } /* end if */
 
@@ -2157,7 +2157,7 @@ test_compound_11(void)
         ((big_t *)buf)[u].i1 = (int)(u * 3);
         ((big_t *)buf)[u].i2 = (int)(u * 5);
         ((big_t *)buf)[u].s1 = (char *)HDmalloc((size_t)32);
-        sprintf(((big_t *)buf)[u].s1, "%u", (unsigned)u);
+        HDsprintf(((big_t *)buf)[u].s1, "%u", (unsigned)u);
     } /* end for */
 
     /* Make copy of buffer before conversion */
@@ -2166,7 +2166,7 @@ test_compound_11(void)
     dim[0] = NTESTELEM;
     if((space_id = H5Screate_simple(1, dim, NULL)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create space\n");
+        HDprintf("Can't create space\n");
         goto error;
     } /* end if */
 
@@ -2182,29 +2182,29 @@ test_compound_11(void)
     /* Verify converted buffer is correct */
     for(u=0; u<NTESTELEM; u++) {
         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__,
+            HDprintf("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
         } /* end if */
         if(((big_t *)buf_orig)[u].i1!=((little_t *)buf)[u].i1) {
-            printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].i1,(unsigned)u,((little_t *)buf)[u].i1);
             TEST_ERROR
         } /* end if */
         if(((big_t *)buf_orig)[u].s1==NULL || ((little_t *)buf)[u].s1==NULL) {
-            printf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
         else if(HDstrcmp(((big_t *)buf_orig)[u].s1,((little_t *)buf)[u].s1)) {
-            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
     } /* end for */
     if(H5Dvlen_reclaim(little_tid2, space_id, H5P_DEFAULT, buf) < 0) {
         H5_FAILED(); AT();
-        printf("Can't reclaim data\n");
+        HDprintf("Can't reclaim data\n");
         goto error;
     } /* end if */
 
@@ -2226,29 +2226,29 @@ test_compound_11(void)
     /* Verify converted buffer is correct */
     for(u=0; u<NTESTELEM; u++) {
         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__,
+            HDprintf("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
         } /* end if */
         if(((big_t *)buf_orig)[u].i1!=((little_t *)buf)[u].i1) {
-            printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].i1,(unsigned)u,((little_t *)buf)[u].i1);
             TEST_ERROR
         } /* end if */
         if(((big_t *)buf_orig)[u].s1==NULL || ((little_t *)buf)[u].s1==NULL) {
-            printf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
         else if(HDstrcmp(((big_t *)buf_orig)[u].s1,((little_t *)buf)[u].s1)) {
-            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
     } /* end for */
     if(H5Dvlen_reclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) {
         H5_FAILED(); AT();
-        printf("Can't reclaim data\n");
+        HDprintf("Can't reclaim data\n");
         goto error;
     } /* end if */
 
@@ -2264,29 +2264,29 @@ test_compound_11(void)
     /* Verify converted buffer is correct */
     for(u=0; u<NTESTELEM; u++) {
         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__,
+            HDprintf("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
         } /* end if */
         if(((big_t *)buf_orig)[u].i1!=((little_t *)buf)[u].i1) {
-            printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].i1,(unsigned)u,((little_t *)buf)[u].i1);
             TEST_ERROR
         } /* end if */
         if(((big_t *)buf_orig)[u].s1==NULL || ((little_t *)buf)[u].s1==NULL) {
-            printf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].s1=%p, buf[%u].s1=%p\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
         else if(HDstrcmp(((big_t *)buf_orig)[u].s1,((little_t *)buf)[u].s1)) {
-            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__,
+            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n",__LINE__,
                     (unsigned)u,((big_t *)buf_orig)[u].s1,(unsigned)u,((little_t *)buf)[u].s1);
             TEST_ERROR
         } /* end if */
     } /* end for */
     if(H5Dvlen_reclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) {
         H5_FAILED(); AT();
-        printf("Can't reclaim data\n");
+        HDprintf("Can't reclaim data\n");
         goto error;
     } /* end if */
 
@@ -2557,230 +2557,230 @@ test_compound_14(void)
     h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename);
     if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create file!\n");
+        HDprintf("Can't create file!\n");
         goto error;
     } /* end if */
 
     /* Create memory compound datatype 1 */
     if((cmpd_m1_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_1))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m1_tid,"c1",HOFFSET(struct cmpd_struct_1,c1),H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c1'\n");
+        HDprintf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m1_tid,"c2",HOFFSET(struct cmpd_struct_1,c2),H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c2'\n");
+        HDprintf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
     str_id = H5Tcopy(H5T_C_S1);
     if(H5Tset_size(str_id,H5T_VARIABLE) < 0) {
         H5_FAILED(); AT();
-        printf("Can't set size for VL string\n");
+        HDprintf("Can't set size for VL string\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m1_tid, "vl_string", HOFFSET(cmpd_struct_1, str), str_id) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'vl_string'\n");
+        HDprintf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
     /* Create file compound datatype 1 */
     if((cmpd_f1_tid = H5Tcreate( H5T_COMPOUND, 8 + 1 + sizeof(hvl_t))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f1_tid,"c1",(size_t)0,H5T_STD_I64BE) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c1'\n");
+        HDprintf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f1_tid,"c2",(size_t)8,H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c2'\n");
+        HDprintf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f1_tid, "vl_string",(size_t)(8 + 1), str_id) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'vl_string'\n");
+        HDprintf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
     /* Create memory compound datatype 2 */
     if((cmpd_m2_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_2))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m2_tid,"c1",HOFFSET(struct cmpd_struct_2,c1),H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c1'\n");
+        HDprintf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m2_tid,"c2",HOFFSET(struct cmpd_struct_2,c2),H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c2'\n");
+        HDprintf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m2_tid, "vl_string", HOFFSET(cmpd_struct_2, str), str_id) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'vl_string'\n");
+        HDprintf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m2_tid,"l1",HOFFSET(struct cmpd_struct_2,l1),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l1'\n");
+        HDprintf("Can't insert field 'l1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m2_tid,"l2",HOFFSET(struct cmpd_struct_2,l2),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l2'\n");
+        HDprintf("Can't insert field 'l2'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m2_tid,"l3",HOFFSET(struct cmpd_struct_2,l3),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l3'\n");
+        HDprintf("Can't insert field 'l3'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m2_tid,"l4",HOFFSET(struct cmpd_struct_2,l4),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l4'\n");
+        HDprintf("Can't insert field 'l4'\n");
         goto error;
     } /* end if */
 
     /* Create file compound datatype 2 */
     if((cmpd_f2_tid = H5Tcreate( H5T_COMPOUND, 8 + 1 + sizeof(hvl_t) + 4*sizeof(long))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f2_tid,"c1",(size_t)0,H5T_STD_I64BE) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c1'\n");
+        HDprintf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f2_tid,"c2",(size_t)8,H5T_NATIVE_CHAR) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'c2'\n");
+        HDprintf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f2_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'vl_string'\n");
+        HDprintf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f2_tid,"l1",8 + 1 + sizeof(hvl_t),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l1'\n");
+        HDprintf("Can't insert field 'l1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f2_tid,"l2",8 + 1 + sizeof(hvl_t) + sizeof(long),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l2'\n");
+        HDprintf("Can't insert field 'l2'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f2_tid,"l3",8 + 1 + sizeof(hvl_t) + 2*sizeof(long),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l3'\n");
+        HDprintf("Can't insert field 'l3'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f2_tid,"l4",8 + 1 + sizeof(hvl_t) + 3*sizeof(long),H5T_NATIVE_LONG) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'l4'\n");
+        HDprintf("Can't insert field 'l4'\n");
         goto error;
     } /* end if */
 
     dim1[0] = 1;
     if((space_id = H5Screate_simple(1, dim1, NULL)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create space\n");
+        HDprintf("Can't create space\n");
         goto error;
     } /* end if */
 
     if((dset1_id = H5Dcreate2(file, "Dataset1", cmpd_f1_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create dataset\n");
+        HDprintf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if((dset2_id = H5Dcreate2(file, "Dataset2", cmpd_f2_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create dataset\n");
+        HDprintf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if(H5Dwrite(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) {
         H5_FAILED(); AT();
-        printf("Can't write data\n");
+        HDprintf("Can't write data\n");
         goto error;
     } /* end if */
 
     if(H5Dwrite(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) {
         H5_FAILED(); AT();
-        printf("Can't write data\n");
+        HDprintf("Can't write data\n");
         goto error;
     } /* end if */
 
     if(H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str)) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
 
     if(rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) ||
         rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || rdata2.l4 != wdata2.l4) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         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");
+        HDprintf("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");
+        HDprintf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata2.str = NULL;
@@ -2802,25 +2802,25 @@ test_compound_14(void)
 
     if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("cannot open file\n");
+        HDprintf("cannot open file\n");
         goto error;
     } /* end if */
 
     if((dset1_id = H5Dopen2(file, "Dataset1", H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("cannot open dataset\n");
+        HDprintf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if((dset2_id = H5Dopen2(file, "Dataset2", H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("cannot open dataset\n");
+        HDprintf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if((space_id = H5Dget_space(dset2_id)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't get space\n");
+        HDprintf("Can't get space\n");
         goto error;
     } /* end if */
 
@@ -2836,38 +2836,38 @@ test_compound_14(void)
 
     if(H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(rdata1.c1!=wdata1.c1 || rdata1.c2!=wdata1.c2 || strcmp(rdata1.str, wdata1.str)) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
 
     if(rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) ||
         rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || rdata2.l4 != wdata2.l4) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         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");
+        HDprintf("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");
+        HDprintf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata2.str = NULL;
@@ -2935,39 +2935,39 @@ test_compound_15(void)
     h5_fixname(FILENAME[3], H5P_DEFAULT, filename, sizeof filename);
     if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create file!\n");
+        HDprintf("Can't create file!\n");
         goto error;
     } /* end if */
 
     /* Create file compound datatype */
     if((cmpd_f_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f_tid,"i1",HOFFSET(struct cmpd_struct,i1),H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i1'\n");
+        HDprintf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_f_tid,"i2",HOFFSET(struct cmpd_struct,i2),H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i2'\n");
+        HDprintf("Can't insert field 'i2'\n");
         goto error;
     } /* end if */
 
     /* Create memory compound datatype */
     if((cmpd_m_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if(H5Tinsert(cmpd_m_tid,"i1",(size_t)0,H5T_NATIVE_INT) < 0) {
         H5_FAILED(); AT();
-        printf("Can't insert field 'i1'\n");
+        HDprintf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
@@ -2975,19 +2975,19 @@ test_compound_15(void)
     dim1[0] = 1;
     if((space_id = H5Screate_simple(1, dim1, NULL)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create space\n");
+        HDprintf("Can't create space\n");
         goto error;
     } /* end if */
 
     if((dset_id = H5Dcreate2(file, "Dataset", cmpd_f_tid, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED(); AT();
-        printf("Can't create dataset\n");
+        HDprintf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if(H5Dwrite(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) {
         H5_FAILED(); AT();
-        printf("Can't write data\n");
+        HDprintf("Can't write data\n");
         goto error;
     } /* end if */
 
@@ -2995,21 +2995,21 @@ test_compound_15(void)
      * element of wdata2 to be written. */
     if(H5Dwrite(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) {
         H5_FAILED(); AT();
-        printf("Can't write data\n");
+        HDprintf("Can't write data\n");
         goto error;
     } /* end if */
 
     /* Read data */
     if(H5Dread(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     /* Check for correctness of read data */
     if(rdata.i1 != wdata2[0] || rdata.i2 != wdata1.i2) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -3021,14 +3021,14 @@ test_compound_15(void)
     /* Read data */
     if(H5Dread(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     /* Check for correctness of read data */
     if(rdata.i1 != wdata2[0] || rdata.i2 != wdata2[1]) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -3116,7 +3116,7 @@ test_compound_16(void)
     /* Check behavior of H5Fget_obj_count */
     if((obj_count = H5Fget_obj_count(file, H5F_OBJ_DATATYPE)) != 1) {
         H5_FAILED(); AT();
-        printf("    H5Fget_obj_count returned: %zd; expected: 1\n", obj_count);
+        HDprintf("    H5Fget_obj_count returned: %zd; expected: 1\n", obj_count);
         goto error;
     }
 
@@ -3124,7 +3124,7 @@ test_compound_16(void)
     if(H5Fget_obj_ids(file, H5F_OBJ_DATATYPE, (size_t)2, open_dtypes) < 0) TEST_ERROR
     if(open_dtypes[1]) {
         H5_FAILED(); AT();
-        printf("    H5Fget_obj_ids returned as second id: %lld; expected: 0\n", (long long)open_dtypes[1]);
+        HDprintf("    H5Fget_obj_ids returned as second id: %lld; expected: 0\n", (long long)open_dtypes[1]);
         goto error;
     }
 
@@ -3195,7 +3195,7 @@ test_compound_17(void)
     if(H5Tpack(tmp_dt) < 0) TEST_ERROR
     if(2 != H5Tget_size(tmp_dt)) {
         H5_FAILED(); AT();
-        printf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
+        HDprintf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if(H5Tclose(tmp_dt) < 0) TEST_ERROR
@@ -3205,7 +3205,7 @@ test_compound_17(void)
     if(H5Tpack(tmp_dt) < 0) TEST_ERROR
     if(4 != H5Tget_size(tmp_dt)) {
         H5_FAILED(); AT();
-        printf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
+        HDprintf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if(H5Tclose(tmp_dt) < 0) TEST_ERROR
@@ -3239,7 +3239,7 @@ test_compound_17(void)
     if(H5Tpack(tmp_dt) < 0) TEST_ERROR
     if(2 != H5Tget_size(tmp_dt)) {
         H5_FAILED(); AT();
-        printf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
+        HDprintf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if(H5Tclose(tmp_dt) < 0) TEST_ERROR
@@ -3249,7 +3249,7 @@ test_compound_17(void)
     if(H5Tpack(tmp_dt) < 0) TEST_ERROR
     if(4 != H5Tget_size(tmp_dt)) {
         H5_FAILED(); AT();
-        printf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
+        HDprintf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if(H5Tclose(tmp_dt) < 0) TEST_ERROR
@@ -3437,107 +3437,107 @@ test_query(void)
     /* Create a compound datatype */
     if((tid1=H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) {
         H5_FAILED();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'a'\n");
+        HDprintf("Can't insert field 'a'\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'b'\n");
+        HDprintf("Can't insert field 'b'\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'c'\n");
+        HDprintf("Can't insert field 'c'\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'd'\n");
+        HDprintf("Can't insert field 'd'\n");
         goto error;
     } /* end if */
 
     /* Create a enumerate datatype */
     if((tid2=H5Tcreate(H5T_ENUM, sizeof(short))) < 0) {
         H5_FAILED();
-        printf("Can't create enumerate type\n");
+        HDprintf("Can't create enumerate type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "RED", (enum_val=10,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "GREEN", (enum_val=11,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "BLUE", (enum_val=12,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "ORANGE", (enum_val=13,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "YELLOW", (enum_val=14,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by name, for compound type. */
     if(H5Tget_nmembers(tid1)!=4) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(tid1, "c")!=2) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by member name, for enumeration type. */
     if(H5Tget_nmembers(tid2) != 5) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(tid2, "ORANGE") != 3) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Commit compound datatype and close it */
     if(H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        printf("Can't commit compound datatype\n");
+        HDprintf("Can't commit compound datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid1) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
 
     /* Commit enumeration datatype and close it */
     if(H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        printf("Can't commit compound datatype\n");
+        HDprintf("Can't commit compound datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid2) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
 
@@ -3550,48 +3550,48 @@ test_query(void)
     /* Query member number and member index by name, for compound type */
     if(H5Tget_nmembers(tid1) != 4) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(tid1, "c") != 2) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by member name, for enumeration type */
     if(H5Tget_nmembers(tid2)!=5) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(tid2, "ORANGE")!=3) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Query member value by member name, for enumeration type */
     if(H5Tenum_valueof (tid2, "ORANGE", &enum_val) < 0) {
         H5_FAILED();
-        printf("Can't get value for enumerate member\n");
+        HDprintf("Can't get value for enumerate member\n");
         goto error;
     } /* end if */
     if(enum_val!=13) {
         H5_FAILED();
-        printf("Incorrect value for enum member\n");
+        HDprintf("Incorrect value for enum member\n");
         goto error;
     } /* end if */
 
     /* Query member value by member index, for enumeration type */
     if(H5Tget_member_value (tid2, 2, &enum_val) < 0) {
         H5_FAILED();
-        printf("Can't get value for enum member\n");
+        HDprintf("Can't get value for enum member\n");
         goto error;
     } /* end if */
     if(enum_val!=12) {
         H5_FAILED();
-        printf("Incorrect value for enum member\n");
+        HDprintf("Incorrect value for enum member\n");
         goto error;
     } /* end if */
 
@@ -3599,30 +3599,30 @@ test_query(void)
     enum_val = 14;
     if(H5Tenum_nameof(tid2, &enum_val, enum_name, (size_t)16) < 0) {
         H5_FAILED();
-        printf("Can't get name for enum member\n");
+        HDprintf("Can't get name for enum member\n");
         goto error;
     } /* end if */
     if(strcmp("YELLOW", enum_name)) {
         H5_FAILED();
-        printf("Incorrect name for enum member\n");
+        HDprintf("Incorrect name for enum member\n");
         goto error;
     } /* end if */
 
     /* Close datatype and file */
     if(H5Tclose(tid1) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid2) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
 
     if(H5Fclose(file) < 0) {
         H5_FAILED();
-        printf("Can't close file\n");
+        HDprintf("Can't close file\n");
         goto error;
     } /* end if */
 
@@ -4408,8 +4408,8 @@ test_conv_str_2(void)
     } /* end for */
 
     /* Do the conversions */
-    sprintf(s, "Testing random string conversion speed");
-    printf("%-70s", s);
+    HDsprintf(s, "Testing random string conversion speed");
+    HDprintf("%-70s", s);
     HDfflush(stdout);
     if(H5Tconvert(c_type, f_type, nelmts, buf, NULL, H5P_DEFAULT) < 0)
         goto error;
@@ -4599,14 +4599,14 @@ test_conv_enum_1(void)
         buf[u] = HDrand() % 26;
 
     /* Conversions */
-    sprintf(s, "Testing random enum conversion O(N)");
-    printf("%-70s", s);
+    HDsprintf(s, "Testing random enum conversion O(N)");
+    HDprintf("%-70s", s);
     HDfflush(stdout);
     if(H5Tconvert(t1, t2, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error;
     PASSED();
 
-    sprintf(s, "Testing random enum conversion O(N log N)");
-    printf("%-70s", s);
+    HDsprintf(s, "Testing random enum conversion O(N log N)");
+    HDprintf("%-70s", s);
     HDfflush(stdout);
     if(H5Tconvert(t2, t1, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error;
     PASSED();
@@ -4692,7 +4692,7 @@ test_conv_enum_2(void)
         if (data[i] != i%8) {
             if (!nerrors++) {
                 H5_FAILED();
-                printf("element %d is %d but should have been  %d\n",
+                HDprintf("element %d is %d but should have been  %d\n",
                        i, data[i], i%8);
             }
         }
@@ -4706,7 +4706,7 @@ test_conv_enum_2(void)
 
     /* Failure */
     if (nerrors) {
-        printf("total of %d conversion errors out of %d elements for enums\n",
+        HDprintf("total of %d conversion errors out of %d elements for enums\n",
                nerrors, NTESTELEM);
         return 1;
     }
@@ -4752,7 +4752,7 @@ test_conv_bitfield(void)
     if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (buf[0]!=0xAA || buf[1]!=0xAA || buf[2]!=0 || buf[3]!=0) {
 	H5_FAILED();
-	printf("    s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n",
+	HDprintf("    s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n",
 	       buf[3], buf[2], buf[1], buf[0]);
 	goto error;
     }
@@ -4771,7 +4771,7 @@ test_conv_bitfield(void)
     if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (buf[0]!=0 || buf[1]!=0xA8 || buf[2]!=0x2A || buf[3]!=0) {
 	H5_FAILED();
-	printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n",
+	HDprintf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n",
 	       buf[3], buf[2], buf[1], buf[0]);
 	goto error;
     }
@@ -4785,7 +4785,7 @@ test_conv_bitfield(void)
     if (H5Tconvert(st, dt, (size_t)1, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (buf[0]!=0xff || buf[1]!=0xAB || buf[2]!=0xEA || buf[3]!=0xff) {
 	H5_FAILED();
-	printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n",
+	HDprintf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n",
 	       buf[3], buf[2], buf[1], buf[0]);
 	goto error;
     }
@@ -4866,7 +4866,7 @@ test_bitfield_funcs(void)
     } H5E_END_TRY;
     if (size>0) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -4875,7 +4875,7 @@ test_bitfield_funcs(void)
     } H5E_END_TRY;
     if (inpad>-1) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -4884,7 +4884,7 @@ test_bitfield_funcs(void)
     } H5E_END_TRY;
     if (cset>-1) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -4893,7 +4893,7 @@ test_bitfield_funcs(void)
     } H5E_END_TRY;
     if (strpad>-1) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -4902,7 +4902,7 @@ test_bitfield_funcs(void)
     } H5E_END_TRY;
     if(ret>=0) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -4911,7 +4911,7 @@ test_bitfield_funcs(void)
     } H5E_END_TRY;
     if (tag) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -4920,7 +4920,7 @@ test_bitfield_funcs(void)
     } H5E_END_TRY;
     if (super>=0) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5053,7 +5053,7 @@ opaque_check(int tag_it)
     } H5E_END_TRY;
     if (status>=0) {
 	H5_FAILED();
-	printf("    opaque conversion should have failed but succeeded\n");
+	HDprintf("    opaque conversion should have failed but succeeded\n");
 	goto error;
     }
 
@@ -5065,7 +5065,7 @@ opaque_check(int tag_it)
     if (H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (saved+1 != num_opaque_conversions_g) {
 	H5_FAILED();
-	printf("    unexpected number of opaque conversions\n");
+	HDprintf("    unexpected number of opaque conversions\n");
 	goto error;
     }
 
@@ -5175,7 +5175,7 @@ opaque_funcs(void)
         ret=H5Tset_precision(type, (size_t)32);
     } H5E_END_TRY;
     if (ret>=0) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5183,7 +5183,7 @@ opaque_funcs(void)
         ret=H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE);
     } H5E_END_TRY;
     if (ret>=0) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5191,7 +5191,7 @@ opaque_funcs(void)
         size=H5Tget_ebias(type);
     } H5E_END_TRY;
     if (size>0) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5199,7 +5199,7 @@ opaque_funcs(void)
         inpad=H5Tget_inpad(type);
     } H5E_END_TRY;
     if (inpad>-1) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5207,7 +5207,7 @@ opaque_funcs(void)
         cset=H5Tget_cset(type);
     } H5E_END_TRY;
     if (cset>-1) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5215,7 +5215,7 @@ opaque_funcs(void)
         strpad=H5Tget_strpad(type);
     } H5E_END_TRY;
     if (strpad>-1) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5223,7 +5223,7 @@ opaque_funcs(void)
         ret=H5Tset_offset(type, (size_t)16);
     } H5E_END_TRY;
     if (ret>=0) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5231,7 +5231,7 @@ opaque_funcs(void)
         sign = H5Tget_sign(type);
     } H5E_END_TRY;
     if (sign>-1) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5239,7 +5239,7 @@ opaque_funcs(void)
         super = H5Tget_super(type);
     } H5E_END_TRY;
     if (super>=0) {
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         TEST_ERROR
     } /* end if */
 
@@ -5310,71 +5310,71 @@ test_encode(void)
     /* Create a compound datatype */
     if((tid1=H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) {
         H5_FAILED();
-        printf("Can't create datatype!\n");
+        HDprintf("Can't create datatype!\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'a'\n");
+        HDprintf("Can't insert field 'a'\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'b'\n");
+        HDprintf("Can't insert field 'b'\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'c'\n");
+        HDprintf("Can't insert field 'c'\n");
         goto error;
     } /* end if */
     if(H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) {
         H5_FAILED();
-        printf("Can't insert field 'd'\n");
+        HDprintf("Can't insert field 'd'\n");
         goto error;
     } /* end if */
 
     /* Create a enumerate datatype */
     if((tid2=H5Tcreate(H5T_ENUM, sizeof(short))) < 0) {
         H5_FAILED();
-        printf("Can't create enumerate type\n");
+        HDprintf("Can't create enumerate type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "RED", (enum_val=0,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "GREEN", (enum_val=1,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "BLUE", (enum_val=2,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "ORANGE", (enum_val=3,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     if(H5Tenum_insert(tid2, "YELLOW", (enum_val=4,&enum_val)) < 0) {
         H5_FAILED();
-        printf("Can't insert field into enumeration type\n");
+        HDprintf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
 
     /* Create a variable-length string type */
     if((tid3 = H5Tcopy(H5T_C_S1)) < 0) {
         H5_FAILED();
-        printf("Can't copy a string type\n");
+        HDprintf("Can't copy a string type\n");
         goto error;
     } /* end if */
     if(H5Tset_size(tid3, H5T_VARIABLE) < 0) {
         H5_FAILED();
-        printf("Can't the string type to be variable-length\n");
+        HDprintf("Can't the string type to be variable-length\n");
         goto error;
     } /* end if */
 
@@ -5385,7 +5385,7 @@ test_encode(void)
     /* Encode compound type in a buffer */
     if(H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode compound type\n");
+        HDprintf("Can't encode compound type\n");
         goto error;
     } /* end if */
 
@@ -5398,13 +5398,13 @@ test_encode(void)
     } H5E_END_TRY;
     if(ret_id!=FAIL) {
         H5_FAILED();
-        printf("Decoded bogus buffer!\n");
+        HDprintf("Decoded bogus buffer!\n");
         goto error;
     }
 
     if(H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode compound type\n");
+        HDprintf("Can't encode compound type\n");
         goto error;
     } /* end if */
 
@@ -5415,19 +5415,19 @@ test_encode(void)
     /* Verify that the datatype was copied exactly */
     if(H5Tequal(decoded_tid1, tid1)<=0) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by name, for compound type. */
     if(H5Tget_nmembers(decoded_tid1)!=4) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(decoded_tid1, "c")!=2) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
@@ -5435,7 +5435,7 @@ test_encode(void)
     /* Encode enumerate type in a buffer */
     if(H5Tencode(tid2, NULL, &enum_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode enumerate type\n");
+        HDprintf("Can't encode enumerate type\n");
         goto error;
     } /* end if */
 
@@ -5444,33 +5444,33 @@ test_encode(void)
 
     if(H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode enumerate type\n");
+        HDprintf("Can't encode enumerate type\n");
         goto error;
     } /* end if */
 
     /* Decode from the enumerate buffer and return an object handle */
     if((decoded_tid2=H5Tdecode(enum_buf)) < 0) {
         H5_FAILED();
-        printf("Can't decode enumerate type\n");
+        HDprintf("Can't decode enumerate type\n");
         goto error;
     } /* end if */
 
     /* Verify that the datatype was copied exactly */
     if(H5Tequal(decoded_tid2, tid2)<=0) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by name, for enumeration type. */
     if(H5Tget_nmembers(decoded_tid2)!=5) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(decoded_tid2, "ORANGE") != 3) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
@@ -5478,7 +5478,7 @@ test_encode(void)
     /* Encode VL string type in a buffer */
     if(H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode VL string type\n");
+        HDprintf("Can't encode VL string type\n");
         goto error;
     } /* end if */
 
@@ -5487,26 +5487,26 @@ test_encode(void)
 
     if(H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode VL string type\n");
+        HDprintf("Can't encode VL string type\n");
         goto error;
     } /* end if */
 
     /* Decode from the VL string buffer and return an object handle */
     if((decoded_tid3=H5Tdecode(vlstr_buf)) < 0) {
         H5_FAILED();
-        printf("Can't decode VL string type\n");
+        HDprintf("Can't decode VL string type\n");
         goto error;
     } /* end if */
 
     /* Verify that the datatype was copied exactly */
     if(H5Tequal(decoded_tid3, tid3)<=0) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
     if(!H5Tis_variable_str(decoded_tid3)) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
 
@@ -5517,17 +5517,17 @@ test_encode(void)
     /* Commit compound datatype and close it */
     if(H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        printf("Can't commit compound datatype\n");
+        HDprintf("Can't commit compound datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid1) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(decoded_tid1) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     HDfree(cmpd_buf);
@@ -5536,17 +5536,17 @@ test_encode(void)
     /* Commit enumeration datatype and close it */
     if(H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        printf("Can't commit compound datatype\n");
+        HDprintf("Can't commit compound datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid2) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(decoded_tid2) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     HDfree(enum_buf);
@@ -5555,17 +5555,17 @@ test_encode(void)
     /* Commit enumeration datatype and close it */
     if(H5Tcommit2(file, vlstr_type, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        printf("Can't commit vl string datatype\n");
+        HDprintf("Can't commit vl string datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid3) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(decoded_tid3) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     HDfree(vlstr_buf);
@@ -5586,7 +5586,7 @@ test_encode(void)
     /* Encode compound type in a buffer */
     if(H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode compound type\n");
+        HDprintf("Can't encode compound type\n");
         goto error;
     } /* end if */
 
@@ -5595,7 +5595,7 @@ test_encode(void)
 
     if(H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode compound type\n");
+        HDprintf("Can't encode compound type\n");
         goto error;
     } /* end if */
 
@@ -5606,26 +5606,26 @@ test_encode(void)
     /* Verify that the datatype was copied exactly */
     if(H5Tequal(decoded_tid1, tid1)<=0) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by name, for compound type. */
     if(H5Tget_nmembers(decoded_tid1)!=4) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(decoded_tid1, "c")!=2) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Encode enumerate type in a buffer */
     if(H5Tencode(tid2, NULL, &enum_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode enumerate type\n");
+        HDprintf("Can't encode enumerate type\n");
         goto error;
     } /* end if */
 
@@ -5634,40 +5634,40 @@ test_encode(void)
 
     if(H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode enumerate type\n");
+        HDprintf("Can't encode enumerate type\n");
         goto error;
     } /* end if */
 
     /* Decode from the enumerate buffer and return an object handle */
     if((decoded_tid2=H5Tdecode(enum_buf)) < 0) {
         H5_FAILED();
-        printf("Can't decode enumerate type\n");
+        HDprintf("Can't decode enumerate type\n");
         goto error;
     } /* end if */
 
     /* Verify that the datatype was copied exactly */
     if(H5Tequal(decoded_tid2, tid2)<=0) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by name, for enumeration type. */
     if(H5Tget_nmembers(decoded_tid2)!=5) {
         H5_FAILED();
-        printf("Can't get member number\n");
+        HDprintf("Can't get member number\n");
         goto error;
     } /* end if */
     if(H5Tget_member_index(decoded_tid2, "ORANGE")!=3) {
         H5_FAILED();
-        printf("Can't get correct index number\n");
+        HDprintf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Encode VL string type in a buffer */
     if(H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode VL string type\n");
+        HDprintf("Can't encode VL string type\n");
         goto error;
     } /* end if */
 
@@ -5676,14 +5676,14 @@ test_encode(void)
 
     if(H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        printf("Can't encode VL string type\n");
+        HDprintf("Can't encode VL string type\n");
         goto error;
     } /* end if */
 
     /* Decode from the VL string buffer and return an object handle */
     if((decoded_tid3=H5Tdecode(vlstr_buf)) < 0) {
         H5_FAILED();
-        printf("Can't decode VL string type\n");
+        HDprintf("Can't decode VL string type\n");
         goto error;
     } /* end if */
     HDfree(vlstr_buf);
@@ -5691,12 +5691,12 @@ test_encode(void)
     /* Verify that the datatype was copied exactly */
     if(H5Tequal(decoded_tid3, tid3)<=0) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
     if(!H5Tis_variable_str(decoded_tid3)) {
         H5_FAILED();
-        printf("Datatype wasn't encoded & decoded identically\n");
+        HDprintf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     } /* end if */
 
@@ -5708,19 +5708,19 @@ test_encode(void)
     /* Make sure the reference counts for the decoded datatypes are one. */
     if(H5Iget_ref(decoded_tid1) != 1) { 
         H5_FAILED();
-        printf("Decoded datatype has incorrect reference count\n");
+        HDprintf("Decoded datatype has incorrect reference count\n");
         goto error;
     } /* end if */
 
     if(H5Iget_ref(decoded_tid2) != 1) { 
         H5_FAILED();
-        printf("Decoded datatype has incorrect reference count\n");
+        HDprintf("Decoded datatype has incorrect reference count\n");
         goto error;
     } /* end if */
 
     if(H5Iget_ref(decoded_tid3) != 1) { 
         H5_FAILED();
-        printf("Decoded datatype has incorrect reference count\n");
+        HDprintf("Decoded datatype has incorrect reference count\n");
         goto error;
     } /* end if */
 
@@ -5728,19 +5728,19 @@ test_encode(void)
      * decremented and the datatypes are closed. */
     if(H5Idec_ref(decoded_tid1) != 0) { 
         H5_FAILED();
-        printf("Decoded datatype can't close\n");
+        HDprintf("Decoded datatype can't close\n");
         goto error;
     } /* end if */
 
     if(H5Idec_ref(decoded_tid2) != 0) { 
         H5_FAILED();
-        printf("Decoded datatype can't close\n");
+        HDprintf("Decoded datatype can't close\n");
         goto error;
     } /* end if */
 
     if(H5Idec_ref(decoded_tid3) != 0) { 
         H5_FAILED();
-        printf("Decoded datatype can't close\n");
+        HDprintf("Decoded datatype can't close\n");
         goto error;
     } /* end if */
 
@@ -5750,7 +5750,7 @@ test_encode(void)
     } H5E_END_TRY;
     if(ret!=FAIL) {
         H5_FAILED();
-        printf("Decoded datatype should have been closed\n");
+        HDprintf("Decoded datatype should have been closed\n");
         goto error;
     }
 
@@ -5759,7 +5759,7 @@ test_encode(void)
     } H5E_END_TRY;
     if(ret!=FAIL) {
         H5_FAILED();
-        printf("Decoded datatype should have been closed\n");
+        HDprintf("Decoded datatype should have been closed\n");
         goto error;
     }
 
@@ -5768,7 +5768,7 @@ test_encode(void)
     } H5E_END_TRY;
     if(ret!=FAIL) {
         H5_FAILED();
-        printf("Decoded datatype should have been closed\n");
+        HDprintf("Decoded datatype should have been closed\n");
         goto error;
     }
 
@@ -5779,23 +5779,23 @@ test_encode(void)
     /* Close datatype and file */
     if(H5Tclose(tid1) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid2) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
     if(H5Tclose(tid3) < 0) {
         H5_FAILED();
-        printf("Can't close datatype\n");
+        HDprintf("Can't close datatype\n");
         goto error;
     } /* end if */
 
     if(H5Fclose(file) < 0) {
         H5_FAILED();
-        printf("Can't close file\n");
+        HDprintf("Can't close file\n");
         goto error;
     } /* end if */
 
@@ -7549,7 +7549,7 @@ main(void)
     fapl = h5_fileaccess();
 
     if(ALIGNMENT)
-	printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
+	HDprintf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
 
     /* Do the tests */
     nerrors += test_classes();
@@ -7604,12 +7604,12 @@ main(void)
     nerrors += test_utf_ascii_conv();
 
     if(nerrors) {
-        printf("***** %lu FAILURE%s! *****\n",
+        HDprintf("***** %lu FAILURE%s! *****\n",
                nerrors, 1==nerrors?"":"S");
         HDexit(EXIT_FAILURE);
     }
 
-    printf("All datatype tests passed.\n");
+    HDprintf("All datatype tests passed.\n");
 
     return 0;
 }
diff --git a/test/enum.c b/test/enum.c
index 588e9b3..26e64fd 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -166,7 +166,7 @@ test_conv(hid_t file)
     for(i = 0; i < (size_t)ds_size[0]; i++)
 	if(data1[i] != data2[i]) {
 	    H5_FAILED();
-	    printf("    1. data1[%lu]=%d, data2[%lu]=%d (should be same)\n",
+	    HDprintf("    1. data1[%lu]=%d, data2[%lu]=%d (should be same)\n",
 		   (unsigned long)i, (int)(data1[i]),
 		   (unsigned long)i, (int)(data2[i]));
 	    goto error;
@@ -178,7 +178,7 @@ test_conv(hid_t file)
     for(i = 0; i < (size_t)ds_size[0]; i++)
 	if((short)data1[i] != data_short[i]) {
 	    H5_FAILED();
-	    printf("    2. data1[%lu]=%d, data_short[%lu]=%d (should be same)\n",
+	    HDprintf("    2. data1[%lu]=%d, data_short[%lu]=%d (should be same)\n",
 		   (unsigned long)i, (int)(data1[i]),
 		   (unsigned long)i, (int)(data_short[i]));
 	    goto error;
@@ -190,7 +190,7 @@ test_conv(hid_t file)
     for(i = 0; i < (size_t)ds_size[0]; i++)
 	if((int)data1[i] != (int)data_double[i]) {
 	    H5_FAILED();
-	    printf("    3. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n",
+	    HDprintf("    3. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n",
 		   (unsigned long)i, (int)(data1[i]),
 		   (unsigned long)i, (int)(data_double[i]));
 	    goto error;
@@ -212,7 +212,7 @@ test_conv(hid_t file)
     for(i = 0; i < (size_t)ds_size[0]; i++)
 	if((int)data1[i] != data_int[i]) {
 	    H5_FAILED();
-	    printf("    4. data1[%lu]=%d, data_int[%lu]=%d (should be same)\n",
+	    HDprintf("    4. data1[%lu]=%d, data_int[%lu]=%d (should be same)\n",
 		   (unsigned long)i, (int)(data1[i]),
 		   (unsigned long)i, (int)(data_int[i]));
 	    goto error;
@@ -234,7 +234,7 @@ test_conv(hid_t file)
     for(i = 0; i < (size_t)ds_size[0]; i++)
 	if((int)data1[i] != (int)data_double[i]) {
 	    H5_FAILED();
-	    printf("    5. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n",
+	    HDprintf("    5. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n",
 		   (unsigned long)i, (int)(data1[i]),
 		   (unsigned long)i, (int)(data_double[i]));
 	    goto error;
@@ -318,7 +318,7 @@ test_tr1(hid_t file)
     for(i = 0; i < (size_t)ds_size[0]; i++)
         if(data1[i] != data2[i]) {
             H5_FAILED();
-            printf("    data1[%lu]=%d, data2[%lu]=%d (should be same)\n",
+            HDprintf("    data1[%lu]=%d, data2[%lu]=%d (should be same)\n",
                     (unsigned long)i, (int)(data1[i]),
                     (unsigned long)i, (int)(data2[i]));
             goto error;
@@ -400,7 +400,7 @@ test_tr2(hid_t file)
     for(i = 0; i < (size_t)ds_size[0]; i++)
         if(data1[i] != data2[i]) {
             H5_FAILED();
-            printf("    data1[%lu]=%d, data2[%lu]=%d (should be same)\n",
+            HDprintf("    data1[%lu]=%d, data2[%lu]=%d (should be same)\n",
                     (unsigned long)i, (int)(data1[i]),
                     (unsigned long)i, (int)(data2[i]));
             goto error;
@@ -559,7 +559,7 @@ test_funcs(void)
     } H5E_END_TRY;
     if (ret>=0) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -568,7 +568,7 @@ test_funcs(void)
     } H5E_END_TRY;
     if (size>0) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -577,7 +577,7 @@ test_funcs(void)
     } H5E_END_TRY;
     if (inpad>-1) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -586,7 +586,7 @@ test_funcs(void)
     } H5E_END_TRY;
     if (cset>-1) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -596,7 +596,7 @@ test_funcs(void)
     } H5E_END_TRY;
     if (ret>=0) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -605,7 +605,7 @@ test_funcs(void)
     } H5E_END_TRY;
     if (ret>=0) {
         H5_FAILED();
-        printf("Operation not allowed for this type.\n");
+        HDprintf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
diff --git a/test/err_compat.c b/test/err_compat.c
index ed85524..7e0bc4e 100644
--- a/test/err_compat.c
+++ b/test/err_compat.c
@@ -22,7 +22,7 @@
 #ifdef H5_NO_DEPRECATED_SYMBOLS
 int main(void)
 {
-    printf("Test skipped because backward compatibility with v1.6 is NOT configured in\n");
+    HDprintf("Test skipped because backward compatibility with v1.6 is NOT configured in\n");
     return 0;
 }
 #else /* H5_NO_DEPRECATED_SYMBOLS */
@@ -62,7 +62,7 @@ static herr_t
 user_print1(FILE *stream)
 {
     /* Customized way to print errors */
-    fprintf(stderr, "\n********* Print error stack in customized way *********\n");
+    HDfprintf(stderr, "\n********* Print error stack in customized way *********\n");
     if(H5Ewalk1(H5E_WALK_UPWARD, (H5E_walk1_t)custom_print_cb1, stream) < 0)
         TEST_ERROR;
 
@@ -92,7 +92,7 @@ static herr_t
 user_print2(hid_t err_stack, FILE *stream)
 {
     /* Customized way to print errors */
-    fprintf(stderr, "\n********* Print error stack in customized way *********\n");
+    HDfprintf(stderr, "\n********* Print error stack in customized way *********\n");
     if(H5Ewalk2(err_stack, H5E_WALK_UPWARD, (H5E_walk2_t)custom_print_cb2, stream) < 0)
         TEST_ERROR;
 
@@ -135,12 +135,12 @@ custom_print_cb1(int n, H5E_error1_t *err_desc, void* client_data)
     if(NULL == (maj = H5Eget_major(err_desc->maj_num)))
         TEST_ERROR;
 
-    fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n",
+    HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n",
         indent, "", n, err_desc->file_name,
         err_desc->func_name, err_desc->line);
 
-    fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
-    fprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
+    HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
+    HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
 
     H5free_memory(maj);
     H5free_memory(min);
@@ -188,12 +188,12 @@ custom_print_cb2(int n, H5E_error2_t *err_desc, void* client_data)
     if(NULL == (maj = H5Eget_major(err_desc->maj_num)))
         TEST_ERROR;
 
-    fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n",
+    HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n",
         indent, "", n, err_desc->file_name,
         err_desc->func_name, err_desc->line);
 
-    fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
-    fprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
+    HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
+    HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
 
     H5free_memory(maj);
     H5free_memory(min);
@@ -238,7 +238,7 @@ test_error1(void)
     herr_t              ret;
 
     TESTING("error API H5Eset/get_auto");
-    fprintf(stderr, "\n");
+    HDfprintf(stderr, "\n");
 
     /* Create the data space */
     dims[0] = DIM0;
@@ -367,7 +367,7 @@ test_error2(hid_t file)
     const char          *FUNC_test_error="test_error2";
 
     TESTING("error API based on data I/O");
-    fprintf(stderr, "\n");
+    HDfprintf(stderr, "\n");
 
     /* Create the data space */
     dims[0] = DIM0;
@@ -433,12 +433,12 @@ static herr_t
 dump_error(void)
 {
     /* Print errors in library default way */
-    fprintf(stderr, "********* Print error stack in HDF5 default way *********\n");
+    HDfprintf(stderr, "********* Print error stack in HDF5 default way *********\n");
     if(H5Eprint1(stderr) < 0)
         TEST_ERROR;
 
     /* Customized way to print errors */
-    fprintf(stderr, "\n********* Print error stack in customized way *********\n");
+    HDfprintf(stderr, "\n********* Print error stack in customized way *********\n");
     if(H5Ewalk1(H5E_WALK_UPWARD, custom_print_cb1, stderr) < 0)
         TEST_ERROR;
 
@@ -469,7 +469,7 @@ main(void)
     char        filename[1024];
     const char          *FUNC_main="main";
 
-    fprintf(stderr, "   This program tests the Error API compatible with HDF5 v1.6.  There are supposed to be some error messages\n");
+    HDfprintf(stderr, "   This program tests the Error API compatible with HDF5 v1.6.  There are supposed to be some error messages\n");
     fapl = h5_fileaccess();
 
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
@@ -500,11 +500,11 @@ main(void)
     if(H5Fclose(file) < 0) TEST_ERROR ;
     h5_clean_files(FILENAME, fapl);
 
-    printf("All error API tests passed.\n");
+    HDprintf("All error API tests passed.\n");
     return 0;
 
  error:
-    printf("***** ERROR TEST FAILED! *****\n");
+    HDprintf("***** ERROR TEST FAILED! *****\n");
     return 1;
 }
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/test/extend.c b/test/extend.c
index e5c3cb3..f8c091b 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -105,9 +105,9 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me
 	    for(k = 0; k < (NX / 2); k++)
 		for(m = 0; m < (NY / 2); m++)
 		    if(buf2[k][m] != buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]) {
-			printf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
-			printf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
-			printf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m, buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
+			HDprintf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
+			HDprintf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
+			HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m, buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
 			TEST_ERROR;
 		    } /* end if */
 	} /* end for */
@@ -195,9 +195,9 @@ write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, h
 	    for(k = 0; k < (NX / 2); k++)
 		for(m = 0; m < (NY / 2); m++)
 		    if(buf2[k][m] != buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]) {
-			printf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
-			printf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
-			printf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m, buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
+			HDprintf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
+			HDprintf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
+			HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m, buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
 			TEST_ERROR;
 		    } /* end if */
 	} /* end for */
@@ -289,17 +289,17 @@ main (void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     if(nerrors) {
-        printf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S");
+        HDprintf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S");
         exit(EXIT_FAILURE);
     } /* end if */
 
-    printf("All extend tests passed.\n");
+    HDprintf("All extend tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return 0;
 
 error:
-    printf("*** One or more extend tests failed ***\n");
+    HDprintf("*** One or more extend tests failed ***\n");
     return 1;
 }
 
diff --git a/test/external.c b/test/external.c
index ff33605..f0c772c 100644
--- a/test/external.c
+++ b/test/external.c
@@ -262,7 +262,7 @@ test_non_extendible(hid_t file)
     if(1 != n) {
         H5_FAILED();
         HDputs("    Returned external count is wrong.");
-        printf("   got: %d\n    ans: 1\n", n);
+        HDprintf("   got: %d\n    ans: 1\n", n);
         goto error;
     } /* end if */
 
@@ -274,7 +274,7 @@ test_non_extendible(hid_t file)
     if(file_offset != 0) {
         H5_FAILED();
         HDputs("    Wrong file offset.");
-        printf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
+        HDprintf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
         goto error;
     } /* end if */
 
@@ -282,7 +282,7 @@ test_non_extendible(hid_t file)
     if(file_size != (max_size[0] * sizeof(int))) {
         H5_FAILED();
         HDputs("    Wrong file size.");
-        printf("    got: %lu\n    ans: %lu\n", (unsigned long)file_size, (unsigned long)max_size[0]*sizeof(int));
+        HDprintf("    got: %lu\n    ans: %lu\n", (unsigned long)file_size, (unsigned long)max_size[0]*sizeof(int));
         goto error;
     } /* end if */
 
@@ -523,7 +523,7 @@ test_unlimited(hid_t file)
     if(1 != n) {
         H5_FAILED();
         HDputs("    Returned external count is wrong.");
-        printf("    got: %d\n    ans: 1\n", n);
+        HDprintf("    got: %d\n    ans: 1\n", n);
         goto error;
     } /* end if */
 
@@ -533,14 +533,14 @@ test_unlimited(hid_t file)
     if(file_offset != 0) {
         H5_FAILED();
         HDputs("    Wrong file offset.");
-        printf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
+        HDprintf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
         goto error;
     } /* end if */
 
     if(H5F_UNLIMITED != file_size) {
         H5_FAILED();
         HDputs("    Wrong file size.");
-        printf("    got: %lu\n    ans: INF\n", (unsigned long)file_size);
+        HDprintf("    got: %lu\n    ans: INF\n", (unsigned long)file_size);
         goto error;
     } /* end if */
 
diff --git a/test/fheap.c b/test/fheap.c
index b326248..bd9a5de 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -16147,7 +16147,7 @@ HDfprintf(stderr, "Uncomment tests!\n");
              */
 #ifndef QAK
             if(ExpressMode > 1)
-                printf("***Express test mode on.  test_man_start_5th_recursive_indirect is skipped\n");
+                HDprintf("***Express test mode on.  test_man_start_5th_recursive_indirect is skipped\n");
             else
                 nerrors += test_man_start_5th_recursive_indirect(fapl, &small_cparam, &tparam);
 #else /* QAK */
@@ -16210,7 +16210,7 @@ tparam.drain_half = FHEAP_DEL_DRAIN_ALL;
                     nerrors += test_man_remove_first_two_rows(fapl, &small_cparam, &tparam);
                     nerrors += test_man_remove_first_four_rows(fapl, &small_cparam, &tparam);
                     if(ExpressMode > 1)
-                        printf("***Express test mode on.  Some tests skipped\n");
+                        HDprintf("***Express test mode on.  Some tests skipped\n");
                     else {
                         nerrors += test_man_remove_all_root_direct(fapl, &small_cparam, &tparam);
                         nerrors += test_man_remove_2nd_indirect(fapl, &small_cparam, &tparam);
@@ -16244,7 +16244,7 @@ HDfprintf(stderr, "Uncomment tests!\n");
                     nerrors += test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
                     nerrors += test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
                     if(ExpressMode > 1)
-                        printf("***Express test mode on.  Some tests skipped\n");
+                        HDprintf("***Express test mode on.  Some tests skipped\n");
                     else {
                         nerrors += test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(fapl, &small_cparam, &tparam);
                         nerrors += test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
@@ -16394,7 +16394,7 @@ HDfprintf(stderr, "Uncomment tests!\n");
 #ifndef QAK
         /* Random object insertion & deletion */
         if(ExpressMode > 1)
-            printf("***Express test mode on.  Some tests skipped\n");
+            HDprintf("***Express test mode on.  Some tests skipped\n");
         else {
 #ifndef QAK
             /* Random tests using "small" heap creation parameters */
diff --git a/test/fillval.c b/test/fillval.c
index 5b95de9..dac0e09 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -542,8 +542,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(H5Pget_fill_value(dcpl, H5T_NATIVE_SHORT, &rd_s) < 0) goto error;
         if(rd_s != fill_s) {
 	   H5_FAILED();
-	   printf("    %d: Got a different fill value than what was set.",__LINE__);
-	   printf("    Got %d, set %d\n", rd_s, fill_s);
+	   HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+	   HDprintf("    Got %d, set %d\n", rd_s, fill_s);
 	   goto error;
         }
 #endif
@@ -557,8 +557,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0) goto error;
         if(rd_l!=fill_l) {
 	   H5_FAILED();
-	   printf("    %d: Got a different fill value than what was set.",__LINE__);
-	   printf("    Got %ld, set %ld\n", rd_l, fill_l);
+	   HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+	   HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
 	   goto error;
         }
 #endif
@@ -572,8 +572,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0) goto error;
         if(rd_l != fill_l) {
 	   H5_FAILED();
-	   printf("    %d: Got a different fill value than what was set.",__LINE__);
-	   printf("    Got %ld, set %ld\n", rd_l, fill_l);
+	   HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+	   HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
 	   goto error;
         }
 #endif
@@ -582,12 +582,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(alloc_time != H5D_ALLOC_TIME_LATE) {
             H5_FAILED();
             puts("    Got non-H5D_ALLOC_TIME_LATE space allocation time.");
-            printf("    Got %d\n", alloc_time);
+            HDprintf("    Got %d\n", alloc_time);
         }
         if(fill_time != H5D_FILL_TIME_ALLOC) {
             H5_FAILED();
             puts("    Got non-H5D_FILL_TIME_ALLOC fill value write time.");
-            printf("    Got %d\n", fill_time);
+            HDprintf("    Got %d\n", fill_time);
         }
         if(H5Dclose(dset3) < 0) goto error;
         if(H5Pclose(dcpl) < 0) goto error;
@@ -598,7 +598,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED) {
             H5_FAILED();
             puts("    Got allocated space instead of unallocated.");
-            printf("    Got %d\n", allocation);
+            HDprintf("    Got %d\n", allocation);
             goto error;
         }
         if((dcpl = H5Dget_create_plist(dset4)) < 0) goto error;
@@ -607,12 +607,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(alloc_time != H5D_ALLOC_TIME_LATE) {
 	   H5_FAILED();
 	   puts("    Got non-H5D_ALLOC_TIME_LATE space allocation time.");
-	   printf("    Got %d\n", alloc_time);
+	   HDprintf("    Got %d\n", alloc_time);
         }
         if(fill_time != H5D_FILL_TIME_NEVER) {
 	   H5_FAILED();
 	   puts("    Got non-H5D_FILL_TIME_NEVER fill value write time.");
-    	   printf("    Got %d\n", fill_time);
+    	   HDprintf("    Got %d\n", fill_time);
         }
         if(H5Dclose(dset4) < 0) goto error;
         if(H5Pclose(dcpl) < 0) goto error;
@@ -624,7 +624,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(!H5_FLT_ABS_EQUAL(rd_c.a, 0) || !H5_DBL_ABS_EQUAL(rd_c.y, fill_ctype.y) || rd_c.x != 0 || rd_c.z != '\0') {
            H5_FAILED();
            puts("    Got wrong fill value");
-           printf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
+           HDprintf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
                   (double)rd_c.a, rd_c.y, rd_c.x, rd_c.z);
         }
         if(H5Dclose(dset9) < 0) goto error;
@@ -639,21 +639,21 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if(H5Dget_space_status(dset5, &allocation) < 0) goto error;
     if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        printf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
-        printf("    Got %d\n", allocation);
+        HDprintf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
+        HDprintf("    Got %d\n", allocation);
         goto error;
     }
     if(H5Pget_alloc_time(dcpl, &alloc_time) < 0) goto error;
     if(alloc_time != H5D_ALLOC_TIME_EARLY) {
         H5_FAILED();
         puts("    Got non-H5D_ALLOC_TIME_EARLY space allocation time.");
-        printf("    Got %d\n", alloc_time);
+        HDprintf("    Got %d\n", alloc_time);
     }
     if(H5Pget_fill_time(dcpl, &fill_time) < 0) goto error;
     if(fill_time != H5D_FILL_TIME_NEVER) {
         H5_FAILED();
         puts("    Got non-H5D_FILL_TIME_NEVER fill value write time.");
-        printf("    Got %d\n", fill_time);
+        HDprintf("    Got %d\n", fill_time);
     }
     if(H5Dclose(dset5) < 0) goto error;
     if(H5Pclose(dcpl) < 0) goto error;
@@ -664,28 +664,28 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if(H5Dget_space_status(dset6, &allocation) < 0) goto error;
     if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        printf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
-        printf("    Got %d\n", allocation);
+        HDprintf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
+        HDprintf("    Got %d\n", allocation);
         goto error;
     }
     if(H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0) goto error;
     if(rd_l != fill_l) {
         H5_FAILED();
-	printf("    %d: Got a different fill value than what was set.",__LINE__);
-        printf("    Got %ld, set %ld\n", rd_l, fill_l);
+	HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+        HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
         goto error;
     }
     if(H5Pget_alloc_time(dcpl, &alloc_time) < 0) goto error;
     if(alloc_time != H5D_ALLOC_TIME_EARLY) {
         H5_FAILED();
         puts("    Got non-H5D_ALLOC_TIME_EARLY space allocation time.");
-        printf("    Got %d\n", alloc_time);
+        HDprintf("    Got %d\n", alloc_time);
     }
     if(H5Pget_fill_time(dcpl, &fill_time) < 0) goto error;
     if(fill_time != H5D_FILL_TIME_ALLOC) {
         H5_FAILED();
         puts("    Got non-H5D_FILL_TIME_ALLOC fill value write time.");
-        printf("    Got %d\n", fill_time);
+        HDprintf("    Got %d\n", fill_time);
     }
     if(H5Dclose(dset6) < 0) goto error;
     if(H5Pclose(dcpl) < 0) goto error;
@@ -697,7 +697,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if(!H5_FLT_ABS_EQUAL(rd_c.a, 0) || !H5_DBL_ABS_EQUAL(rd_c.y, fill_ctype.y) || rd_c.x != 0 || rd_c.z != '\0') {
         H5_FAILED();
         puts("    Got wrong fill value");
-        printf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
+        HDprintf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
 		(double)rd_c.a, rd_c.y, rd_c.x, rd_c.z);
     }
     if(H5Dclose(dset8) < 0) goto error;
@@ -926,8 +926,8 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
         goto error;
     if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        printf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
-        printf("    Got %d\n", allocation);
+        HDprintf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
+        HDprintf("    Got %d\n", allocation);
         goto error;
     }
     HDfree(buf);
@@ -954,7 +954,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                 if(val_rd!=should_be) {
                     H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
+                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
                            "should be: %u\n",
                            (long)hs_offset[0], (long)hs_offset[1],
                            (long)hs_offset[2], (long)hs_offset[3],
@@ -967,7 +967,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 	        if(val_rd!=should_be) {
 	            H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-	            printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
+	            HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
 		           "should be: %u\n",
 		           (long)hs_offset[0], (long)hs_offset[1],
 		           (long)hs_offset[2], (long)hs_offset[3],
@@ -998,7 +998,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 		    !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z)  {
                     H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
+                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
                            "should be: %f,%d,%f,%c\n",
                            (long)hs_offset[0], (long)hs_offset[1],
                            (long)hs_offset[2], (long)hs_offset[3],
@@ -1017,7 +1017,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 		    !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z)  {
                     H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
+                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
                            "should be: %f,%d,%f,%c\n",
                            (long)hs_offset[0], (long)hs_offset[1],
                            (long)hs_offset[2], (long)hs_offset[3],
@@ -1992,7 +1992,7 @@ test_compatible(void)
     TESTING("contiguous dataset compatibility with v. 1.4");
 
   if((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
-      printf("    Could not open file %s. Try set $srcdir to point at the "
+      HDprintf("    Could not open file %s. Try set $srcdir to point at the "
               "source directory of test\n", testfile);
       goto error;
   }
@@ -2002,8 +2002,8 @@ test_compatible(void)
   if(H5Pfill_value_defined(dcpl1, &status) < 0) goto error;
   if(status != H5D_FILL_VALUE_UNDEFINED) {
       H5_FAILED();
-      printf("    %d: Got a different fill value than what was set.",__LINE__);
-      printf("    Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n",
+      HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+      HDprintf("    Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n",
             (long)status);
       goto error;
   }
@@ -2012,7 +2012,7 @@ test_compatible(void)
   if(dims[0] != 8 || dims[1] != 8) {
       H5_FAILED();
       puts("    Got a different dimension size than what was set.");
-      printf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
+      HDprintf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
       goto error;
   }
   if((mspace = H5Screate_simple(2, one, NULL)) < 0) goto error;
@@ -2023,7 +2023,7 @@ test_compatible(void)
   if(val_rd != 0) {
       H5_FAILED();
       puts("    Got a different value than what was set.");
-      printf("    Got %ld, set 0\n", (long)val_rd);
+      HDprintf("    Got %ld, set 0\n", (long)val_rd);
       goto error;
   }
   if(H5Pclose(dcpl1) < 0) goto error;
@@ -2037,16 +2037,16 @@ test_compatible(void)
   if(H5Pfill_value_defined(dcpl2, &status) < 0) goto error;
   if(status != H5D_FILL_VALUE_USER_DEFINED) {
       H5_FAILED();
-      printf("    %d: Got a different fill value than what was set.",__LINE__);
-      printf("    Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n",
+      HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+      HDprintf("    Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n",
             (long)status);
       goto error;
   }
   if(H5Pget_fill_value(dcpl2, H5T_NATIVE_INT, &rd_fill) < 0) goto error;
   if(rd_fill != fill_val) {
       H5_FAILED();
-      printf("    %d: Got a different fill value than what was set.",__LINE__);
-      printf("    Got %ld, set %ld\n", (long)rd_fill, (long)fill_val);
+      HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+      HDprintf("    Got %ld, set %ld\n", (long)rd_fill, (long)fill_val);
       goto error;
   }
   fspace = -1;
@@ -2056,7 +2056,7 @@ test_compatible(void)
   if(dims[0] != 8 || dims[1] != 8) {
       H5_FAILED();
       puts("    Got a different dimension size than what was set.");
-      printf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
+      HDprintf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
       goto error;
   }
   if((mspace=H5Screate_simple(2, one, NULL)) < 0) goto error;
@@ -2067,7 +2067,7 @@ test_compatible(void)
   if(val_rd != fill_val) {
       H5_FAILED();
       puts("    Got a different value than what was set.");
-      printf("    Got %ld, set %ld\n", (long)val_rd, (long)fill_val);
+      HDprintf("    Got %ld, set %ld\n", (long)val_rd, (long)fill_val);
       goto error;
   }
   if(H5Pclose(dcpl2) < 0) goto error;
@@ -2185,7 +2185,7 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
                 (r_values[3] != fillval)) {
             H5_FAILED();
             HDfprintf(stdout, "%u: Allocated chunk value read was not correct.\n", (unsigned)__LINE__);
-            printf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
+            HDprintf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
                     (long)r_values[0], (long)r_values[1],
                     (long)r_values[2], (long)r_values[3],
                     (long)w_values[0], (long)fillval,
@@ -2199,7 +2199,7 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
                 (f_values[3] != fillval)) {
             H5_FAILED();
             HDfprintf(stdout, "%u: Unallocated chunk value read was not correct.\n", (unsigned)__LINE__);
-            printf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
+            HDprintf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
                     (long)f_values[0], (long)f_values[1],
                     (long)f_values[2], (long)f_values[3],
                     (long)fillval, (long)fillval,
@@ -2262,81 +2262,81 @@ test_partalloc(hid_t fapl, const char *base_name)
     /* I. Test H5D_ALLOC_TIME_LATE space allocation cases */
     if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "\nALLOC_TIME_LATE\n" );
+    HDfprintf( stdout, "\nALLOC_TIME_LATE\n" );
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_ALLOC\n" );
+    HDfprintf( stdout, "   FILL_TIME_ALLOC\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset1", H5D_FILL_TIME_ALLOC);
 	        
     /* case for H5D_FILL_TIME_NEVER as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_NEVER\n" );
+    HDfprintf( stdout, "   FILL_TIME_NEVER\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset2", H5D_FILL_TIME_NEVER );
 
     /* case for H5D_FILL_TIME_IFSET as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_IFSET\n" );
+    HDfprintf( stdout, "   FILL_TIME_IFSET\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset3", H5D_FILL_TIME_IFSET );
 
     /* II.  Test H5D_ALLOC_TIME_INCR space allocation cases */
     if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_INCR) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "\nALLOC_TIME_INCR\n" );
+    HDfprintf( stdout, "\nALLOC_TIME_INCR\n" );
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_ALLOC\n" );
+    HDfprintf( stdout, "   FILL_TIME_ALLOC\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset4", H5D_FILL_TIME_ALLOC );
 
     /* case for H5D_FILL_TIME_NEVER as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_NEVER\n" );
+    HDfprintf( stdout, "   FILL_TIME_NEVER\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset5", H5D_FILL_TIME_NEVER );
 
     /* case for H5D_FILL_TIME_IFSET as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_IFSET\n" );
+    HDfprintf( stdout, "   FILL_TIME_IFSET\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset6", H5D_FILL_TIME_IFSET );
 
     /* III.  Test H5D_ALLOC_TIME_EARLY space allocation cases */
     if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "\nALLOC_TIME_EARLY\n" );
+    HDfprintf( stdout, "\nALLOC_TIME_EARLY\n" );
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_ALLOC\n" );
+    HDfprintf( stdout, "   FILL_TIME_ALLOC\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset7", H5D_FILL_TIME_ALLOC );
 
     /* case for H5D_FILL_TIME_NEVER as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_NEVER\n" );
+    HDfprintf( stdout, "   FILL_TIME_NEVER\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset8", H5D_FILL_TIME_NEVER );
 
     /* case for H5D_FILL_TIME_IFSET as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_IFSET\n" );
+    HDfprintf( stdout, "   FILL_TIME_IFSET\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset9", H5D_FILL_TIME_IFSET );
 
diff --git a/test/filter_fail.c b/test/filter_fail.c
index d47705f..1d0d676 100644
--- a/test/filter_fail.c
+++ b/test/filter_fail.c
@@ -271,15 +271,15 @@ test_filter_read(char *file_name, hid_t my_fapl)
     for(i = 0; i < DIM; i++) {
         if(i < DIM-2 && rbuf[i] != i) {
             H5_FAILED();
-            printf("    Read different values than written.\n");
-            printf("    At index %d\n", i);
-            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            HDprintf("    Read different values than written.\n");
+            HDprintf("    At index %d\n", i);
+            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR
         } else if(i >= DIM-2 && rbuf[i] != 0) {
             H5_FAILED();
-            printf("    No value should be read.\n");
-            printf("    At index %d\n", i);
-            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            HDprintf("    No value should be read.\n");
+            HDprintf("    At index %d\n", i);
+            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR
         }
     }
@@ -311,15 +311,15 @@ test_filter_read(char *file_name, hid_t my_fapl)
     for(i = 0; i < DIM; i+=2) {
         if(i < DIM-2 && rbuf[i] != i) {
             H5_FAILED();
-            printf("    Read different values than written.\n");
-            printf("    At index %d\n", i);
-            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            HDprintf("    Read different values than written.\n");
+            HDprintf("    At index %d\n", i);
+            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR
         } else if(i >= DIM-2 && rbuf[i] != 0) {
             H5_FAILED();
-            printf("    No value should be read.\n");
-            printf("    At index %d\n", i);
-            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            HDprintf("    No value should be read.\n");
+            HDprintf("    At index %d\n", i);
+            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR
         }
     }
@@ -403,7 +403,7 @@ int main(void)
 
 error:
     if (nerrors) {
-        printf("***** %u FAILURE%s! *****\n",
+        HDprintf("***** %u FAILURE%s! *****\n",
                nerrors, 1==nerrors?"":"S");
         HDexit(EXIT_FAILURE);
     }
diff --git a/test/flush1.c b/test/flush1.c
index d910d14..1e759d0 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -75,7 +75,7 @@ create_file(char* name, hid_t fapl)
     /* Create some groups */
     if((groups = H5Gcreate2(file, "some_groups", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
     for(i = 0; i < 100; i++) {
-	sprintf(name, "grp%02u", (unsigned)i);
+	HDsprintf(name, "grp%02u", (unsigned)i);
 	if((grp = H5Gcreate2(groups, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 	if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
     } /* end for */
diff --git a/test/flush2.c b/test/flush2.c
index e80674c..ec0ba5b 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -73,9 +73,9 @@ check_dset(hid_t file, const char* name)
             error = fabs(the_data[i][j] - (double)(hssize_t)i / ((hssize_t)j + 1));
             if(error > 0.0001F) {
                 H5_FAILED();
-                printf("    dset[%lu][%lu] = %g\n",
+                HDprintf("    dset[%lu][%lu] = %g\n",
                     (unsigned long)i, (unsigned long)j, the_data[i][j]);
-                printf("    should be %g\n",
+                HDprintf("    should be %g\n",
                     (double)(hssize_t)i/(hssize_t)(j+1));
                 goto error;
             } /* end if */
@@ -88,7 +88,7 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  check_file
  *
@@ -116,9 +116,9 @@ check_file(char* filename, hid_t fapl, int flag)
     /* Open some groups */
     if((groups = H5Gopen2(file, "some_groups", H5P_DEFAULT)) < 0) goto error;
     for(i = 0; i < 100; i++) {
-  sprintf(name, "grp%02u", (unsigned)i);
-  if((grp = H5Gopen2(groups, name, H5P_DEFAULT)) < 0) goto error;
-  if(H5Gclose(grp) < 0) goto error;
+        HDsprintf(name, "grp%02u", (unsigned)i);
+        if((grp = H5Gopen2(groups, name, H5P_DEFAULT)) < 0) goto error;
+        if(H5Gclose(grp) < 0) goto error;
     } /* end for */
 
     /* Check to see if that last added dataset in the third file is accessible
@@ -134,7 +134,7 @@ error:
     return 1;
 } /* end check_file() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  main
  *
diff --git a/test/h5test.c b/test/h5test.c
index e370c6d..6ed14d3 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -102,7 +102,6 @@ static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *suff
                               char *fullname, size_t size);
 
 
-
 /*-------------------------------------------------------------------------
  * Function:  h5_errors
  *
@@ -127,7 +126,7 @@ h5_errors(hid_t estack, void H5_ATTR_UNUSED *client_data)
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_clean_files
  *
@@ -156,7 +155,7 @@ h5_clean_files(const char *base_name[], hid_t fapl)
     return;
 } /* end h5_clean_files() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_delete_test_file
  *
@@ -233,7 +232,7 @@ h5_delete_test_file(const char *base_name, hid_t fapl)
 } /* end h5_delete_test_file() */
 #pragma GCC diagnostic pop
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_delete_all_test_files
  *
@@ -266,7 +265,7 @@ h5_delete_all_test_files(const char *base_name[], hid_t fapl)
     return;
 } /* end h5_delete_all_test_files() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_cleanup
  *
@@ -299,7 +298,7 @@ h5_cleanup(const char *base_name[], hid_t fapl)
     return retval;
 } /* end h5_cleanup() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_test_shutdown
  *
@@ -328,7 +327,7 @@ h5_test_shutdown(void)
     return;
 } /* end h5_test_shutdown() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_restore_err
  *
@@ -350,7 +349,7 @@ h5_restore_err(void)
     err_func = NULL;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_reset
  *
@@ -392,7 +391,7 @@ h5_reset(void)
      * Cause the library to emit some diagnostics early so they don't
      * interfere with other formatted output.
      */
-    sprintf(filename, "/tmp/h5emit-%05d.h5", HDgetpid());
+    HDsprintf(filename, "/tmp/h5emit-%05d.h5", HDgetpid());
     H5E_BEGIN_TRY {
         hid_t file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT,
                  H5P_DEFAULT);
@@ -405,7 +404,7 @@ h5_reset(void)
 #endif /* OLD_WAY */
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_test_init
  *
@@ -438,7 +437,7 @@ h5_test_init(void)
     return;
 } /* end h5_test_init() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname
  *
@@ -468,7 +467,6 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
 }
 
 
-
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname_no_suffix
  *
@@ -489,7 +487,32 @@ h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t s
 }
 
 
-
+/*-------------------------------------------------------------------------
+ * Function:  h5_fixname_printf
+ *
+ * Purpose:  Same as h5_fixname but returns a filename that can be passed
+ *    through a printf-style function once before being passed to the file
+ *    driver.  Basically, replaces all % characters used by the file
+ *    driver with %%.
+ *
+ * Return:  Success:  The FULLNAME pointer.
+ *
+ *    Failure:  NULL if BASENAME or FULLNAME is the null
+ *        pointer or if FULLNAME isn't large enough for
+ *        the result.
+ *
+ * Programmer:  Neil Fortner
+ *              Wednesday, July 15, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+char *
+h5_fixname_printf(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_real
  *
@@ -585,7 +608,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
             MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
             if (mpi_rank == 0)
-                printf("*** Hint ***\n"
+                HDprintf("*** Hint ***\n"
                        "You can use environment variable HDF5_PARAPREFIX to "
                        "run parallel test files in a\n"
                        "different directory or to add file type prefix. e.g.,\n"
@@ -701,7 +724,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
     return fullname;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_rmprefix
  *
@@ -732,13 +755,13 @@ h5_rmprefix(const char *filename)
     return(ret_ptr);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_fileaccess
  *
  * Purpose:     Returns a file access template which is the default template
- *              but with a file driver set according to the constant or
- *              environment variable HDF5_DRIVER
+ *              but with a file driver set
+ *              according to a constant or environment variable HDF5_DRIVER
  *
  * Return:      Success:    A file access property list
  *              Failure:    H5I_INVALID_HID
@@ -760,10 +783,6 @@ h5_fileaccess(void)
     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:
@@ -772,7 +791,7 @@ error:
     return H5I_INVALID_HID;
 } /* end h5_fileaccess() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_fileaccess_flags
  *
@@ -800,10 +819,6 @@ h5_fileaccess_flags(unsigned flags)
     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:
@@ -812,7 +827,7 @@ error:
     return H5I_INVALID_HID;
 } /* end h5_fileaccess_flags() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_get_vfd_fapl
  *
@@ -936,12 +951,7 @@ h5_get_vfd_fapl(hid_t fapl)
         if(H5Pset_fapl_direct(fapl, 1024, 4096, 8 * 4096) < 0)
             goto error;
 #endif
-    } else if(!HDstrcmp(tok, "latest")) {
-        /* use the latest format */
-        if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-            goto error;
-    }
-    else {
+    } else {
         /* Unknown driver */
         goto error;
     } /* end if */
@@ -955,69 +965,6 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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() */
-
-
-/*-------------------------------------------------------------------------
  * Function:  h5_no_hwconv
  *
  * Purpose:  Turn off hardware data type conversions.
@@ -1037,7 +984,7 @@ h5_no_hwconv(void)
     H5Tunregister(H5T_PERS_HARD, NULL, (hid_t)-1, (hid_t)-1, NULL);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_show_hostname
  *
@@ -1071,15 +1018,15 @@ h5_show_hostname(void)
 
         if(mpi_initialized && !mpi_finalized) {
             MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
-            printf("MPI-process %d.", mpi_rank);
+            HDprintf("MPI-process %d.", mpi_rank);
         }
         else
-            printf("thread 0.");
+            HDprintf("thread 0.");
     }
 #elif defined(H5_HAVE_THREADSAFE)
-    printf("thread %lu.", HDpthread_self_ulong());
+    HDprintf("thread %lu.", HDpthread_self_ulong());
 #else
-    printf("thread 0.");
+    HDprintf("thread 0.");
 #endif
 #ifdef H5_HAVE_WIN32_API
 
@@ -1105,18 +1052,18 @@ h5_show_hostname(void)
 #endif
 #ifdef H5_HAVE_GETHOSTNAME
     if (gethostname(hostname, (size_t)80) < 0)
-        printf(" gethostname failed\n");
+        HDprintf(" gethostname failed\n");
     else
-        printf(" hostname=%s\n", hostname);
+        HDprintf(" hostname=%s\n", hostname);
 #else
-    printf(" gethostname not supported\n");
+    HDprintf(" gethostname not supported\n");
 #endif
 #ifdef H5_HAVE_WIN32_API
     WSACleanup();
 #endif
 }
 
-
+
 #ifdef H5_HAVE_PARALLEL
 /*
  * Function:    h5_set_info_object
@@ -1215,7 +1162,7 @@ h5_set_info_object(void)
     return ret_value;
 }
 
-
+
 /*
  * Function:    h5_dump_info_object
  * Purpose:     Display content of an MPI Info object
@@ -1231,25 +1178,25 @@ h5_dump_info_object(MPI_Info info)
     int    flag;
     int    i, nkeys;
 
-    printf("Dumping MPI Info Object(%d) (up to %d bytes per item):\n", (int)info,
+    HDprintf("Dumping MPI Info Object(%d) (up to %d bytes per item):\n", (int)info,
   MPI_MAX_INFO_VAL);
     if (info==MPI_INFO_NULL){
-  printf("object is MPI_INFO_NULL\n");
+  HDprintf("object is MPI_INFO_NULL\n");
     }
     else {
   MPI_Info_get_nkeys(info, &nkeys);
-  printf("object has %d items\n", nkeys);
+  HDprintf("object has %d items\n", nkeys);
   for (i=0; i<nkeys; i++){
       MPI_Info_get_nthkey(info, i, key);
       MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag);
-      printf("%s=%s\n", key, value);
+      HDprintf("%s=%s\n", key, value);
   }
 
     }
 }
 #endif  /* H5_HAVE_PARALLEL */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_get_file_size
  *
@@ -1386,14 +1333,14 @@ print_func(const char *format, ...)
   int ret_value;
 
   HDva_start(arglist, format);
-  ret_value = vprintf(format, arglist);
+  ret_value = HDvprintf(format, arglist);
   HDva_end(arglist);
   return ret_value;
 }
 
 #ifdef H5_HAVE_FILTER_SZIP
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_szip_can_encode
  *
@@ -1592,7 +1539,7 @@ error:
     return -1;
 } /* end h5_make_local_copy() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_verify_cached_stabs_cb
  *
@@ -1615,7 +1562,7 @@ h5_verify_cached_stabs_cb(hid_t oid, const char H5_ATTR_UNUSED *name,
         return SUCCEED;
 } /* end h5_verify_cached_stabs_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_verify_cached_stabs
  *
@@ -1676,3 +1623,233 @@ error:
     return -1;
 }
 
+/*-------------------------------------------------------------------------
+ * Function:    h5_send_message
+ *
+ * Purpose:     Sends the specified signal.
+ *
+ *              In terms of this test framework, a signal consists of a file
+ *              on disk. Since there are multiple processes that need to
+ *              communicate with each other, they do so by writing and
+ *              reading signal files on disk, the names and contents of
+ *              which are used to inform a process about when it can
+ *              proceed and what it should do next.
+ *
+ *              This function writes a signal file. The first argument is
+ *              the name of the signal file, and the second and third
+ *              arguments are the contents of the first two lines of the
+ *              signal file. The last two arguments may be NULL.
+ *
+ * Return:      void
+ *
+ * Programmer:  Mike McGreevy
+ *              August 18, 2010
+ *
+ *-------------------------------------------------------------------------
+ */
+void
+h5_send_message(const char *send, const char *arg1, const char *arg2)
+{
+    FILE *signalfile = NULL;
+
+    /* Create signal file (which will send signal to some other process) */
+    signalfile = HDfopen(TMP_SIGNAL_FILE, "w+");
+
+    /* Write messages to signal file, if provided */
+    if(arg2 != NULL) {
+        HDassert(arg1);
+        HDfprintf(signalfile, "%s\n%s\n", arg1, arg2);
+    } /* end if */
+    else if(arg1 != NULL) {
+        HDassert(arg2 == NULL);
+        HDfprintf(signalfile, "%s\n", arg1);
+    } /* end if */
+    else {
+        HDassert(arg1 == NULL);
+        HDassert(arg2 == NULL);
+    }/* end else */
+
+    HDfclose(signalfile);
+
+    HDrename(TMP_SIGNAL_FILE, send);
+} /* h5_send_message() */
+
+/*-------------------------------------------------------------------------
+ * Function:    h5_wait_message
+ *
+ * Purpose:     Waits for the specified signal.
+ *
+ *              In terms of this test framework, a signal consists of a file
+ *              on disk. Since there are multiple processes that need to
+ *              communicate with each other, they do so by writing and
+ *              reading signal files on disk, the names and contents of
+ *              which are used to inform a process about when it can
+ *              proceed and what it should do next.
+ *
+ *              This function continuously attempts to read the specified
+ *              signal file from disk, and only continues once it has
+ *              successfully done so (i.e., only after another process has
+ *              called the "h5_send_message" function to write the signal file).
+ *              This functon will then immediately remove the file (i.e.,
+ *              to indicate that it has been received and can be reused),
+ *              and then exits, allowing the calling function to continue.
+ *
+ * Return:      void
+ *
+ * Programmer:  Mike McGreevy
+ *              August 18, 2010
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+h5_wait_message(const char *waitfor)
+{
+    FILE *returnfile;
+    time_t t0,t1;
+
+    /* Start timer. If this function runs for too long (i.e.,
+        expected signal is never received), it will
+        return failure */
+    HDtime(&t0);
+
+    /* Wait for return signal from some other process */
+    while ((returnfile = HDfopen(waitfor, "r")) == NULL) {
+
+        /* make note of current time. */
+        HDtime(&t1);
+
+        /* If we've been waiting for a signal for too long, then
+            it was likely never sent and we should fail rather
+            than loop infinitely */
+        if(HDdifftime(t1, t0) > MESSAGE_TIMEOUT) {
+            HDfprintf(stdout, "Error communicating between processes. Make sure test script is running.\n");
+            TEST_ERROR;
+        } /* end if */
+    } /* end while */
+
+    HDfclose(returnfile);
+    HDunlink(waitfor);
+
+    return SUCCEED;
+
+error:
+    return FAIL;
+} /* h5_wait_message() */
+
+/* Functions for the dummy VFD class (see below).
+ *
+ * Useful for testing things like ID handling where we shouldn't mess with the
+ * real VFDs.
+ */
+static H5FD_t *dummy_vfd_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static H5FD_t *dummy_vfd_open(const char H5_ATTR_UNUSED *name, unsigned H5_ATTR_UNUSED flags, hid_t H5_ATTR_UNUSED fapl_id, haddr_t H5_ATTR_UNUSED maxaddr) { return NULL; }
+
+static herr_t dummy_vfd_close(H5FD_t *_file);
+static herr_t dummy_vfd_close(H5FD_t H5_ATTR_UNUSED *_file) { return FAIL; }
+
+static haddr_t dummy_vfd_get_eoa(const H5FD_t *file, H5FD_mem_t type);
+static haddr_t dummy_vfd_get_eoa(const H5FD_t H5_ATTR_UNUSED *file, H5FD_mem_t H5_ATTR_UNUSED type) { return HADDR_UNDEF; }
+
+static herr_t dummy_vfd_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static herr_t dummy_vfd_set_eoa(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t H5_ATTR_UNUSED addr) { return FAIL; }
+
+static haddr_t dummy_vfd_get_eof(const H5FD_t *file, H5FD_mem_t type);
+static haddr_t dummy_vfd_get_eof(const H5FD_t H5_ATTR_UNUSED *file, H5FD_mem_t H5_ATTR_UNUSED type) { return HADDR_UNDEF; }
+
+static herr_t dummy_vfd_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size, void *buf);
+static herr_t dummy_vfd_read(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED fapl_id, haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, void H5_ATTR_UNUSED *buf) { return FAIL; }
+
+static herr_t dummy_vfd_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size, const void *buf);
+static herr_t dummy_vfd_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED fapl_id, haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, const void H5_ATTR_UNUSED *buf) { return FAIL; }
+
+/* Dummy VFD with the minimum parameters to make a VFD that can be registered */
+static const H5FD_class_t H5FD_dummy_g = {
+    "dummy",                    /* name         */
+    1,                          /* maxaddr      */
+    H5F_CLOSE_WEAK,             /* fc_degree    */
+    NULL,                       /* terminate    */
+    NULL,                       /* sb_size      */
+    NULL,                       /* sb_encode    */
+    NULL,                       /* sb_decode    */
+    0,                          /* fapl_size    */
+    NULL,                       /* fapl_get     */
+    NULL,                       /* fapl_copy    */
+    NULL,                       /* fapl_free    */
+    0,                          /* dxpl_size    */
+    NULL,                       /* dxpl_copy    */
+    NULL,                       /* dxpl_free    */
+    dummy_vfd_open,             /* open         */
+    dummy_vfd_close,            /* close        */
+    NULL,                       /* cmp          */
+    NULL,                       /* query        */
+    NULL,                       /* get_type_map */
+    NULL,                       /* alloc        */
+    NULL,                       /* free         */
+    dummy_vfd_get_eoa,          /* get_eoa      */
+    dummy_vfd_set_eoa,          /* set_eoa      */
+    dummy_vfd_get_eof,          /* get_eof      */
+    NULL,                       /* get_handle   */
+    dummy_vfd_read,             /* read         */
+    dummy_vfd_write,            /* write        */
+    NULL,                       /* flush        */
+    NULL,                       /* truncate     */
+    NULL,                       /* lock         */
+    NULL,                       /* unlock       */
+    H5FD_FLMAP_DICHOTOMY    /* fl_map       */
+};
+
+
+/*-------------------------------------------------------------------------
+ * Function:    h5_get_dummy_vfd_class()
+ *
+ * Purpose:     Returns a disposable, generally non-functional,
+ *              VFD class struct.
+ *
+ *              In some of the test code, we need a disposable VFD but
+ *              we don't want to mess with the real VFDs and we also
+ *              don't have access to the internals of the real VFDs (which
+ *              use static globals and functions) to easily duplicate
+ *              them (e.g.: for testing VFD ID handling).
+ *
+ *              This API call will return a pointer to a VFD class that
+ *              can be used to construct a test VFD using H5FDregister().
+ *
+ * Return:      Success:    A pointer to a VFD class struct
+ *              Failure:    NULL
+ *
+ *-------------------------------------------------------------------------
+ */
+H5FD_class_t *
+h5_get_dummy_vfd_class(void)
+{
+    H5FD_class_t *vfd_class = NULL;     /* Dummy VFD that will be returned */
+
+    /* Create the class and initialize everything to zero/NULL */
+    if(NULL == (vfd_class = (H5FD_class_t *)HDmalloc(sizeof(H5FD_class_t))))
+        TEST_ERROR;
+
+    /* Copy the dummy VFD */
+    HDmemcpy(vfd_class, &H5FD_dummy_g, sizeof(H5FD_class_t));
+
+    return vfd_class;
+
+error:
+    if(vfd_class)
+        HDfree(vfd_class);
+    return NULL;
+} /* h5_get_dummy_vfd_class */
+
+/*-------------------------------------------------------------------------
+ * Function:    h5_get_version_string
+ *
+ * Purpose:     Get the string that corresponds to the libvery version bound.
+ *
+ * Return:      The string
+ *
+ *-------------------------------------------------------------------------
+ */
+char *
+h5_get_version_string(H5F_libver_t libver)
+{
+    return(LIBVER_NAMES[libver]);
+} /* end of h5_get_version_string */
diff --git a/test/h5test.h b/test/h5test.h
index a2606dd..9250630 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -78,7 +78,7 @@
 #define BEGINTEST  3  /* Skip all tests before this test */
 
 /*
- * This contains the filename prefix specificied as command line option for
+ * This contains the filename prefix specified as command line option for
  * the parallel test files.
  */
 H5TEST_DLLVAR char *paraprefix;
@@ -89,7 +89,7 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 /*
  * Print the current location on the standard output stream.
  */
-#define AT()     printf ("   at %s:%d in %s()...\n",        \
+#define AT()     HDprintf ("   at %s:%d in %s()...\n",        \
         __FILE__, __LINE__, FUNC);
 
 /*
@@ -101,18 +101,18 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
  * spaces.  If the h5_errors() is used for automatic error handling then
  * 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 %-60s",WHAT); fflush(stdout);}
-#define PASSED()  {puts(" PASSED");fflush(stdout);}
-#define H5_FAILED()  {puts("*FAILED*");fflush(stdout);}
-#define H5_WARNING()  {puts("*WARNING*");fflush(stdout);}
-#define SKIPPED()  {puts(" -SKIP-");fflush(stdout);}
-#define PUTS_ERROR(s)   {puts(s); AT(); goto error;}
+#define TESTING(WHAT)  {HDprintf("Testing %-62s",WHAT); HDfflush(stdout);}
+#define TESTING_2(WHAT)  {HDprintf("  Testing %-60s",WHAT); HDfflush(stdout);}
+#define PASSED()  {HDputs(" PASSED");HDfflush(stdout);}
+#define H5_FAILED()  {HDputs("*FAILED*");HDfflush(stdout);}
+#define H5_WARNING()  {HDputs("*WARNING*");HDfflush(stdout);}
+#define SKIPPED()  {HDputs(" -SKIP-");HDfflush(stdout);}
+#define PUTS_ERROR(s)   {HDputs(s); AT(); goto error;}
 #define TEST_ERROR      {H5_FAILED(); AT(); goto error;}
 #define STACK_ERROR     {H5Eprint2(H5E_DEFAULT, stdout); goto error;}
 #define FAIL_STACK_ERROR {H5_FAILED(); AT(); H5Eprint2(H5E_DEFAULT, stdout); \
     goto error;}
-#define FAIL_PUTS_ERROR(s) {H5_FAILED(); AT(); puts(s); goto error;}
+#define FAIL_PUTS_ERROR(s) {H5_FAILED(); AT(); HDputs(s); goto error;}
 
 /*
  * Alarm definitions to wait up (terminate) a test that runs too long.
@@ -123,7 +123,6 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 
 /* 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:
@@ -164,10 +163,11 @@ H5TEST_DLL h5_stat_size_t h5_get_file_size(const char *filename, hid_t fapl);
 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);
+H5TEST_DLL H5FD_class_t *h5_get_dummy_vfd_class(void);
+H5TEST_DLL char *h5_get_version_string(H5F_libver_t libver);
 
 /* 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);
@@ -206,8 +206,6 @@ H5TEST_DLL int  TestErrPrintf(const char *format, ...) H5_ATTR_FORMAT(printf, 1,
 H5TEST_DLL void SetTest(const char *testname, int action);
 H5TEST_DLL void TestAlarmOn(void);
 H5TEST_DLL void TestAlarmOff(void);
-H5TEST_DLL void PrintErrorStackOn(void);
-H5TEST_DLL void PrintErrorStackOff(void);
 
 #ifdef H5_HAVE_FILTER_SZIP
 H5TEST_DLL int h5_szip_can_encode(void);
@@ -222,6 +220,9 @@ H5TEST_DLL char* getenv_all(MPI_Comm comm, int root, const char* name);
 /* Extern global variables */
 H5TEST_DLLVAR int TestVerbosity;
 
+H5TEST_DLL void h5_send_message(const char *file, const char *arg1, const char *arg2);
+H5TEST_DLL herr_t h5_wait_message(const char *file);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/test/hyperslab.c b/test/hyperslab.c
index feb96bd..773d573 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -85,19 +85,19 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz)
 
     for(i = 0; i < nx; i++) {
     if(nz > 1)
-        printf("i=%lu:\n", (unsigned long)i);
+        HDprintf("i=%lu:\n", (unsigned long)i);
     else
-        printf("%03lu:", (unsigned long)i);
+        HDprintf("%03lu:", (unsigned long)i);
 
     for(j = 0; j < ny; j++) {
         if(nz > 1)
-        printf("%03lu:", (unsigned long)j);
+        HDprintf("%03lu:", (unsigned long)j);
         for(k = 0; k < nz; k++)
-        printf(" %3d", *array++);
+        HDprintf(" %3d", *array++);
         if(nz > 1)
-        printf("\n");
+        HDprintf("\n");
     } /* end for */
-    printf("\n");
+    HDprintf("\n");
     } /* end for */
 } /* end print_array() */
 
@@ -122,7 +122,7 @@ print_ref(size_t nx, size_t ny, size_t nz)
     uint8_t *array;
 
     if(NULL != (array = (uint8_t *)HDmalloc(nx * ny * nz))) {
-        printf("Reference array:\n");
+        HDprintf("Reference array:\n");
         init_full(array, nx, ny, nz);
         print_array(array, nx, ny, nz);
         HDfree(array);
@@ -168,21 +168,21 @@ test_fill(size_t nx, size_t ny, size_t nz,
         if(0 == ny) {
             ndims = 1;
             ny = nz = 1;
-            sprintf(dim, "%lu", (unsigned long) nx);
+            HDsprintf(dim, "%lu", (unsigned long) nx);
         } /* end if */
         else {
             ndims = 2;
             nz = 1;
-            sprintf(dim, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
+            HDsprintf(dim, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
         } /* end else */
     } /* end if */
     else {
         ndims = 3;
-        sprintf(dim, "%lux%lux%lu", (unsigned long) nx, (unsigned long) ny,
+        HDsprintf(dim, "%lux%lux%lu", (unsigned long) nx, (unsigned long) ny,
                 (unsigned long) nz);
     } /* end else */
-    sprintf(s, "Testing hyperslab fill %-11s variable hyperslab", dim);
-    printf("%-70s", s);
+    HDsprintf(s, "Testing hyperslab fill %-11s variable hyperslab", dim);
+    HDprintf("%-70s", s);
     fflush(stdout);
 
     /* Allocate array */
@@ -242,8 +242,8 @@ test_fill(size_t nx, size_t ny, size_t nz,
                                          * is going directly to a terminal.
                                          */
                                         AT();
-                                        printf("   acc != ref_value\n");
-                                        printf("   i=%lu, j=%lu, k=%lu, "
+                                        HDprintf("   acc != ref_value\n");
+                                        HDprintf("   i=%lu, j=%lu, k=%lu, "
                                             "dx=%lu, dy=%lu, dz=%lu, "
                                             "fill=%d\n", (unsigned long)i,
                                                 (unsigned long)j,
@@ -252,7 +252,7 @@ test_fill(size_t nx, size_t ny, size_t nz,
                                                 (unsigned long)dy,
                                                 (unsigned long)dz, fill_value);
                                         print_ref(nx, ny, nz);
-                                        printf("\n   Result is:\n");
+                                        HDprintf("\n   Result is:\n");
                                         print_array(dst, nx, ny, nz);
                                     } /* end if */
                                     goto error;
@@ -332,17 +332,17 @@ test_copy(int mode,
         if(0 == ny) {
             ndims = 1;
             ny = nz = 1;
-            sprintf(dim, "%lu", (unsigned long) nx);
+            HDsprintf(dim, "%lu", (unsigned long) nx);
         } /* end if */
         else {
             ndims = 2;
             nz = 1;
-            sprintf(dim, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
+            HDsprintf(dim, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
         } /* end else */
     } /* end if */
     else {
         ndims = 3;
-        sprintf(dim, "%lux%lux%lu", (unsigned long) nx, (unsigned long) ny,
+        HDsprintf(dim, "%lux%lux%lu", (unsigned long) nx, (unsigned long) ny,
                 (unsigned long) nz);
     } /* end else */
 
@@ -376,8 +376,8 @@ test_copy(int mode,
             HDabort();
     } /* end switch */
 
-    sprintf(s, "Testing hyperslab copy %-11s %s", dim, sub);
-    printf("%-70s", s);
+    HDsprintf(s, "Testing hyperslab copy %-11s %s", dim, sub);
+    HDprintf("%-70s", s);
     fflush(stdout);
 
     /*
@@ -481,8 +481,8 @@ test_copy(int mode,
                                      * going directly to a terminal.
                                      */
                                     AT();
-                                    printf("   acc != ref_value\n");
-                                    printf("   i=%lu, j=%lu, k=%lu, "
+                                    HDprintf("   acc != ref_value\n");
+                                    HDprintf("   i=%lu, j=%lu, k=%lu, "
                                         "dx=%lu, dy=%lu, dz=%lu\n",
                                             (unsigned long)i,
                                             (unsigned long)j,
@@ -491,7 +491,7 @@ test_copy(int mode,
                                             (unsigned long)dy,
                                             (unsigned long)dz);
                                     print_ref(nx, ny, nz);
-                                    printf("\n     Destination array is:\n");
+                                    HDprintf("\n     Destination array is:\n");
                                     print_array(dst, nx, ny, nz);
                                 } /* end if */
                                 goto error;
@@ -522,9 +522,9 @@ test_copy(int mode,
                                      * going directly to a terminal.
                                      */
                                     AT();
-                                    printf("   acc != ref_value + nx*ny*nz - "
+                                    HDprintf("   acc != ref_value + nx*ny*nz - "
                                         "dx*dy*dz\n");
-                                    printf("   i=%lu, j=%lu, k=%lu, "
+                                    HDprintf("   i=%lu, j=%lu, k=%lu, "
                                         "dx=%lu, dy=%lu, dz=%lu\n",
                                             (unsigned long)i,
                                             (unsigned long)j,
@@ -533,7 +533,7 @@ test_copy(int mode,
                                             (unsigned long)dy,
                                             (unsigned long)dz);
                                     print_ref(nx, ny, nz);
-                                    printf("\n     Destination array is:\n");
+                                    HDprintf("\n     Destination array is:\n");
                                     print_array(dst, nx, ny, nz);
                                 } /* end if */
                                 goto error;
@@ -594,7 +594,7 @@ test_multifill(size_t nx)
     } fill, *src = NULL, *dst = NULL;
     hsize_t            i, j;
 
-    printf("%-70s", "Testing multi-byte fill value");
+    HDprintf("%-70s", "Testing multi-byte fill value");
     fflush(stdout);
 
     /* Initialize the source and destination */
@@ -639,28 +639,28 @@ test_multifill(size_t nx)
     s[0] = '\0';
     for(i = 0; i < nx; i++) {
         if(dst[i].left != 3333333)
-            sprintf(s, "bad dst[%lu].left", (unsigned long)i);
+            HDsprintf(s, "bad dst[%lu].left", (unsigned long)i);
         else if(!H5_DBL_ABS_EQUAL(dst[i].mid, fill.mid))
             /* Check if two DOUBLE values are equal.  If their difference
              * is smaller than the EPSILON value for double, they are
              * considered equal. See the definition in h5test.h.
              */
-            sprintf(s, "bad dst[%lu].mid", (unsigned long)i);
+            HDsprintf(s, "bad dst[%lu].mid", (unsigned long)i);
         else if(dst[i].right != 4444444)
-            sprintf(s, "bad dst[%lu].right", (unsigned long)i);
+            HDsprintf(s, "bad dst[%lu].right", (unsigned long)i);
         if(s[0]) {
             H5_FAILED()
             if(!HDisatty(1)) {
                 AT();
-                printf("   fill={%d,%g,%d}\n   ", fill.left, fill.mid,
+                HDprintf("   fill={%d,%g,%d}\n   ", fill.left, fill.mid,
                         fill.right);
                 for(j = 0; j < sizeof(fill); j++)
-                    printf(" %02x", ((uint8_t *)&fill)[j]);
-                printf("\n   dst[%lu]={%d,%g,%d}\n   ", (unsigned long)i,
+                    HDprintf(" %02x", ((uint8_t *)&fill)[j]);
+                HDprintf("\n   dst[%lu]={%d,%g,%d}\n   ", (unsigned long)i,
                         dst[i].left, dst[i].mid, dst[i].right);
                 for(j = 0; j < sizeof(dst[i]); j++)
-                    printf(" %02x", ((uint8_t *)(dst + i))[j]);
-                printf("\n");
+                    HDprintf(" %02x", ((uint8_t *)(dst + i))[j]);
+                HDprintf("\n");
             } /* end if */
             goto error;
         } /* end if */
@@ -709,7 +709,7 @@ test_endian(size_t nx)
     hsize_t        size[2];        /*size vector            */
     hsize_t        i, j;
 
-    printf("%-70s", "Testing endian conversion by stride");
+    HDprintf("%-70s", "Testing endian conversion by stride");
     fflush(stdout);
 
     /* Initialize arrays */
@@ -742,10 +742,10 @@ test_endian(size_t nx)
                      * to a terminal.
                      */
                     AT();
-                    printf("   i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
-                    printf("   Source array is:\n");
+                    HDprintf("   i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
+                    HDprintf("   Source array is:\n");
                     print_array(src, nx, (size_t)4, (size_t)1);
-                    printf("\n     Result is:\n");
+                    HDprintf("\n     Result is:\n");
                     print_array(dst, nx, (size_t)4, (size_t)1);
                 } /* end if */
                 goto error;
@@ -795,9 +795,9 @@ test_transpose(size_t nx, size_t ny)
     char    s[256];
     hsize_t    i, j;
 
-    sprintf(s, "Testing 2d transpose by stride %4lux%-lud", (unsigned long)nx,
+    HDsprintf(s, "Testing 2d transpose by stride %4lux%-lud", (unsigned long)nx,
             (unsigned long)ny);
-    printf("%-70s", s);
+    HDprintf("%-70s", s);
     fflush(stdout);
 
     /* Initialize */
@@ -833,20 +833,20 @@ test_transpose(size_t nx, size_t ny)
                 H5_FAILED()
                 if(!HDisatty(1)) {
                     AT();
-                    printf("   diff at i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
-                    printf("   Source is:\n");
+                    HDprintf("   diff at i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
+                    HDprintf("   Source is:\n");
                     for(i = 0; i < nx; i++) {
-                        printf("%3lu:", (unsigned long)i);
+                        HDprintf("%3lu:", (unsigned long)i);
                         for(j = 0; j < ny; j++)
-                            printf(" %6d", src[i * ny + j]);
-                        printf("\n");
+                            HDprintf(" %6d", src[i * ny + j]);
+                        HDprintf("\n");
                     } /* end for */
-                    printf("\n     Destination is:\n");
+                    HDprintf("\n     Destination is:\n");
                     for (i = 0; i < ny; i++) {
-                        printf("%3lu:", (unsigned long)i);
+                        HDprintf("%3lu:", (unsigned long)i);
                         for(j = 0; j < nx; j++)
-                            printf(" %6d", dst[i * nx + j]);
-                        printf("\n");
+                            HDprintf(" %6d", dst[i * nx + j]);
+                        HDprintf("\n");
                     } /* end for */
                 } /* end if */
                 goto error;
@@ -900,10 +900,10 @@ test_sub_super(size_t nx, size_t ny)
     hsize_t        i, j;
     char        s[256];
 
-    sprintf(s, "Testing image sampling %4lux%-4lu to %4lux%-4lu ",
+    HDsprintf(s, "Testing image sampling %4lux%-4lu to %4lux%-4lu ",
             (unsigned long)(2 * nx), (unsigned long)(2 * ny),
             (unsigned long)nx, (unsigned long)ny);
-    printf("%-70s", s);
+    HDprintf("%-70s", s);
     fflush(stdout);
 
     /* Initialize */
@@ -935,12 +935,12 @@ test_sub_super(size_t nx, size_t ny)
                 H5_FAILED()
                 if(!HDisatty(1)) {
                     AT();
-                    printf("   full[%lu][%lu] != half[%lu][%lu]\n",
+                    HDprintf("   full[%lu][%lu] != half[%lu][%lu]\n",
                             (unsigned long)i * 2, (unsigned long)j * 2,
                             (unsigned long)i, (unsigned long)j);
-                    printf("   full is:\n");
+                    HDprintf("   full is:\n");
                     print_array(full, 2 * nx, 2 * ny, (size_t)1);
-                    printf("\n     half is:\n");
+                    HDprintf("\n     half is:\n");
                     print_array(half, nx, ny, (size_t)1);
                 } /* end if */
                 goto error;
@@ -953,10 +953,10 @@ test_sub_super(size_t nx, size_t ny)
      * Test replicating pixels to produce an image twice as large in each
      * dimension.
      */
-    sprintf(s, "Testing image sampling %4lux%-4lu to %4lux%-4lu ",
+    HDsprintf(s, "Testing image sampling %4lux%-4lu to %4lux%-4lu ",
             (unsigned long)nx, (unsigned long)ny, (unsigned long)(2 * nx),
             (unsigned long)(2 * ny));
-    printf("%-70s", s);
+    HDprintf("%-70s", s);
     fflush(stdout);
 
     /* Setup stride */
@@ -982,19 +982,19 @@ test_sub_super(size_t nx, size_t ny)
     for(i = 0; i < nx; i++) {
         for(j = 0; j < ny; j++) {
             if(half[i * ny + j] != twice[4 * i * ny + 2 * j])
-                sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
+                HDsprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
                         (unsigned long)i, (unsigned long)j,
                         (unsigned long)i * 2, (unsigned long)j * 2);
             else if(half[i * ny + j] != twice[4 * i * ny + 2 * j + 1])
-                sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
+                HDsprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
                         (unsigned long)i, (unsigned long)j,
                         (unsigned long)i * 2, (unsigned long)j * 2 + 1);
             else if(half[i * ny + j] != twice[(2 * i + 1) * 2 * ny + 2 * j])
-                sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
+                HDsprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
                         (unsigned long)i, (unsigned long)j,
                         (unsigned long)i * 2 + 1, (unsigned long)j * 2);
             else if(half[i * ny + j] != twice[(2 * i + 1) * 2 * ny + 2 * j + 1])
-                sprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
+                HDsprintf(s, "half[%lu][%lu] != twice[%lu][%lu]",
                         (unsigned long)i, (unsigned long)j,
                         (unsigned long)i * 2 + 1, (unsigned long)j * 2 + 1);
             if(s[0]) {
@@ -1055,7 +1055,7 @@ test_array_fill(size_t lo, size_t hi)
     size_t    u, v, w;        /* Local index variables        */
     char    s[256];
 
-    sprintf(s, "array filling %4lu-%-4lu elements", (unsigned long)lo,(unsigned long)hi);
+    HDsprintf(s, "array filling %4lu-%-4lu elements", (unsigned long)lo,(unsigned long)hi);
     TESTING(s);
 
     /* Initialize */
@@ -1120,7 +1120,7 @@ test_array_offset_n_calc(size_t n, size_t x, size_t y, size_t z)
     hsize_t     new_coords[ARRAY_OFFSET_NDIMS];  /* X, Y & X coordinates of offset */
     char    s[256];
 
-    sprintf(s, "array offset %4lux%4lux%4lu elements", (unsigned long)z,(unsigned long)y,(unsigned long)x);
+    HDsprintf(s, "array offset %4lux%4lux%4lu elements", (unsigned long)z,(unsigned long)y,(unsigned long)x);
     TESTING(s);
 
     /* Initialize */
@@ -1212,18 +1212,18 @@ main(int argc, char *argv[])
             else if(!HDstrcmp(argv[i], "medium"))
                 size_of_test |= TEST_MEDIUM;
             else {
-                printf("unrecognized argument: %s\n", argv[i]);
+                HDprintf("unrecognized argument: %s\n", argv[i]);
                 HDexit(EXIT_FAILURE);
             } /* end else */
         } /* end for */
     } /* end else */
 
-    printf("Test sizes: ");
+    HDprintf("Test sizes: ");
     if(size_of_test & TEST_SMALL)
-        printf(" SMALL");
+        HDprintf(" SMALL");
     if(size_of_test & TEST_MEDIUM)
-        printf(" MEDIUM");
-    printf("\n");
+        HDprintf(" MEDIUM");
+    HDprintf("\n");
 
     /* Set the random # seed */
     HDsrandom((unsigned)HDtime(NULL));
@@ -1429,14 +1429,14 @@ main(int argc, char *argv[])
     /*--- END OF TESTS ---*/
 
     if(nerrors) {
-        printf("***** %d HYPERSLAB TEST%s FAILED! *****\n", nerrors, 1
+        HDprintf("***** %d HYPERSLAB TEST%s FAILED! *****\n", nerrors, 1
                 == nerrors ? "" : "S");
         if(HDisatty(1))
-            printf("(Redirect output to a pager or a file to see debug output)\n");
+            HDprintf("(Redirect output to a pager or a file to see debug output)\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
-    printf("All hyperslab tests passed.\n");
+    HDprintf("All hyperslab tests passed.\n");
 
 #ifdef H5_HAVE_THREADSAFE
     H5close();
diff --git a/test/istore.c b/test/istore.c
index e91a59b..f0ddda4 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -106,21 +106,21 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz)
 
     for (i = 0; i < nx; i++) {
     if (nz > 1) {
-        fprintf(stderr,"i=%lu:\n", (unsigned long)i);
+        HDfprintf(stderr,"i=%lu:\n", (unsigned long)i);
     } else {
-        fprintf(stderr,"%03lu:", (unsigned long)i);
+        HDfprintf(stderr,"%03lu:", (unsigned long)i);
     }
 
     for (j = 0; j < ny; j++) {
         if (nz > 1)
-        fprintf(stderr,"%03lu:", (unsigned long)j);
+        HDfprintf(stderr,"%03lu:", (unsigned long)j);
         for (k = 0; k < nz; k++) {
-        fprintf(stderr," %3d", *array++);
+        HDfprintf(stderr," %3d", *array++);
         }
         if (nz > 1)
-        fprintf(stderr,"\n");
+        HDfprintf(stderr,"\n");
     }
-    fprintf(stderr,"\n");
+    HDfprintf(stderr,"\n");
     }
 }
 
@@ -268,19 +268,19 @@ test_extend(hid_t f, const char *prefix,
     if (!ny) {
         ndims = 1;
         ny = nz = 1;
-        sprintf(dims, "%lu", (unsigned long) nx);
+        HDsprintf(dims, "%lu", (unsigned long) nx);
     } else {
         ndims = 2;
         nz = 1;
-        sprintf(dims, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
+        HDsprintf(dims, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
     }
     } else {
     ndims = 3;
-    sprintf(dims, "%lux%lux%lu",
+    HDsprintf(dims, "%lux%lux%lu",
         (unsigned long) nx, (unsigned long) ny, (unsigned long) nz);
     }
 
-    sprintf(s, "istore extend: %s", dims);
+    HDsprintf(s, "istore extend: %s", dims);
     TESTING(s);
     buf = (uint8_t *)HDmalloc(nx * ny * nz);
     check = (uint8_t *)HDmalloc(nx * ny * nz);
@@ -294,9 +294,9 @@ test_extend(hid_t f, const char *prefix,
     max_corner[2] = 0;
 
     /* Build the new empty object */
-    sprintf(name, "%s_%s", prefix, dims);
+    HDsprintf(name, "%s_%s", prefix, dims);
     if ((dataset=new_object(f, name, ndims, whole_size, whole_size)) < 0) {
-    fprintf(stderr,"    Cannot create %u-d object `%s'\n", ndims, name);
+    HDfprintf(stderr,"    Cannot create %u-d object `%s'\n", ndims, name);
     goto error;
     }
 
@@ -327,21 +327,21 @@ test_extend(hid_t f, const char *prefix,
 
 #if 0
     if (0 == ctr)
-        fprintf(stderr,"\n");
-    fprintf(stderr,"    Insert: ctr=%lu, corner=(%ld", (unsigned long)ctr, (long)offset[0]);
+        HDfprintf(stderr,"\n");
+    HDfprintf(stderr,"    Insert: ctr=%lu, corner=(%ld", (unsigned long)ctr, (long)offset[0]);
     if (ndims > 1)
-        fprintf(stderr,",%ld", (long)offset[1]);
+        HDfprintf(stderr,",%ld", (long)offset[1]);
     if (ndims > 2)
-        fprintf(stderr,",%ld", (long)offset[2]);
-    fprintf(stderr,"), size=(%lu", (unsigned long)size[0]);
+        HDfprintf(stderr,",%ld", (long)offset[2]);
+    HDfprintf(stderr,"), size=(%lu", (unsigned long)size[0]);
     if (ndims > 1)
-        fprintf(stderr,",%lu", (unsigned long)size[1]);
+        HDfprintf(stderr,",%lu", (unsigned long)size[1]);
     if (ndims > 2)
-        fprintf(stderr,",%lu", (unsigned long)size[2]);
-    fprintf(stderr,"), %lu element%s", (unsigned long)nelmts, 1 == nelmts ? "" : "s");
+        HDfprintf(stderr,",%lu", (unsigned long)size[2]);
+    HDfprintf(stderr,"), %lu element%s", (unsigned long)nelmts, 1 == nelmts ? "" : "s");
     if (0 == nelmts)
-        fprintf(stderr," *SKIPPED*");
-    fprintf(stderr,"\n");
+        HDfprintf(stderr," *SKIPPED*");
+    HDfprintf(stderr,"\n");
 #endif
 
     /* Fill the source array */
@@ -357,7 +357,7 @@ test_extend(hid_t f, const char *prefix,
     /* Write to disk */
     if (H5Dwrite(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, buf) < 0) {
         H5_FAILED();
-        fprintf(stderr,"    Write failed: ctr=%lu\n", (unsigned long)ctr);
+        HDfprintf(stderr,"    Write failed: ctr=%lu\n", (unsigned long)ctr);
         goto error;
     }
 
@@ -365,16 +365,16 @@ test_extend(hid_t f, const char *prefix,
     HDmemset(check, 0xff, (size_t)nelmts);
     if (H5Dread(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, check) < 0) {
         H5_FAILED();
-        fprintf(stderr,"    Read failed: ctr=%lu\n", (unsigned long)ctr);
+        HDfprintf(stderr,"    Read failed: ctr=%lu\n", (unsigned long)ctr);
         goto error;
     }
     if (HDmemcmp(buf, check, (size_t)nelmts)) {
         H5_FAILED();
-        fprintf(stderr,"    Read check failed: ctr=%lu\n", (unsigned long)ctr);
-        fprintf(stderr,"    Wrote:\n");
+        HDfprintf(stderr,"    Read check failed: ctr=%lu\n", (unsigned long)ctr);
+        HDfprintf(stderr,"    Wrote:\n");
         print_array(buf, (size_t)size[0], (size_t)size[1],
             (size_t)size[2]);
-        fprintf(stderr,"    Read:\n");
+        HDfprintf(stderr,"    Read:\n");
         print_array(check, (size_t)size[0], (size_t)size[1],
             (size_t)size[2]);
         goto error;
@@ -397,7 +397,7 @@ test_extend(hid_t f, const char *prefix,
     HDmemset(buf, 0xff, nx * ny * nz);
     if (H5Dread(dataset, TEST_DATATYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
     H5_FAILED();
-    fprintf(stderr,"    Read failed for whole array.\n");
+    HDfprintf(stderr,"    Read failed for whole array.\n");
     goto error;
     }
     for (i=0; i<nx; i++) {
@@ -405,16 +405,16 @@ test_extend(hid_t f, const char *prefix,
         for (k=0; k<nz; k++) {
         if (whole[i*ny*nz + j*nz + k] != buf[i*ny*nz + j*nz + k]) {
             H5_FAILED();
-            fprintf(stderr,"    Check failed at i=%lu", (unsigned long)i);
+            HDfprintf(stderr,"    Check failed at i=%lu", (unsigned long)i);
             if (ndims > 1) {
-            fprintf(stderr,", j=%lu", (unsigned long)j);
+            HDfprintf(stderr,", j=%lu", (unsigned long)j);
             }
             if (ndims > 2) {
-            fprintf(stderr,", k=%lu", (unsigned long)k);
+            HDfprintf(stderr,", k=%lu", (unsigned long)k);
             }
-            fprintf(stderr,"\n    Check array is:\n");
+            HDfprintf(stderr,"\n    Check array is:\n");
             print_array(whole, nx, ny, nz);
-            fprintf(stderr,"    Value read is:\n");
+            HDfprintf(stderr,"    Value read is:\n");
             print_array(buf, nx, ny, nz);
             goto error;
         }
@@ -481,19 +481,19 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks,
     if (!ny) {
         ndims = 1;
         ny = nz = 1;
-        sprintf(dims, "%lu", (unsigned long) nx);
+        HDsprintf(dims, "%lu", (unsigned long) nx);
     } else {
         ndims = 2;
         nz = 1;
-        sprintf(dims, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
+        HDsprintf(dims, "%lux%lu", (unsigned long) nx, (unsigned long) ny);
     }
     } else {
     ndims = 3;
-    sprintf(dims, "%lux%lux%lu",
+    HDsprintf(dims, "%lux%lux%lu",
         (unsigned long) nx, (unsigned long) ny, (unsigned long) nz);
     }
 
-    sprintf(s, "istore sparse: %s", dims);
+    HDsprintf(s, "istore sparse: %s", dims);
     TESTING(s);
     if(skip_test){
         SKIPPED()
@@ -512,9 +512,9 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks,
     size[2] = nz;
 
     /* Build the new empty object */
-    sprintf(name, "%s_%s", prefix, dims);
+    HDsprintf(name, "%s_%s", prefix, dims);
     if ((dataset=new_object(f, name, ndims, whole_size, chunk_dims)) < 0) {
-    printf("    Cannot create %u-d object `%s'\n", ndims, name);
+    HDprintf("    Cannot create %u-d object `%s'\n", ndims, name);
     goto error;
     }
 
@@ -535,18 +535,18 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks,
     /* write to disk */
     if (H5Dwrite(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, buf) < 0) {
         H5_FAILED();
-        printf("    Write failed: ctr=%lu\n", (unsigned long)ctr);
-        printf("    offset=(%lu", (unsigned long) (offset[0]));
+        HDprintf("    Write failed: ctr=%lu\n", (unsigned long)ctr);
+        HDprintf("    offset=(%lu", (unsigned long) (offset[0]));
         if (ndims > 1)
-        printf(",%lu", (unsigned long) (offset[1]));
+        HDprintf(",%lu", (unsigned long) (offset[1]));
         if (ndims > 2)
-        printf(",%lu", (unsigned long) (offset[2]));
-        printf("), size=(%lu", (unsigned long) (size[0]));
+        HDprintf(",%lu", (unsigned long) (offset[2]));
+        HDprintf("), size=(%lu", (unsigned long) (size[0]));
         if (ndims > 1)
-        printf(",%lu", (unsigned long) (size[1]));
+        HDprintf(",%lu", (unsigned long) (size[1]));
         if (ndims > 2)
-        printf(",%lu", (unsigned long) (size[2]));
-        printf(")\n");
+        HDprintf(",%lu", (unsigned long) (size[2]));
+        HDprintf(")\n");
         goto error;
     }
     total += nx * ny * nz;
@@ -617,21 +617,21 @@ main(int argc, char *argv[])
             } else if (!strcmp(argv[i], "large")) {
                 size_of_test |= TEST_LARGE;
             } else {
-                printf("unrecognized argument: %s\n", argv[i]);
+                HDprintf("unrecognized argument: %s\n", argv[i]);
 #if 0
                 exit(EXIT_FAILURE);
 #endif
             }
         }
     }
-    printf("Test sizes: ");
+    HDprintf("Test sizes: ");
     if (size_of_test & TEST_SMALL)
-        printf(" SMALL");
+        HDprintf(" SMALL");
     if (size_of_test & TEST_MEDIUM)
-        printf(" MEDIUM");
+        HDprintf(" MEDIUM");
     if (size_of_test & TEST_LARGE)
-        printf(" LARGE");
-    printf("\n");
+        HDprintf(" LARGE");
+    HDprintf("\n");
 
     /* Set the random # seed */
     HDsrandom((unsigned)HDtime(NULL));
@@ -653,7 +653,7 @@ main(int argc, char *argv[])
     /* Create the test file */
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
     if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
-        printf("Cannot create file %s; test aborted\n", filename);
+        HDprintf("Cannot create file %s; test aborted\n", filename);
         exit(EXIT_FAILURE);
     }
 
@@ -708,7 +708,7 @@ main(int argc, char *argv[])
          */
         status = test_sparse(file, "sparse", (size_t)800, (size_t)50, (size_t)50, (size_t)50, skip_test);
         if(skip_test)
-            printf("    The current VFD does not support sparse files on this platform.\n");
+            HDprintf("    The current VFD does not support sparse files on this platform.\n");
         nerrors += status < 0 ? 1 : 0;
     }
 
@@ -720,12 +720,12 @@ main(int argc, char *argv[])
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     if (nerrors) {
-        printf("***** %d I-STORE TEST%s FAILED! *****\n",
+        HDprintf("***** %d I-STORE TEST%s FAILED! *****\n",
                 nerrors, 1 == nerrors ? "" : "S");
         exit(EXIT_FAILURE);
     }
 
-    printf("All i-store tests passed.\n");
+    HDprintf("All i-store tests passed.\n");
 
     h5_cleanup(FILENAME, fapl);
 
diff --git a/test/lheap.c b/test/lheap.c
index d3e165e..b692947 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -89,7 +89,7 @@ main(void)
         goto error;
     }
     for(i = 0; i < NOBJS; i++) {
-        sprintf(buf, "%03d-", i);
+        HDsprintf(buf, "%03d-", i);
         for(j = 4; j < i; j++)
             buf[j] = (char)('0' + j % 10);
         if(j > 4)
@@ -124,7 +124,7 @@ main(void)
         goto error;
     }
     for(i = 0; i < NOBJS; i++) {
-        sprintf(buf, "%03d-", i);
+        HDsprintf(buf, "%03d-", i);
         for(j = 4; j < i; j++)
             buf[j] = (char)('0' + j % 10);
         if(j > 4)
diff --git a/test/links.c b/test/links.c
index 0188758..89e62ab 100644
--- a/test/links.c
+++ b/test/links.c
@@ -31,8 +31,8 @@
 /* File for external link test.  Created with gen_udlinks.c */
 #define LINKED_FILE  "be_extlink2.h5"
 
-#define TMPDIR          "tmp/"
-#define TMPDIR2         "tmp2/"
+#define TMPDIR          "tmp_links/"
+#define TMPDIR2         "tmp2_links/"
 
 /* Symlinks for external link symlink test */
 #define SYMLINK1  TMPDIR "sym1.h5"
@@ -98,7 +98,7 @@ const char *FILENAME[] = {
 #define CORE_INCREMENT  1024
 #define NUM40           40
 
-/* do not do check_all_closed() for "ext*" files and "tmp/ext*" */
+/* do not do check_all_closed() for "ext*" files and "tmp_links/ext*" */
 #define EXTSTOP         12
 
 #define LINK_BUF_SIZE   1024
@@ -2553,9 +2553,9 @@ error:
  *
  * Purpose:     1. target link: "extlinks2"
  *              2. main file: "extlinks0"
- *              3. target file: "tmp/extlinks2"
- *              4. Set up external link prefix via H5Pset_elink_prefix() to be "tmp"
- *                 Should be able to access the target file in tmp directory via the prefix set
+ *              3. target file: "tmp_links/extlinks2"
+ *              4. Set up external link prefix via H5Pset_elink_prefix() to be "tmp_links"
+ *                 Should be able to access the target file in tmp_links directory via the prefix set
  *                 by H5Pset_elink_prefix()
  *
  *
@@ -2583,11 +2583,11 @@ external_link_prefix(hid_t fapl, hbool_t new_format)
     /* set up name for external linked target file: "extlinks2" */
     h5_fixname(FILENAME[16], fapl, filename2, sizeof filename2);
 
-    /* create tmp directory and get current working directory path */
+    /* create tmp_links directory and get current working directory path */
     if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
     TEST_ERROR
 
-    /* set up name for target file: "tmp/extlinks2" */
+    /* set up name for target file: "tmp_links/extlinks2" */
     h5_fixname(FILENAME[17], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -2617,7 +2617,7 @@ external_link_prefix(hid_t fapl, hbool_t new_format)
     /* should be able to find the target file from pathnames set via H5Pset_elink_prefix() */
     if (gid < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp directory.");
+        HDputs("    Should have found the file in tmp_links directory.");
         goto error;
     }
 
@@ -2641,8 +2641,8 @@ error:
  * Function:    external_link_abs_mainpath: test 3
  *
  * Purpose:     1. target link: "extlinks3"
- *              2. main file: Linux:"/CWD/tmp/extlinks0"; Windows: "<cur drive>:/CWD/tmp/extlinks0"
- *              3. target file: "tmp/extlinks3"
+ *              2. main file: Linux:"/CWD/tmp_links/extlinks0"; Windows: "<cur drive>:/CWD/tmp_links/extlinks0"
+ *              3. target file: "tmp_links/extlinks3"
  *                 Should be able to access the target file via the main file's absolute path
  *
  * Return:      Success:        0
@@ -2667,17 +2667,17 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
 
     /* set up name for external linked target file: "extlinks3" */
     h5_fixname(FILENAME[18], fapl, filename2, sizeof filename2);
-    /* set up name for target file: "tmp/extlinks3" */
+    /* set up name for target file: "tmp_links/extlinks3" */
     h5_fixname(FILENAME[19], fapl, filename3, sizeof filename3);
 
-    /* create tmp directory and get current working directory path */
+    /* create tmp_links directory and get current working directory path */
     if((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE)))
         TEST_ERROR
 
     /*
      * set up name for main file:
-     *    Linux: "/CWD/tmp/extlinks0"
-     *  Window: "<cur drive>:/CWD/tmp/extlinks0"
+     *    Linux: "/CWD/tmp_links/extlinks0"
+     *  Window: "<cur drive>:/CWD/tmp_links/extlinks0"
      */
     fix_ext_filename(tmpname, cwdpath, FILENAME[13]);
     h5_fixname(tmpname, fapl, filename1, sizeof filename1);
@@ -2705,7 +2705,7 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
     /* should be able to find the target file from absolute path set for main file */
     if(gid < 0) {
     H5_FAILED();
-    HDputs("    Should have found the file in tmp directory.");
+    HDputs("    Should have found the file in tmp_links directory.");
     goto error;
     }
 
@@ -2729,8 +2729,8 @@ error:
  * Function:    external_link_rel_mainpath: test 4
  *
  * Purpose:     1. target link: "extlinks4"
- *              2. main file: "tmp/extlinks0"
- *              3. target file: "tmp/extlinks4"
+ *              2. main file: "tmp_links/extlinks0"
+ *              3. target file: "tmp_links/extlinks4"
  *                 Should be able to access the target file via the main file's CWD+relative path
  *
  * Return:      Success:        0
@@ -2757,9 +2757,9 @@ external_link_rel_mainpath(hid_t fapl, hbool_t new_format)
     if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
         TEST_ERROR
 
-     /* set up name for main file: "tmp/extlinks0" */
+     /* set up name for main file: "tmp_links/extlinks0" */
     h5_fixname(FILENAME[13], fapl, filename1, sizeof filename1);
-    /* set up name for target file: "tmp/extlinks4" */
+    /* set up name for target file: "tmp_links/extlinks4" */
     h5_fixname(FILENAME[21], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -2808,7 +2808,7 @@ error:
  * Function:    external_link_cwd: test 5
  *
  * Purpose:     1. target link: "extlinks5"
- *              2. main file: Linux:"/CWD/tmp/extlinks0"; Window: "<cur drive>:/CWD/tmp/extlinks0"
+ *              2. main file: Linux:"/CWD/tmp_links/extlinks0"; Window: "<cur drive>:/CWD/tmp_links/extlinks0"
  *              3. target file: "extlinks5"
  *                 Should be able to access the target file in the current working directory
  *
@@ -2840,8 +2840,8 @@ external_link_cwd(hid_t fapl, hbool_t new_format)
 
     /*
      * set up name for main file:
-     *     Linux: "/CWD/tmp/extlinks0"
-     *   Windows: "<cur drive>:/CWD/tmp/extlinks0"
+     *     Linux: "/CWD/tmp_links/extlinks0"
+     *   Windows: "<cur drive>:/CWD/tmp_links/extlinks0"
      */
     fix_ext_filename(tmpname, cwdpath, FILENAME[13]);
     h5_fixname(tmpname, fapl, filename1, sizeof filename1);
@@ -2892,9 +2892,9 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    external_link_abstar: test 6
  *
- * Purpose:     1. target link: Linux:"/CWD/tmp/extlinks6"; Windows:"<cur drive>:/CWD/tmp/extlinks6"
+ * Purpose:     1. target link: Linux:"/CWD/tmp_links/extlinks6"; Windows:"<cur drive>:/CWD/tmp_links/extlinks6"
  *              2. main file: "extlinks0"
- *              3. target file: "tmp/extlinks6"
+ *              3. target file: "tmp_links/extlinks6"
  *                 Should be able to access the target file's absolute path
  *
  * Return:      Success:        0
@@ -2920,19 +2920,19 @@ external_link_abstar(hid_t fapl, hbool_t new_format)
     /* set up name for main file: "extlinks0" */
     h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
 
-     /* create tmp directory and get current working directory path */
+     /* create tmp_links directory and get current working directory path */
     if((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE)))
         TEST_ERROR
 
     /*
      * set up name for external linked target file:
-     *   Linux: "/CWD/tmp/extlinks6"
-     *     Windows: "<cur drive>:/CWD/tmp/extlinks6"
+     *   Linux: "/CWD/tmp_links/extlinks6"
+     *     Windows: "<cur drive>:/CWD/tmp_links/extlinks6"
      */
     fix_ext_filename(tmpname, cwdpath, FILENAME[23]);
     h5_fixname(tmpname, fapl, filename2, sizeof filename2);
 
-    /* set up name for target file: "tmp/extlinks6" */
+    /* set up name for target file: "tmp_links/extlinks6" */
     h5_fixname(FILENAME[23], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -2957,7 +2957,7 @@ external_link_abstar(hid_t fapl, hbool_t new_format)
     /* should be able to find the target file with abolute path */
     if(gid < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp directory.");
+        HDputs("    Should have found the file in tmp_links directory.");
         goto error;
     }
 
@@ -2979,7 +2979,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    external_link_abstar_cur: test 7
  *
- * Purpose:     1. target link: Linux: "/CWD/tmp/extlinks7"; Windows: "<cur drive>:/CWD/tmp/extlinks7"
+ * Purpose:     1. target link: Linux: "/CWD/tmp_links/extlinks7"; Windows: "<cur drive>:/CWD/tmp_links/extlinks7"
  *              2. main file: "extlinks0"
  *              3. target file: "extlinks7"
  *                 Should be able to access the target file via the main file's CWD.
@@ -3010,14 +3010,14 @@ external_link_abstar_cur(hid_t fapl, hbool_t new_format)
     /* set up name for target file name: "extlinks7" */
     h5_fixname(FILENAME[24], fapl, filename3, sizeof filename3);
 
-    /* create tmp directory and get current working directory path */
+    /* create tmp_links directory and get current working directory path */
     if((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE)))
         TEST_ERROR
 
      /*
       * set up name for external linked target file:
-      *   Linux: "/CWD/tmp/extlinks7"
-      *   Windows: "<cur drive>:/CWD/tmp/extlinks7"
+      *   Linux: "/CWD/tmp_links/extlinks7"
+      *   Windows: "<cur drive>:/CWD/tmp_links/extlinks7"
       */
     fix_ext_filename(tmpname, cwdpath, FILENAME[25]);
     h5_fixname(tmpname, fapl, filename2, sizeof filename2);
@@ -3067,9 +3067,9 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    external_link_reltar: test 8
  *
- * Purpose:     1. target link: Linux:"tmp/extlinks8"
+ * Purpose:     1. target link: Linux:"tmp_links/extlinks8"
  *              2. main file: "extlinks0"
- *              3. target file: "tmp/extlinks8"
+ *              3. target file: "tmp_links/extlinks8"
  *                 Should be able to access the target file via the main file's CWD+ target's relative path
  *
  * Return:      Success:        0
@@ -3092,11 +3092,11 @@ external_link_reltar(hid_t fapl, hbool_t new_format)
     /* set up name for main file: "extlinks0" */
     h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
 
-    /* create tmp directory */
+    /* create tmp_links directory */
     if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) TEST_ERROR
 
-    /* set up name for target file name: "tmp/extlinks8" */
-    /* set up name for external linked target file: "tmp/extlinks8" */
+    /* set up name for target file name: "tmp_links/extlinks8" */
+    /* set up name for external linked target file: "tmp_links/extlinks8" */
     h5_fixname(FILENAME[26], fapl, filename2, sizeof filename2);
 
     /* Create the target file */
@@ -3117,7 +3117,7 @@ external_link_reltar(hid_t fapl, hbool_t new_format)
     /* Open object through external link */
     if((gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp directory.");
+        HDputs("    Should have found the file in tmp_links directory.");
         goto error;
     } /* end if */
 
@@ -3143,8 +3143,8 @@ error:
  * Purpose:
  *        1. target link: "extlinks9"
  *        2. main file: "extlinks0"
- *        3. target file" "tmp/extlinks9"
- *        3. chdir "tmp"
+ *        3. target file" "tmp_links/extlinks9"
+ *        3. chdir "tmp_links"
  *        Should be able to access the target file in current working directory
  *
  * Return:      Success:        0
@@ -3170,10 +3170,10 @@ external_link_chdir(hid_t fapl, hbool_t new_format)
     /* set up name for external linked target file ("extlinks9") */
     h5_fixname(FILENAME[27], fapl, filename2, sizeof filename2);
 
-    /* create tmp directory */
+    /* create tmp_links directory */
     if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) TEST_ERROR
 
-    /* set up name for target file name ("tmp/extlinks9") */
+    /* set up name for target file name ("tmp_links/extlinks9") */
     h5_fixname(FILENAME[28], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -3206,7 +3206,7 @@ external_link_chdir(hid_t fapl, hbool_t new_format)
      */
     if (gid < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp directory.");
+        HDputs("    Should have found the file in tmp_links directory.");
         goto error;
     }
 
@@ -3234,7 +3234,7 @@ error:
  *
  *        1. target link: "extlinks16"
  *        2. target file: "extlinks16"
- *        3. main file: Linux:"/CWD/tmp/extlinks0"; Window: "<cur drive>:/CWD/tmp/extlinks0"
+ *        3. main file: Linux:"/CWD/tmp_links/extlinks0"; Window: "<cur drive>:/CWD/tmp_links/extlinks0"
  *        4. Create target file A to be a "family" file: extlinks16A
  *        4. Create target file B to be a "multi" file: extlinks16B
  *        5. Create external link from main file to target file A: ext_linkA->extlinks16A:/A
@@ -3276,8 +3276,8 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format)
 
     /*
      * set up name for main file:
-     *     Linux: "/CWD/tmp/extlinks0"
-     *   Windows: "<cur drive>:/CWD/tmp/extlinks0"
+     *     Linux: "/CWD/tmp_links/extlinks0"
+     *   Windows: "<cur drive>:/CWD/tmp_links/extlinks0"
      */
     fix_ext_filename(tmpname, cwdpath, FILENAME[13]);
     h5_fixname(tmpname, fapl, filename1, sizeof filename1);
@@ -3426,7 +3426,7 @@ error:
  *
  *         1. target link: "extlinks17"
  *         2. target file: "extlinks17"
- *         3. main file: Linux:"/CWD/tmp/extlinks0"; Window: "<cur drive>:/CWD/tmp/extlinks0"
+ *         3. main file: Linux:"/CWD/tmp_links/extlinks0"; Window: "<cur drive>:/CWD/tmp_links/extlinks0"
  *         4. Create target file to be a "core" file:/A/Dataset
  *         5. Create external link from main file to target file:ext_link->target file:/A/Dataset
  *         6. Set the file access property list of the link access to use "core" file without
@@ -3465,8 +3465,8 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format)
 
     /*
      * set up name for main file:
-     *   Linux: "/CWD/tmp/extlinks0"
-     *   Windows: "<cur drive>:/CWD/tmp/extlinks0"
+     *   Linux: "/CWD/tmp_links/extlinks0"
+     *   Windows: "<cur drive>:/CWD/tmp_links/extlinks0"
      */
     fix_ext_filename(tmpname, cwdpath, FILENAME[13]);
     h5_fixname(tmpname, fapl, filename1, sizeof filename1);
@@ -4013,7 +4013,7 @@ error:
  * Function:    external_link_win1
  *
  * Purpose:
- *            1. target link: "/CWD/tmp/extlinks10"
+ *            1. target link: "/CWD/tmp_links/extlinks10"
  *            2. main file: "extlinks0"
  *            3. target file: "extlinks10"
  *            Should be able to find the target file via main file's current drive/rel path
@@ -4044,7 +4044,7 @@ external_link_win1(hid_t fapl, hbool_t new_format)
     if(NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE))
         TEST_ERROR
 
-    /* set up name for target link: "/CWD/tmp/extlinks10" */
+    /* set up name for target link: "/CWD/tmp_links/extlinks10" */
     HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */
     HDstrcat(tmpname, "/");
     HDstrcat(tmpname, FILENAME[30]);
@@ -4099,9 +4099,9 @@ error:
  * Function:    external_link_win2
  *
  * Purpose:
- *           1. target link: "/CWD/tmp/extlinks11"
+ *           1. target link: "/CWD/tmp_links/extlinks11"
  *           2. main file: "extlinks0"
- *           3. target file: "tmp/extlinks11"
+ *           3. target file: "tmp_links/extlinks11"
  *              Should be able to access the target file directly (rel drive/abs path)
  *
  * Return:      Success:        0
@@ -4127,17 +4127,17 @@ external_link_win2(hid_t fapl, hbool_t new_format)
     /* set up name for main file: "extlinks0" */
     h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
 
-     /* create tmp directory and get current working directory path */
+     /* create tmp_links directory and get current working directory path */
     if((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE)))
         TEST_ERROR
 
-    /* set up name for target link: "/CWD/tmp/extlinks11" */
+    /* set up name for target link: "/CWD/tmp_links/extlinks11" */
     HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it relative drive but absolute path */
     HDstrcat(tmpname, "/");
     HDstrcat(tmpname, FILENAME[31]);
     h5_fixname(tmpname, fapl, filename2, sizeof filename2);
 
-    /* set up name for target file: "tmp/extlinks11" */
+    /* set up name for target file: "tmp_links/extlinks11" */
     h5_fixname(FILENAME[31], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -4163,7 +4163,7 @@ external_link_win2(hid_t fapl, hbool_t new_format)
     /* should be able to find the target file directly */
     if(gid < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp.");
+        HDputs("    Should have found the file in tmp_links.");
         goto error;
     }
 
@@ -4187,9 +4187,9 @@ error:
  * Function:    external_link_win3
  *
  * Purpose:
- *           1. target link: "<cur drive>:tmp/extlinks12"
+ *           1. target link: "<cur drive>:tmp_links/extlinks12"
  *           2. main file: "extlinks0"
- *           3. target file: "tmp/extlinks12"
+ *           3. target file: "tmp_links/extlinks12"
  *              Should be able to access the target file directly (abs drive/rel path)
  *
  * Return:      Success:        0
@@ -4215,16 +4215,16 @@ external_link_win3(hid_t fapl, hbool_t new_format)
     /* set up name for main file: "extlinks0" */
     h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
 
-    /* create tmp directory */
+    /* create tmp_links directory */
     if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
         TEST_ERROR
 
-    /* set up name for target link: "<drive-letter>:tmp/extlinks12" */
+    /* set up name for target link: "<drive-letter>:tmp_links/extlinks12" */
     drive = HDgetdrive();
     HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive+'A'-1), FILENAME[32]);
     h5_fixname(tmpname, fapl, filename2, sizeof filename2);
 
-    /* set up name for target file: "tmp/extlinks12" */
+    /* set up name for target file: "tmp_links/extlinks12" */
     h5_fixname(FILENAME[32], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -4250,7 +4250,7 @@ external_link_win3(hid_t fapl, hbool_t new_format)
     /* should be able to find the target file directly */
     if (gid < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp.");
+        HDputs("    Should have found the file in tmp_links.");
         goto error;
     }
 
@@ -4274,8 +4274,8 @@ external_link_win3(hid_t fapl, hbool_t new_format)
  *
  * Purpose:
  *        1. target link: "<cur drive>:extlinks13"
- *        2. main file: "<cur-drive>:tmp/extlinks0"
- *        3. target file: tmp/extlinks13
+ *        2. main file: "<cur-drive>:tmp_links/extlinks0"
+ *        3. target file: tmp_links/extlinks13
  *           Should be able to access the target file via main file's abs drive/rel path
  *
  * Return:      Success:        0
@@ -4298,7 +4298,7 @@ external_link_win4(hid_t fapl, hbool_t new_format)
     else
         TESTING("external links via main file's abs drive/rel path (windows)")
 
-    /* set up name for main file: "<drive-letter>:tmp/extlinks0" */
+    /* set up name for main file: "<drive-letter>:tmp_links/extlinks0" */
     drive = HDgetdrive();
     HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive+'A'-1), FILENAME[13]);
     h5_fixname(tmpname, fapl, filename1, sizeof filename1);
@@ -4307,7 +4307,7 @@ external_link_win4(hid_t fapl, hbool_t new_format)
     HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive+'A'-1), FILENAME[33]);
     h5_fixname(tmpname, fapl, filename2, sizeof filename2);
 
-    /* set up name for target file: "tmp/extlinks13" */
+    /* set up name for target file: "tmp_links/extlinks13" */
     h5_fixname(FILENAME[34], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -4356,9 +4356,9 @@ error:
  * Function:    external_link_win5
  *
  * Purpose:
- *           1. target link: "<cur drive+1>:tmp/extlinks14"
+ *           1. target link: "<cur drive+1>:tmp_links/extlinks14"
  *           2. main file: "/CWD/extlinks0"
- *           3. target file: "tmp/extlinks14"
+ *           3. target file: "tmp_links/extlinks14"
  *              Should be able to access the target file via main file's relative drive/absolute path
  *
  * Return:      Success:        0
@@ -4396,11 +4396,11 @@ external_link_win5(hid_t fapl, hbool_t new_format)
     HDstrcat(tmpname, FILENAME[12]);
     h5_fixname(tmpname, fapl, filename1, sizeof filename1);
 
-    /* set up name for target link: "<drive-letter+1>:tmp/extlinks14" */
+    /* set up name for target link: "<drive-letter+1>:tmp_links/extlinks14" */
     HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive+'A'-1), FILENAME[35]);
     h5_fixname(tmpname, fapl, filename2, sizeof filename2);
 
-    /* set up name for target file: "tmp/extlinks14" */
+    /* set up name for target file: "tmp_links/extlinks14" */
     h5_fixname(FILENAME[35], fapl, filename3, sizeof filename3);
 
     /* Create the target file */
@@ -4449,9 +4449,9 @@ error:
  * Function:    external_link_win6
  *
  * Purpose:
- *           1. target link: "<cur drive+1>:tmp/extlinks15"
+ *           1. target link: "<cur drive+1>:tmp_links/extlinks15"
  *           2. main file: "extlinks0"
- *           3. target file: "tmp/extlinks15"
+ *           3. target file: "tmp_links/extlinks15"
  *              Should be able to access the target file via target's current drive/rel path
  *
  * Return:      Success:        0
@@ -4474,7 +4474,7 @@ external_link_win6(hid_t fapl, hbool_t new_format)
     else
         TESTING("external links via target's current drive/rel path (windows)")
 
-    /* create tmp directory */
+    /* create tmp_links directory */
     if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
         TEST_ERROR
     drive = HDgetdrive();
@@ -4486,7 +4486,7 @@ external_link_win6(hid_t fapl, hbool_t new_format)
     /* set up name for main file: "extlinks0" */
     h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
 
-    /* set up name for target link: "<drive-letter+1>:tmp/extlinks15" */
+    /* set up name for target link: "<drive-letter+1>:tmp_links/extlinks15" */
     HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive+'A'-1), FILENAME[36]);
     h5_fixname(tmpname, fapl, filename2, sizeof filename2);
 
@@ -4515,7 +4515,7 @@ external_link_win6(hid_t fapl, hbool_t new_format)
     /* should be able to find the target file via target file's rel path in current drive */
     if (gid < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp.");
+        HDputs("    Should have found the file in tmp_links.");
         goto error;
     }
 
@@ -4539,7 +4539,7 @@ error:
  * Function:    external_link_win7
  *
  * Purpose:
- *      1. UNC target link: "\\127.0.01\c$/tmp/extlinks10"
+ *      1. UNC target link: "\\127.0.01\c$/tmp_links/extlinks10"
  *      2. main file: "extlinks0"
  *      3. target file: "extlinks15"
  *         Should be able to find the target file via main file's local host/main drive/rel path
@@ -4570,7 +4570,7 @@ external_link_win7(hid_t fapl, hbool_t new_format)
     if(NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE))
         TEST_ERROR
 
-    /* set up name for target link: "\\127.0.0.1\c$/tmp/extlinks10" */
+    /* set up name for target link: "\\127.0.0.1\c$/tmp_links/extlinks10" */
     HDstrcpy(tmpname, "\\\\127.0.0.1\\c$"); /* absolute path */
     HDstrcat(tmpname, "/");
     HDstrcat(tmpname, FILENAME[30]);
@@ -4657,7 +4657,7 @@ external_link_win8(hid_t fapl, hbool_t new_format)
 
     if(NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE))  TEST_ERROR
 
-    /* create tmp directory */
+    /* create tmp_links directory */
     if(HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) TEST_ERROR
 
     /* set up name for target link: "<drive-letter>:\CWD\extlinks10" */
@@ -4690,7 +4690,7 @@ external_link_win8(hid_t fapl, hbool_t new_format)
     /* should be able to find the target file directly */
     if(gid < 0) {
         H5_FAILED();
-        HDputs("    Should have found the file in tmp.");
+        HDputs("    Should have found the file in tmp_links.");
         goto error;
     }
 
@@ -4714,7 +4714,7 @@ error:
  * Function:    external_link_win9
  *
  * Purpose:
- *      1. Long UNC target link: "\\?\UNC\127.0.01\c$/tmp/extlinks10"
+ *      1. Long UNC target link: "\\?\UNC\127.0.01\c$/tmp_links/extlinks10"
  *      2. main file: "extlinks0"
  *      3. target file: "extlinks15"
  *         Should be able to find the target file via main file's local host/main drive/rel path
@@ -4744,7 +4744,7 @@ external_link_win9(hid_t fapl, hbool_t new_format)
 
     if(NULL == HDgetcwd(cwdpath, (size_t)NAME_BUF_SIZE)) TEST_ERROR
 
-    /* set up name for target link: "\\?\UNC\127.0.0.1\c$/tmp/extlinks10" */
+    /* set up name for target link: "\\?\UNC\127.0.0.1\c$/tmp_links/extlinks10" */
     HDstrcpy(tmpname, "\\\\?\\UNC\127.0.0.1\\c$"); /* absolute path */
     HDstrcat(tmpname, "/");
     HDstrcat(tmpname, FILENAME[30]);
@@ -5808,37 +5808,22 @@ error:
 static int
 external_link_endian(hbool_t new_format)
 {
-    hid_t       fid = -1;                       /* File ID */
-    hid_t       gid = -1, gid2 = -1;            /* Group IDs */
-    hid_t       lapl_id = -1;                   /* Prop List ID */
-    char       *srcdir = getenv("srcdir");      /* The source directory */
-    char        pathbuf[NAME_BUF_SIZE];         /* Path to the files */
-    char        namebuf[NAME_BUF_SIZE];
+    hid_t        fid = -1;                     /* File ID */
+    hid_t        gid = -1, gid2 = -1;          /* Group IDs */
+    hid_t        lapl_id = -1;                 /* Prop List ID */
+    const char  *pathbuf = H5_get_srcdir();    /* Path to the files */
+    const char  *namebuf;
 
     if(new_format)
         TESTING("endianness of external links (w/new group format)")
     else
         TESTING("endianness of external links")
 
-    /*
-     * Create the name of the file to open (in case we are using the --srcdir
-     * option and the file is in a different directory from this test).
-     */
-    if (srcdir && ((HDstrlen(srcdir) + 2) < sizeof(pathbuf)) )
-    {
-        HDstrcpy(pathbuf, srcdir);
-        HDstrcat(pathbuf, "/");
-    }
-    else
-        HDstrcpy(pathbuf, "");
-
     /* Create a link access property list with the path to the srcdir */
     if((lapl_id = H5Pcreate(H5P_LINK_ACCESS)) < 0) TEST_ERROR
     if(H5Pset_elink_prefix(lapl_id, pathbuf) < 0) TEST_ERROR
 
-    if(HDstrlen(pathbuf) + HDstrlen(LE_FILENAME) >= sizeof(namebuf)) TEST_ERROR
-    HDstrcpy(namebuf, pathbuf);
-    HDstrcat(namebuf, LE_FILENAME);
+    namebuf = H5_get_srcdir_filename(LE_FILENAME); /* Corrected test file name */
 
     /* Test LE file; try to open a group through the external link */
     if((fid = H5Fopen(namebuf, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -5852,9 +5837,7 @@ external_link_endian(hbool_t new_format)
     if(H5Gclose(gid) < 0) TEST_ERROR
     if(H5Fclose(fid) < 0) TEST_ERROR
 
-    if(HDstrlen(pathbuf) + HDstrlen(BE_FILENAME) >= sizeof(namebuf)) TEST_ERROR
-    HDstrcpy(namebuf, pathbuf);
-    HDstrcat(namebuf, BE_FILENAME);
+    namebuf = H5_get_srcdir_filename(BE_FILENAME); /* Corrected test file name */
 
     /* Test BE file; try to open a group through the external link */
     if((fid = H5Fopen(namebuf, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -6009,7 +5992,7 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
         /* set up name for main file: "extlinks21A" */
         h5_fixname(FILENAME[45], fapl, filename1, sizeof(filename1));
 
-        /* create tmp directory and get current working directory path */
+        /* create tmp_links directory and get current working directory path */
         if(HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
             TEST_ERROR
         if(HDmkdir(TMPDIR2, (mode_t)0755) < 0 && errno != EEXIST)
@@ -6019,29 +6002,29 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
 
         /* Set up names for files in the subdirectories */
 
-        /* set up names for file #2 in temporary directory #2: "tmp2/extlinks21B" */
+        /* set up names for file #2 in temporary directory #2: "tmp2_links/extlinks21B" */
         h5_fixname(FILENAME[46], fapl, filename2a, sizeof(filename2a));
         fix_ext_filename(tmpname, cwdpath, FILENAME[46]);
         h5_fixname(tmpname, fapl, filename2b, sizeof(filename2b));
 
         /* Create symbolic link #1 in temporary directory #1 to file #2 in temporary directory #2 */
-        /* (i.e. tmp/sym1.h5 -> <full path to>/tmp2/extlinks21B.h5) */
+        /* (i.e. tmp_links/sym1.h5 -> <full path to>/tmp2_links/extlinks21B.h5) */
         if(HDsymlink(filename2b, SYMLINK1) < 0 && errno != EEXIST) TEST_ERROR
 
-        /* set up name for file #3 in temporary directory #2: "tmp2/extlinks21C" */
+        /* set up name for file #3 in temporary directory #2: "tmp2_links/extlinks21C" */
         h5_fixname(FILENAME[47], fapl, filename3a, sizeof(filename3a));
         h5_fixname(FILENAME[48], fapl, filename3b, sizeof(filename3b));
 
-        /* set up name for file #4 in temporary directory #1: "tmp/extlinks21D" */
+        /* set up name for file #4 in temporary directory #1: "tmp_links/extlinks21D" */
         h5_fixname(FILENAME[49], fapl, filename4a, sizeof(filename4a));
         fix_ext_filename(tmpname, cwdpath, FILENAME[49]);
         h5_fixname(tmpname, fapl, filename4b, sizeof(filename4b));
 
         /* Create symbolic link #2 in temporary directory #2 to file #4 in temporary directory #1 */
-        /* (i.e. tmp2/sym2.h5 -> <full path to>/tmp/extlinks21D.h5) */
+        /* (i.e. tmp2_links/sym2.h5 -> <full path to>/tmp_links/extlinks21D.h5) */
         if(HDsymlink(filename4b, SYMLINK2) < 0 && errno != EEXIST) TEST_ERROR
 
-        /* set up name for file #5 in temporary directory #1: "tmp/extlinks21E" */
+        /* set up name for file #5 in temporary directory #1: "tmp_links/extlinks21E" */
         h5_fixname(FILENAME[50], fapl, filename5a, sizeof(filename5a));
         h5_fixname(FILENAME[51], fapl, filename5b, sizeof(filename5b));
 
@@ -6054,11 +6037,11 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
         /* Close file #1 */
         if(H5Fclose(file1) < 0) TEST_ERROR
 
-        /* Create file #2 in tmp directory #2 */
+        /* Create file #2 in tmp_links directory #2 */
         if((file2 = H5Fcreate(filename2a, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
         if(H5Fclose(file2) < 0) TEST_ERROR
 
-        /* Re-open file #2 in tmp directory through symlink */
+        /* Re-open file #2 in tmp_links directory through symlink */
         if((file2 = H5Fopen(SYMLINK1, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR
 
         /* Create group in file #2 in temporary directory */
@@ -8531,8 +8514,7 @@ build_visit_file(hid_t fapl)
     hid_t did = -1;                     /* Dataset ID */
     hid_t tid = -1;                     /* Datatype ID */
     char filename[NAME_BUF_SIZE];
-    char pathname[1024];                /* Path of external link file */
-    char *srcdir = getenv("srcdir");    /* where the src code is located */
+    const char *pathname = H5_get_srcdir_filename(LINKED_FILE); /* Corrected test file name */
 
     h5_fixname(FILENAME[9], fapl, filename, sizeof filename);
 
@@ -8566,14 +8548,6 @@ build_visit_file(hid_t fapl)
     if(H5Lcreate_hard(fid, "/", fid, "/Group1/Group2/hard_zero", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
 
     /* Create external link to existing file */
-    pathname[0] = '\0';
-    /* Generate correct name for test file by prepending the source path */
-    if(srcdir && ((HDstrlen(srcdir) + HDstrlen(LINKED_FILE) + 1) < sizeof(pathname))) {
-        HDstrcpy(pathname, srcdir);
-        HDstrcat(pathname, "/");
-    }
-    HDstrcat(pathname, LINKED_FILE);
-
     if(H5Lcreate_external(pathname, "/group", fid, "/ext_one", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
 
     /* Create dangling external link to non-existent file */
@@ -14029,7 +14003,7 @@ main(void)
     HDremove(SYMLINK1);
     HDremove(SYMLINK2);
 
-    /* clean up tmp directory created by external link tests */
+    /* clean up tmp_links and tmp2_links directory created by external link tests */
     HDrmdir(TMPDIR);
     HDrmdir(TMPDIR2);
 
diff --git a/test/links_env.c b/test/links_env.c
index 470ef9a..df14675 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -12,39 +12,39 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Purpose:	Tests hard, soft (symbolic) & external links.
+ * Purpose:    Tests hard, soft (symbolic) & external links.
  */
 
 #define H5G_PACKAGE
 #define H5G_TESTING
 
 #include "h5test.h"
-#include "H5Gpkg.h"		/* Groups 				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5Gpkg.h"        /* Groups                 */
+#include "H5Iprivate.h"        /* IDs                      */
 #include "H5Lprivate.h"         /* Links                                */
 
-#define TMPDIR          "tmp/"
+#define TMPDIR          "tmp_links_env/"
 #define NAME_BUF_SIZE   1024
 
 const char *FILENAME[] = {
-    "extlinks_env0",	/* 0: main file */
-    "extlinks_env1",	/* 1: target file */
+    "extlinks_env0",    /* 0: main file */
+    "extlinks_env1",    /* 1: target file */
     TMPDIR "extlinks_env1", /* 2 */
     NULL
 };
 
 static int external_link_env(hid_t fapl, hbool_t new_format);
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    external_link_env (moved from links.c)
  *
- * Purpose: 	Verify that the target file is found successfully in "tmp" directory
- *		via searching the pathnames set in the environment variable HDF5_EXT_PREFIX.
- *		1. Target link: "extlinks_env1"
- *		2. Main file: "extlinks_env0"
- *		3. Target file is created in: "tmp/extlinks_env1"
- * 		4. The environment variable "HDF5_EXT_PREFIX" is set to ".:tmp"
+ * Purpose:     Verify that the target file is found successfully in "tmp_links_env" directory
+ *        via searching the pathnames set in the environment variable HDF5_EXT_PREFIX.
+ *        1. Target link: "extlinks_env1"
+ *        2. Main file: "extlinks_env0"
+ *        3. Target file is created in: "tmp_links_env/extlinks_env1"
+ *         4. The environment variable "HDF5_EXT_PREFIX" is set to ".:tmp_links_env"
  *
  * Return:      Success:        0
  *              Failure:        -1
@@ -59,12 +59,12 @@ static int external_link_env(hid_t fapl, hbool_t new_format);
 static int
 external_link_env(hid_t fapl, hbool_t new_format)
 {
-    hid_t fid = (-1);     	/* File ID */
-    hid_t gid = (-1);	        /* Group IDs */
-    const char *envval = NULL;	/* Pointer to environment variable */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE];	/* Holders for filename */
+    hid_t fid = (-1);         /* File ID */
+    hid_t gid = (-1);            /* Group IDs */
+    const char *envval = NULL;    /* Pointer to environment variable */
+    char    filename1[NAME_BUF_SIZE],
+            filename2[NAME_BUF_SIZE],
+            filename3[NAME_BUF_SIZE];    /* Holders for filename */
 
     if(new_format)
         TESTING("external links via environment variable (w/new group format)")
@@ -73,7 +73,7 @@ external_link_env(hid_t fapl, hbool_t new_format)
 
     if ((envval = HDgetenv("HDF5_EXT_PREFIX")) == NULL)
         envval = "nomatch";
-    if (HDstrcmp(envval, ".:tmp")) TEST_ERROR
+    if (HDstrcmp(envval, ".:tmp_links_env")) TEST_ERROR
 
     /* Set up name for main file:"extlinks_env0" */
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
@@ -81,14 +81,14 @@ external_link_env(hid_t fapl, hbool_t new_format)
     /* Set up name for external linked target file: "extlinks_env1" */
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
-    /* Create "tmp" directory */
+    /* Create "tmp_links_env" directory */
     if(HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-	TEST_ERROR
+    TEST_ERROR
 
-    /* Set up name (location) for the target file: "tmp/extlinks1" */
+    /* Set up name (location) for the target file: "tmp_links_env/extlinks1" */
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
-    /* Create the target file in "tmp" directory */
+    /* Create the target file in "tmp_links_env" directory */
     if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
     if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
@@ -110,9 +110,9 @@ external_link_env(hid_t fapl, hbool_t new_format)
 
     /* Should be able to find the target file from pathnames set via HDF5_EXT_PREFIX */
     if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp directory.");
-	goto error;
+    H5_FAILED();
+    puts("    Should have found the file in tmp_links_env directory.");
+    goto error;
     }
 
     /* closing for main file */
@@ -124,35 +124,30 @@ external_link_env(hid_t fapl, hbool_t new_format)
 
  error:
     H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
+    H5Gclose (gid);
+    H5Fclose (fid);
     } H5E_END_TRY;
     return -1;
 } /* end external_link_env() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test external link with environment variable HDF5_EXT_PREFIX
+ * Purpose:    Test external link with environment variable HDF5_EXT_PREFIX
  *
- * Return:	Success:	exit(EXIT_SUCCESS)
- *		Failure:	exit(EXIT_FAILURE)
+ * Return:    Success:    exit(EXIT_SUCCESS)
+ *        Failure:    exit(EXIT_FAILURE)
  *
- * Programmer:	Vailin Choi; Nov 2010
+ * Programmer:    Vailin Choi; Nov 2010
  *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
-    hid_t fapl; 	/* File access property lists */
-    int	nerrors = 0;	/* Error from tests */
-    const char  *env_h5_drvr;      /* File Driver value from environment */
-
-    env_h5_drvr = HDgetenv("HDF5_DRIVER");
-    if(env_h5_drvr == NULL)
-        env_h5_drvr = "nomatch";
+    hid_t fapl;     /* File access property lists */
+    int    nerrors = 0;    /* Error from tests */
 
     h5_reset();
     fapl = h5_fileaccess();
@@ -177,7 +172,7 @@ main(void)
     }
     HDprintf("All external Link (HDF5_EXT_PREFIX) tests passed.\n");
 
-    /* clean up tmp directory created by external link tests */
+    /* clean up tmp_links_env directory created by external link tests */
     HDrmdir(TMPDIR);
 
     return 0;
diff --git a/test/mf.c b/test/mf.c
index 5b979d3..eba36b4 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -162,15 +162,15 @@ error:
 static unsigned
 test_mf_eoa(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    hid_t		fapl_new = -1;		/* copy of fapl */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    hid_t        fapl_new = -1;        /* copy of fapl */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size, new_file_size;      /* file size */
-    H5FD_mem_t 		type;
-    haddr_t		addr1, addr2;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0;
+    H5FD_mem_t         type;
+    haddr_t        addr1, addr2;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MM_alloc() of file allocation");
diff --git a/test/mtime.c b/test/mtime.c
index 1928a17..b50dfeb 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -118,7 +118,7 @@ main(void)
         HDstrftime((char*)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);
         tm = HDlocaltime(&now);
         HDstrftime((char*)buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm);
-        printf("    got: %s\n    ans: %s\n", buf1, buf2);
+        HDprintf("    got: %s\n    ans: %s\n", buf1, buf2);
         goto error;
     }
     PASSED();
@@ -153,7 +153,7 @@ main(void)
         }
         else {
             H5_FAILED();
-            printf("***cannot open the pre-created old modification test file (%s)\n",
+            HDprintf("***cannot open the pre-created old modification test file (%s)\n",
                 testfile);
             goto error;
         } /* end else */
@@ -187,7 +187,7 @@ main(void)
         }
         else {
             H5_FAILED();
-            printf("***cannot open the pre-created old modification test file (%s)\n",
+            HDprintf("***cannot open the pre-created old modification test file (%s)\n",
                 testfile);
             goto error;
         } /* end else */
diff --git a/test/ntypes.c b/test/ntypes.c
index 05729d7..1cc7c33 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -149,8 +149,8 @@ test_atomic_dtype(hid_t file)
         for(j = 0; j < DIM1; j++)
             if(ipoints2[i][j] != icheck2[i][j]) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
@@ -521,8 +521,8 @@ test_compound_dtype2(hid_t file)
                     temp_point->st.ll2 != temp_check->st.ll2 ||
                     temp_point->l != temp_check->l ) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
         } /* end for */
@@ -728,8 +728,8 @@ test_compound_dtype(hid_t file)
                     temp_point->i != temp_check->i ||
                     temp_point->l != temp_check->l ) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
@@ -942,16 +942,16 @@ test_compound_dtype3(hid_t file)
             if(temp_point->c != temp_check->c ||
                     temp_point->l != temp_check->l ) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
             for(k = 0; k < 5; k++) {
                 if(temp_point->a[k] != temp_check->a[k]) {
                     H5_FAILED();
-                    printf("    Read different values than written.\n");
-                    printf("    At index %d,%d,%d\n", i, j, k);
+                    HDprintf("    Read different values than written.\n");
+                    HDprintf("    At index %d,%d,%d\n", i, j, k);
                     goto error;
                 } /* end if */
             } /* end for */
@@ -1157,16 +1157,16 @@ test_compound_opaque(hid_t file)
             if(temp_point->c != temp_check->c ||
                     temp_point->l != temp_check->l ) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
             for(k = 0; k < 5; k++) {
                 if(temp_point->o[k] != temp_check->o[k]) {
                     H5_FAILED();
-                    printf("    Read different values than written.\n");
-                    printf("    At index %d,%d,%d\n", i, j, k);
+                    HDprintf("    Read different values than written.\n");
+                    HDprintf("    At index %d,%d,%d\n", i, j, k);
                     goto error;
                 } /* end if */
             } /* end for */
@@ -1320,9 +1320,9 @@ test_enum_dtype(hid_t file)
         for(j = 0; j < DIM1; j++)
             if(spoints2[i][j] != scheck2[i][j]) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %d,%d\n", i, j);
-                printf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2[i][j],
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %d,%d\n", i, j);
+                HDprintf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2[i][j],
                         scheck2[i][j]);
                 goto error;
             } /* end if */
@@ -1476,8 +1476,8 @@ test_array_dtype(hid_t file)
                         temp_point->i != temp_check->i ||
                         temp_point->l != temp_check->l ) {
                     H5_FAILED();
-                    printf("    Read different values than written.\n");
-                    printf("    At index %d,%d\n", i, j);
+                    HDprintf("    Read different values than written.\n");
+                    HDprintf("    At index %d,%d\n", i, j);
                     goto error;
                 } /* end if */
 
@@ -1610,8 +1610,8 @@ test_array_dtype2(hid_t file)
             for(k = 0; k < 5; k++)
                 if(icheck3[i][j][k] != ipoints3[i][j][k]) {
                     H5_FAILED();
-                    printf("    Read different values than written.\n");
-                    printf("    At index %d,%d\n", i, j);
+                    HDprintf("    Read different values than written.\n");
+                    HDprintf("    At index %d,%d\n", i, j);
                     goto error;
                 } /* end if */
 
@@ -1677,7 +1677,7 @@ test_vl_dtype(hid_t file)
         wdata[i].p = HDmalloc((i + 1) * sizeof(hvl_t));
         if(NULL == wdata[i].p) {
             H5_FAILED();
-            printf("    Cannot allocate memory for VL data! i=%u\n",(unsigned)i);
+            HDprintf("    Cannot allocate memory for VL data! i=%u\n",(unsigned)i);
             goto error;
         } /* end if */
         wdata[i].len = i + 1;
@@ -1685,7 +1685,7 @@ test_vl_dtype(hid_t file)
             t1->p = HDmalloc((j + 1) * sizeof(unsigned int));
             if(NULL == t1->p) {
                 H5_FAILED();
-                printf("    Cannot allocate memory for VL data! i=%u, j=%u\n",(unsigned)i,(unsigned)j);
+                HDprintf("    Cannot allocate memory for VL data! i=%u, j=%u\n",(unsigned)i,(unsigned)j);
                 goto error;
             } /* end if */
             t1->len = j + 1;
@@ -1745,13 +1745,13 @@ test_vl_dtype(hid_t file)
     for(i = 0; i < SPACE1_DIM1; i++) {
         if(wdata[i].len != rdata[i].len) {
             H5_FAILED();
-            printf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
+            HDprintf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
             goto error;
         } /* end if */
         for(t1 = (hvl_t *)wdata[i].p, t2 = (hvl_t *)rdata[i].p, j = 0; j < rdata[i].len; j++, t1++, t2++) {
             if(t1->len != t2->len) {
                 H5_FAILED();
-                printf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
+                HDprintf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
                 goto error;
             } /* end if */
 
@@ -1767,7 +1767,7 @@ test_vl_dtype(hid_t file)
             for(k = 0; k < t2->len; k++) {
                 if(((unsigned int *)t1->p)[k] != ((unsigned int *)tmp)[k]) {
                     H5_FAILED();
-                    printf("    VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n",
+                    HDprintf("    VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n",
                             (unsigned)i, ((unsigned int*)t1->p)[k], (unsigned)i, ((unsigned int*)tmp)[k]);
                     goto error;
                 } /* end if */
@@ -1903,13 +1903,13 @@ test_vlstr_dtype(hid_t file)
     for(i = 0; i < SPACE1_DIM1; i++) {
         if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
             H5_FAILED();
-            printf("    VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",
+            HDprintf("    VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",
                     (int)i, (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i]));
             goto error;
         } /* end if */
         if(HDstrcmp(wdata[i], rdata[i]) != 0 ) {
             H5_FAILED();
-            printf("    VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",
+            HDprintf("    VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",
                     (int)i, wdata[i], (int)i, rdata[i]);
             goto error;
         } /* end if */
@@ -2026,13 +2026,13 @@ test_str_dtype(hid_t file)
     for(i = 0; i < SPACE1_DIM1; i++) {
         if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
             H5_FAILED();
-            printf("    data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",
+            HDprintf("    data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",
                     (int)i, (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i]));
             goto error;
         } /* end if */
         if(HDstrcmp(wdata[i], rdata[i]) != 0 ) {
             H5_FAILED();
-            printf("    data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",
+            HDprintf("    data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",
                     (int)i, wdata[i], (int)i, rdata[i]);
             goto error;
         } /* end if */
@@ -2507,8 +2507,8 @@ test_opaque_dtype(hid_t file)
     for(i = 0; i < sizeof(rbuf); i++)
         if(rbuf[i] != wbuf[i]) {
             H5_FAILED();
-            printf("    Read different values than written.\n");
-            printf("    At index %u\n", (unsigned)i);
+            HDprintf("    Read different values than written.\n");
+            HDprintf("    At index %u\n", (unsigned)i);
             goto error;
         } /* end if */
 
@@ -2612,8 +2612,8 @@ test_bitfield_dtype(hid_t file)
     for(i = 0; i < BITFIELD_ENUMB*4; i++) {
         if(*p != wbuf[i]) {
             H5_FAILED();
-            printf("    Read different values than written.\n");
-            printf("    At index %zu\n", i);
+            HDprintf("    Read different values than written.\n");
+            HDprintf("    At index %zu\n", i);
             TEST_ERROR;
         }
         p++;
@@ -2637,8 +2637,8 @@ test_bitfield_dtype(hid_t file)
     for(i = 0; i < BITFIELD_ENUMB; i++) {
         if(intr[i] != intw[i]) {
             H5_FAILED();
-            printf("    Read different values than written.\n");
-            printf("    At index %zu\n", i);
+            HDprintf("    Read different values than written.\n");
+            HDprintf("    At index %zu\n", i);
             TEST_ERROR;
         }
     }
@@ -2792,13 +2792,13 @@ test_ninteger(void)
 
     /* check */
     if(H5Tget_precision(nid1) != H5Tget_precision(nid2)) {
-        printf("    Precision differ.\n");
+        HDprintf("    Precision differ.\n");
         TEST_ERROR
     } /* end if */
 
     /* compare dataset creation property lists */
     if(H5Pequal(dcpl1, dcpl2) <= 0) {
-        printf("    Property lists differ.\n");
+        HDprintf("    Property lists differ.\n");
         TEST_ERROR
     } /* end if */
 
@@ -2806,8 +2806,8 @@ test_ninteger(void)
     for(i = 0; i < DIM3; i++)
         if(buf[i] != chk[i]) {
             H5_FAILED();
-            printf("    Read different values than written.\n");
-            printf("    At index %d\n", i);
+            HDprintf("    Read different values than written.\n");
+            HDprintf("    At index %d\n", i);
             TEST_ERROR
         } /* end if */
 
@@ -2898,7 +2898,7 @@ main(void)
     if(nerrors)
         goto error;
 
-    printf("All native datatype tests passed.\n");
+    HDprintf("All native datatype tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return 0;
@@ -2910,7 +2910,7 @@ error:
     } H5E_END_TRY;
 
     nerrors = MAX(1, nerrors);
-    printf("***** %d DATASET TEST%s FAILED! *****\n",
+    HDprintf("***** %d DATASET TEST%s FAILED! *****\n",
             nerrors, 1 == nerrors ? "" : "S");
 
     return 1;
diff --git a/test/objcopy.c b/test/objcopy.c
index ad9656f..db66285 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -551,7 +551,7 @@ test_copy_attach_attributes(hid_t loc_id, hid_t type_id)
         goto done;
 
     for(u = 0; u < num_attributes_g; u++) {
-        sprintf(attr_name, "%u attr", u);
+        HDsprintf(attr_name, "%u attr", u);
 
         /* Set attribute data */
         attr_data[0] = (int)(100 * u);
@@ -620,7 +620,7 @@ test_copy_attach_paired_attributes(hid_t loc_id, hid_t loc_id2, hid_t type_id)
     if((acpl = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) goto done;
 
     for(u = 0; u < num_attributes_g; u++) {
-        sprintf(attr_name, "%u attr", u);
+        HDsprintf(attr_name, "%u attr", u);
 
         /* Set attribute data */
         attr_data[0] = (int)(100 * u);
@@ -5438,15 +5438,15 @@ test_copy_group_deep(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_f
 
     /* create nested sub-groups & datasets */
     for(i = 0; i < NUM_SUB_GROUPS; i++) {
-        sprintf(objname, "Group #%d", i);
+        HDsprintf(objname, "Group #%d", i);
         if((gid_sub = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
         for(j = 0; j < NUM_SUB_GROUPS; j++) {
-            sprintf(objname, "Group #%d", j);
+            HDsprintf(objname, "Group #%d", j);
             if((gid_sub2 = H5Gcreate2(gid_sub, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
             for(k = 0; k < NUM_DATASETS; k++) {
-                sprintf(objname, "Dataset #%d", k);
+                HDsprintf(objname, "Dataset #%d", k);
 
                 /* add a dataset to the group */
                 if((did = H5Dcreate2(gid_sub2, objname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -5679,11 +5679,11 @@ test_copy_group_wide_loop(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
 
     /* create wide sub-group hierarchy, with multiple links to higher groups */
     for(u = 0; u < NUM_WIDE_LOOP_GROUPS; u++) {
-        sprintf(objname, "%s-%u", NAME_GROUP_SUB, u);
+        HDsprintf(objname, "%s-%u", NAME_GROUP_SUB, u);
         if((gid_sub = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
         for(v = 0; v < NUM_WIDE_LOOP_GROUPS; v++) {
-            sprintf(objname, "%s-%u", NAME_GROUP_SUB_SUB2, v);
+            HDsprintf(objname, "%s-%u", NAME_GROUP_SUB_SUB2, v);
             if((gid_sub2 = H5Gcreate2(gid_sub, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
             /* Create link to top group */
diff --git a/test/plugin.c b/test/plugin.c
index 0de8839..5ec6671 100644
--- a/test/plugin.c
+++ b/test/plugin.c
@@ -111,7 +111,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
     /* Check if all the filters are available */
     if(H5Pall_filters_avail(dcpl) != TRUE) {
         H5_FAILED();
-        printf("    Line %d: Incorrect filter availability\n", __LINE__);
+        HDprintf("    Line %d: Incorrect filter availability\n", __LINE__);
         TEST_ERROR
     } /* end if */
 
@@ -132,8 +132,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
         for(j=0; j<(size_t)size[1]; j++)
             if(0 != check[i][j]) {
                 H5_FAILED();
-                printf("    Read a non-zero value.\n");
-                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                HDprintf("    Read a non-zero value.\n");
+                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 TEST_ERROR
             } /* end if */
     PASSED();
@@ -200,8 +200,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
         for(j=0; j<size[1]; j++)
             if(points[i][j] != check[i][j]) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 TEST_ERROR
             } /* end if */
 
@@ -225,8 +225,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
         for(j = 0; j < size[1]; j++)
             if(points[i][j] != check[i][j]) {
                 H5_FAILED();
-                printf("    Read different values than written.\n");
-                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 TEST_ERROR
             } /* end if */
 
@@ -1068,14 +1068,14 @@ main(void)
 
     if(nerrors) TEST_ERROR
 
-    printf("All plugin tests passed.\n");
+    HDprintf("All plugin tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return 0;
 
 error:
     nerrors = MAX(1, nerrors);
-    printf("***** %d PLUGIN TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d PLUGIN TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
diff --git a/test/reserved.c b/test/reserved.c
index d8d0c59..e11ae19 100644
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -71,7 +71,7 @@ rsrv_heap(void)
             dataspace_id = H5Screate_simple(1, dims, dims);
         } H5E_END_TRY
 
-        sprintf(dset_name, "Dset %d", i);
+        HDsprintf(dset_name, "Dset %d", i);
 
         H5E_BEGIN_TRY {
             dataset_id = H5Dcreate2(file_id, dset_name, H5T_NATIVE_INT, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -103,7 +103,7 @@ rsrv_heap(void)
     /* Re-open the library and try to read a dataset from the file we created */
     if(H5open() < 0) TEST_ERROR;
 
-    sprintf(dset_name, "Dset %d", i - 2);
+    HDsprintf(dset_name, "Dset %d", i - 2);
 
     file_id = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT);
     if(file_id < 0) TEST_ERROR;
@@ -195,7 +195,7 @@ rsrv_ohdr(void)
     } /* end for */
 
     for(i = 0; i < 2000; i++) {
-        sprintf(attrname, "attr %d", i);
+        HDsprintf(attrname, "attr %d", i);
         H5E_BEGIN_TRY{
             aid =  H5Screate_simple(2, dims, NULL);
             attr_id = H5Acreate2(dataset_id, attrname, H5T_STD_I32BE, aid, H5P_DEFAULT, H5P_DEFAULT);
@@ -439,7 +439,7 @@ main(void)
 	num_errs+=rsrv_vlen();
 
 	if(num_errs > 0)
-	    printf("**** %d FAILURE%s! ****\n", num_errs, num_errs==1?"":"S");
+	    HDprintf("**** %d FAILURE%s! ****\n", num_errs, num_errs==1?"":"S");
 	else
 	    puts("All address space reservation tests passed.");
 
diff --git a/test/space_overflow.c b/test/space_overflow.c
index 15be9ba..8a9bcf6 100644
--- a/test/space_overflow.c
+++ b/test/space_overflow.c
@@ -24,7 +24,7 @@
  *		Don't forget to change H5S_MAX_RANK back to its original
  *		value and recompile once the test file is created.
  */
-#include "hdf5.h"
+#include "h5test.h"
 
 
 /*-------------------------------------------------------------------------
@@ -52,15 +52,15 @@ main(void)
 
     file = H5Fcreate("th5s.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if(file < 0)
-        printf("file<0!\n");
+        HDprintf("file<0!\n");
     for(i = 0; i < H5S_MAX_RANK; i++)
         cur_dim[i] = 1;
     space = H5Screate_simple(H5S_MAX_RANK, cur_dim, NULL);
     if(space < 0)
-        printf("space<0!\n");
+        HDprintf("space<0!\n");
     dset = H5Dcreate2(file, "dset", H5T_NATIVE_UCHAR, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if(dset < 0)
-        printf("dset<0!\n");
+        HDprintf("dset<0!\n");
     H5Sclose(space);
     H5Dclose(dset);
     H5Fclose(file);
diff --git a/test/stab.c b/test/stab.c
index 4296f1c..4b11ed7 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -127,7 +127,7 @@ test_misc(hid_t fapl, hbool_t new_format)
     if(HDstrcmp(comment, "hello world")) {
 	H5_FAILED();
 	puts("    Read the wrong comment string from the group.");
-	printf("    got: \"%s\"\n    ans: \"hello world\"\n", comment);
+	HDprintf("    got: \"%s\"\n    ans: \"hello world\"\n", comment);
 	TEST_ERROR
     }
     if(H5Gclose(g1) < 0) TEST_ERROR
@@ -198,7 +198,7 @@ test_long(hid_t fapl, hbool_t new_format)
         name1[i] = (char)('A' + i%26);
     name1[LONG_NAME_LEN - 1] = '\0';
     name2 = (char *)HDmalloc((size_t)((2 * LONG_NAME_LEN) + 2));
-    sprintf(name2, "%s/%s", name1, name1);
+    HDsprintf(name2, "%s/%s", name1, name1);
 
     /* Create groups */
     if((g1 = H5Gcreate2(fid, name1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -275,7 +275,7 @@ test_large(hid_t fapl, hbool_t new_format)
     if(new_format)
         if(H5G__has_stab_test(cwg) != FALSE) TEST_ERROR
     for(i = 0; i < LARGE_NOBJS; i++) {
-        sprintf(name, "%05d%05d", (HDrandom() % 100000), i);
+        HDsprintf(name, "%05d%05d", (HDrandom() % 100000), i);
 	if((dir = H5Gcreate2(cwg, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
         if(H5Gclose(dir) < 0) TEST_ERROR
     }
@@ -385,7 +385,7 @@ lifecycle(hid_t fapl2)
     if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Create first "bottom" group */
-    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, (unsigned)0);
+    HDsprintf(objname, LIFECYCLE_BOTTOM_GROUP, (unsigned)0);
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
@@ -402,7 +402,7 @@ lifecycle(hid_t fapl2)
     /* Create several more bottom groups, to push the top group almost to a symbol table */
     /* (Start counting at '1', since we've already created one bottom group */
     for(u = 1; u < LIFECYCLE_MAX_COMPACT; u++) {
-        sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+        HDsprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
         /* Check on bottom group's status */
@@ -426,7 +426,7 @@ lifecycle(hid_t fapl2)
     if(oinfo.hdr.nchunks != 1) TEST_ERROR
 
     /* Create one more "bottom" group, which should push top group into using a symbol table */
-    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+    HDsprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
@@ -449,7 +449,7 @@ lifecycle(hid_t fapl2)
 
     /* Unlink objects from top group */
     while(u >= LIFECYCLE_MIN_DENSE) {
-        sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+        HDsprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
 
         if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
@@ -462,7 +462,7 @@ lifecycle(hid_t fapl2)
     if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Unlink one more object from the group, which should transform back to using links */
-    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+    HDsprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
     if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     u--;
 
@@ -472,10 +472,10 @@ lifecycle(hid_t fapl2)
     if(nmsgs != (LIFECYCLE_MIN_DENSE - 1)) TEST_ERROR
 
     /* Unlink last two objects from top group */
-    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+    HDsprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
     if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     u--;
-    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+    HDsprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
     if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check on top group's status */
@@ -691,7 +691,7 @@ read_old(void)
 
     /* Create a bunch of objects in the group */
     for(u = 0; u < READ_OLD_NGROUPS; u++) {
-        sprintf(objname, "Group %u", u);
+        HDsprintf(objname, "Group %u", u);
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
         /* Check on bottom group's status */
@@ -709,7 +709,7 @@ read_old(void)
 
     /* Delete new objects from old group */
     for(u = 0; u < READ_OLD_NGROUPS; u++) {
-        sprintf(objname, "Group %u", u);
+        HDsprintf(objname, "Group %u", u);
         if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
 
@@ -802,7 +802,7 @@ no_compact(hid_t fapl2)
     if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Create first "bottom" group */
-    sprintf(objname, NO_COMPACT_BOTTOM_GROUP, (unsigned)0);
+    HDsprintf(objname, NO_COMPACT_BOTTOM_GROUP, (unsigned)0);
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
@@ -817,7 +817,7 @@ no_compact(hid_t fapl2)
     if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Unlink object from top group */
-    sprintf(objname, NO_COMPACT_BOTTOM_GROUP, (unsigned)0);
+    HDsprintf(objname, NO_COMPACT_BOTTOM_GROUP, (unsigned)0);
     if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check on top group's status */
diff --git a/test/tarray.c b/test/tarray.c
index eb71ad6..0024746 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -65,7 +65,7 @@ typedef struct
 void *test_array_alloc_custom(size_t size, void *info);
 void test_array_free_custom(void *mem, void *info);
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_atomic_1d
  *
@@ -189,7 +189,7 @@ test_array_atomic_1d(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_array_atomic_1d() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_funcs
  *
@@ -252,7 +252,7 @@ test_array_funcs(void)
     CHECK(ret, FAIL, "H5Tclose");
 } /* end test_array_funcs() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_atomic_3d
  *
@@ -381,7 +381,7 @@ test_array_atomic_3d(void)
 
 } /* end test_array_atomic_3d() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_array_atomic
  *
@@ -540,7 +540,7 @@ test_array_array_atomic(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_array_array_atomic() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_compound_atomic
  *
@@ -747,7 +747,7 @@ test_array_compound_atomic(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_array_compound_atomic() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_compound_array
  *
@@ -1006,7 +1006,7 @@ test_array_compound_array(void)
 **      allocated.
 **
 ****************************************************************/
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_alloc_custom
  *
@@ -1045,7 +1045,7 @@ test_array_alloc_custom(size_t size, void *info)
     return ret_value;
 } /* end test_array_alloc_custom() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_free_custom
  *
@@ -1081,7 +1081,7 @@ test_array_free_custom(void *_mem, void *info)
     return;
 } /* end test_array_free_custom() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_vlen_atomic
  *
@@ -1296,7 +1296,7 @@ test_array_vlen_atomic(void)
 
 } /* end test_array_vlen_atomic() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_vlen_array
  *
@@ -1551,7 +1551,7 @@ test_array_vlen_array(void)
 
 } /* end test_array_vlen_array() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array_bkg
  *
@@ -1855,7 +1855,7 @@ test_array_bkg(void)
     HDfree(dtsinfo);
 } /* end test_array_bkg() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compat
  *
@@ -2146,11 +2146,11 @@ test_compat(void)
         CHECK_I(ret, "H5Fclose");
     } /* end if */
     else
-        printf("***cannot open the pre-created compound datatype test file (%s)\n",testfile);
+        HDprintf("***cannot open the pre-created compound datatype test file (%s)\n",testfile);
 
 } /* end test_compat() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_array
  *
@@ -2183,7 +2183,7 @@ test_array(void)
 
 }   /* end test_array() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    cleanup_array
  *
diff --git a/test/tattr.c b/test/tattr.c
index b252dbd..06c6a9a 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -879,8 +879,8 @@ test_attr_compound_read(hid_t fapl)
     for(i = 0; i < ATTR4_DIM1; i++)
         for(j = 0; j < ATTR4_DIM2; j++)
             if(HDmemcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct))) {
-                printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i);
-                printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d);
+                HDprintf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i);
+                HDprintf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d);
                 TestErrPrintf("%d: attribute data different: attr_data4[%d][%d].c=%c, read_data4[%d][%d].c=%c\n", __LINE__, i, j, attr_data4[i][j].c, i, j, read_data4[i][j].c);
             } /* end if */
 
@@ -1017,7 +1017,7 @@ test_attr_scalar_read(hid_t fapl)
 
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!H5_FLT_ABS_EQUAL(rdata, attr_data5))
-        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
+        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
                 "H5Aread", (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__);
 
     /* Get the attribute's dataspace */
@@ -2064,7 +2064,7 @@ test_attr_dense_verify(hid_t loc_id, unsigned max_attr)
     /* Re-open all the attributes by name and verify the data */
     for(u = 0; u < max_attr; u++) {
         /* Open attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Aopen(loc_id, attrname, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Aopen");
 
@@ -2088,7 +2088,7 @@ test_attr_dense_verify(hid_t loc_id, unsigned max_attr)
         CHECK(attr, FAIL, "H5Aopen_by_idx");
 
         /* Verify Name */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         name_len = H5Aget_name(attr, (size_t)ATTR_NAME_LEN, check_name);
         VERIFY(name_len, HDstrlen(attrname), "H5Aget_name");
         if(HDstrcmp(check_name, attrname))
@@ -2182,7 +2182,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl)
     /* Add attributes, until just before converting to dense storage */
     for(u = 0; u < max_compact; u++) {
         /* Create attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -2201,7 +2201,7 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl)
 
     /* Add one more attribute, to push into "dense" storage */
     /* Create attribute */
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Acreate2");
 
@@ -2317,7 +2317,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl)
     /* Add attributes, until just before converting to dense storage */
     for(u = 0; u < max_compact; u++) {
         /* Create attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -2340,7 +2340,7 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl)
 
     /* Add one more attribute, to push into "dense" storage */
     /* Create attribute */
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Acreate2");
 
@@ -2457,7 +2457,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     /* Add attributes, until well into dense storage */
     for(u = 0; u < (max_compact * 2); u++) {
         /* Create attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -2503,7 +2503,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     /* Delete attributes until the attributes revert to compact storage again */
     for(u--; u >= min_dense; u--) {
         /* Delete attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         ret = H5Adelete(dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
 
@@ -2517,7 +2517,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
 
     /* Delete one more attribute, which should cause reversion to compact storage */
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     ret = H5Adelete(dataset, attrname);
     CHECK(ret, FAIL, "H5Adelete");
 
@@ -2530,7 +2530,7 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "test_attr_dense_verify");
 
     /* Delete another attribute, to verify deletion in compact storage */
-    sprintf(attrname, "attr %02u", (u - 1));
+    HDsprintf(attrname, "attr %02u", (u - 1));
     ret = H5Adelete(dataset, attrname);
     CHECK(ret, FAIL, "H5Adelete");
 
@@ -2637,7 +2637,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl)
         /* Add attributes, until well into dense storage */
         for(u = 0; u < (max_compact * 2); u++) {
             /* Create attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
             CHECK(attr, H5I_INVALID_HID, "H5Acreate2");
 
@@ -2650,7 +2650,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Rename attribute */
-            sprintf(new_attrname, "new attr %02u", u);
+            HDsprintf(new_attrname, "new attr %02u", u);
 
             /* Rename attribute */
             ret = H5Arename_by_name(fid, DSET1_NAME, attrname, new_attrname, H5P_DEFAULT);
@@ -2704,7 +2704,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl)
         unsigned    value;          /* Attribute value */
 
         /* Open attribute */
-        sprintf(attrname, "new attr %02u", u);
+        HDsprintf(attrname, "new attr %02u", u);
         attr = H5Aopen(dataset, attrname, H5P_DEFAULT);
         CHECK(attr, H5I_INVALID_HID, "H5Aopen");
 
@@ -2808,7 +2808,7 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl)
     /* Add attributes, until well into dense storage */
     for(u = 0; u < (max_compact * 2); u++) {
         /* Create attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -2947,7 +2947,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
 
     /* Create attribute */
     u = 0;
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Acreate2");
 
@@ -2968,7 +2968,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
 
     /* Create attribute */
     u = 1;
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Acreate2");
 
@@ -3000,7 +3000,7 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
 
     /* Delete attribute */
     u = 0;
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     ret = H5Adelete(dataset, attrname);
     CHECK(ret, FAIL, "H5Adelete");
 
@@ -3103,7 +3103,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     /* Add attributes, until just before converting to dense storage */
     for(u = 0; u < max_compact; u++) {
         /* Create attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -3126,7 +3126,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(sid2, FAIL, "H5Screate_simple");
 
     /* Create attribute */
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Acreate2");
 
@@ -3414,7 +3414,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     /* Delete a few attributes until the storage switches to compact */
     for(u = min_dense-1; u <= max_compact; u++) {
         /* Create attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         add_attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(add_attr, FAIL, "H5Acreate2");
 
@@ -3484,7 +3484,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     /* Add attributes, until just before converting to dense storage */
     for(u = 0; u < max_compact; u++) {
         /* Create attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Acreate2(gid1, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -3646,7 +3646,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
     /* Create attribute */
     u = 0;
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Acreate2");
 
@@ -3665,7 +3665,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
     /* Create attribute */
     u = 1;
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Acreate2");
 
@@ -3684,7 +3684,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
     /* Create attribute */
     u = 2;
-    sprintf(attrname, "attr %02u", u);
+    HDsprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, big_sid, H5P_DEFAULT, H5P_DEFAULT);
     if(low == H5F_LIBVER_LATEST) {
         CHECK(attr, FAIL, "H5Acreate2");
@@ -3708,7 +3708,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
         /* Create attribute */
         u = 3;
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, big_sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -3731,7 +3731,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
         /* Delete attribute */
         u = 1;
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         ret = H5Adelete(dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
 
@@ -3746,7 +3746,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
         /* Delete attribute */
         u = 3;
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         ret = H5Adelete(dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
 
@@ -3761,7 +3761,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
         /* Delete attribute */
         u = 2;
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         ret = H5Adelete(dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
 
@@ -3776,7 +3776,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
         /* Delete attribute */
         u = 0;
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         ret = H5Adelete(dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
 
@@ -4187,7 +4187,7 @@ test_attr_many(hbool_t new_format, hid_t fcpl, hid_t fapl)
 
     /* Create many attributes */
     for(u = 0; u < nattr; u++) {
-        sprintf(attrname, "a-%06u", u);
+        HDsprintf(attrname, "a-%06u", u);
 
         exists = H5Aexists(gid, attrname);
         VERIFY(exists, FALSE, "H5Aexists");
@@ -4240,7 +4240,7 @@ test_attr_many(hbool_t new_format, hid_t fcpl, hid_t fapl)
     for(u = 0; u < nattr; u++) {
         unsigned    value;          /* Attribute value */
 
-        sprintf(attrname, "a-%06u", u);
+        HDsprintf(attrname, "a-%06u", u);
 
         exists = H5Aexists(gid, attrname);
         VERIFY(exists, TRUE, "H5Aexists");
@@ -4480,7 +4480,7 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl)
         /* Create several attributes, but keep storage in compact form */
         for(u = 0; u < max_compact; u++) {
             /* Create attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
             CHECK(attr, FAIL, "H5Acreate2");
 
@@ -4570,7 +4570,7 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl)
             H5A_info_t ainfo;           /* Attribute information */
 
             /* Retrieve information for attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             ret = H5Aget_info_by_name(my_dataset, ".", attrname, &ainfo, H5P_DEFAULT);
             CHECK(ret, FAIL, "H5Aget_info_by_name");
 
@@ -4680,7 +4680,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl)
         /* Create several attributes, but keep storage in compact form */
         for(u = 0; u < max_compact; u++) {
             /* Create attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
             CHECK(attr, FAIL, "H5Acreate2");
 
@@ -4703,7 +4703,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl)
         } /* end for */
 
         /* Create another attribute, to push into dense storage */
-        sprintf(attrname, "attr %02u", max_compact);
+        HDsprintf(attrname, "attr %02u", max_compact);
         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -4797,7 +4797,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl)
             H5A_info_t ainfo;           /* Attribute information */
 
             /* Retrieve information for attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             ret = H5Aget_info_by_name(my_dataset, ".", attrname, &ainfo, H5P_DEFAULT);
             CHECK(ret, FAIL, "H5Aget_info_by_name");
 
@@ -5068,7 +5068,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         /* Create several attributes, but keep storage in compact form */
         for(u = 0; u < max_compact; u++) {
             /* Create attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
             CHECK(attr, FAIL, "H5Acreate2");
 
@@ -5091,7 +5091,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         } /* end for */
 
         /* Create another attribute, to push into dense storage */
-        sprintf(attrname, "attr %02u", max_compact);
+        HDsprintf(attrname, "attr %02u", max_compact);
         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -5119,7 +5119,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
 
         /* Delete several attributes from object, until attribute storage resumes compact form */
         for(u = max_compact; u >= min_dense; u--) {
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             ret = H5Adelete(my_dataset, attrname);
             CHECK(ret, FAIL, "H5Adelete");
 
@@ -5139,7 +5139,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         } /* end for */
 
         /* Delete another attribute, to push attribute storage into compact form */
-        sprintf(attrname, "attr %02u", (min_dense - 1));
+        HDsprintf(attrname, "attr %02u", (min_dense - 1));
         ret = H5Adelete(my_dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
 
@@ -5155,7 +5155,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         /* Re-add attributes to get back into dense form */
         for(u = (min_dense - 1); u < (max_compact + 1); u++) {
             /* Create attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
             CHECK(attr, FAIL, "H5Acreate2");
 
@@ -5243,7 +5243,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
 
         /* Delete several attributes from object, until attribute storage resumes compact form */
         for(u = max_compact; u >= min_dense; u--) {
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             ret = H5Adelete(my_dataset, attrname);
             CHECK(ret, FAIL, "H5Adelete");
 
@@ -5263,7 +5263,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         } /* end for */
 
         /* Delete another attribute, to push attribute storage into compact form */
-        sprintf(attrname, "attr %02u", (min_dense - 1));
+        HDsprintf(attrname, "attr %02u", (min_dense - 1));
         ret = H5Adelete(my_dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
 
@@ -5279,7 +5279,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         /* Re-add attributes to get back into dense form */
         for(u = (min_dense - 1); u < (max_compact + 1); u++) {
             /* Create attribute */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
             CHECK(attr, FAIL, "H5Acreate2");
 
@@ -5308,11 +5308,11 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
 
         /* Delete all attributes */
         for(u = max_compact; u > 0; u--) {
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
             ret = H5Adelete(my_dataset, attrname);
             CHECK(ret, FAIL, "H5Adelete");
         } /* end for */
-        sprintf(attrname, "attr %02u", 0);
+        HDsprintf(attrname, "attr %02u", 0);
         ret = H5Adelete(my_dataset, attrname);
         CHECK(ret, FAIL, "H5Adelete");
     } /* end for */
@@ -5449,7 +5449,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
             /* Create attributes, until attribute storage is in dense form */
             for(u = 0; u < max_compact * 2; u++) {
                 /* Create attribute */
-                sprintf(attrname, "attr %02u", u);
+                HDsprintf(attrname, "attr %02u", u);
                 attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                 CHECK(attr, FAIL, "H5Acreate2");
 
@@ -5785,7 +5785,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
             /* Create attributes, up to limit of compact form */
             for(u = 0; u < max_compact; u++) {
                 /* Create attribute */
-                sprintf(attrname, "attr %02u", u);
+                HDsprintf(attrname, "attr %02u", u);
                 attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                 CHECK(attr, FAIL, "H5Acreate2");
 
@@ -5822,7 +5822,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
             /* Create more attributes, to push into dense form */
             for(; u < (max_compact * 2); u++) {
                 /* Create attribute */
-                sprintf(attrname, "attr %02u", u);
+                HDsprintf(attrname, "attr %02u", u);
                 attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                 CHECK(attr, FAIL, "H5Acreate2");
 
@@ -6023,7 +6023,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     /* Create attributes, up to limit of compact form */
                     for(u = 0; u < max_compact; u++) {
                         /* Create attribute */
-                        sprintf(attrname, "attr %02u", u);
+                        HDsprintf(attrname, "attr %02u", u);
                         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -6095,9 +6095,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                         HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
                         ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
                         if(order == H5_ITER_INC)
-                            sprintf(attrname, "attr %02u", (u + 1));
+                            HDsprintf(attrname, "attr %02u", (u + 1));
                         else
-                            sprintf(attrname, "attr %02u", (max_compact - (u + 2)));
+                            HDsprintf(attrname, "attr %02u", (max_compact - (u + 2)));
                         ret = HDstrcmp(attrname, tmpname);
                         VERIFY(ret, 0, "H5Aget_name_by_idx");
                     } /* end for */
@@ -6133,7 +6133,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     /* Create more attributes, to push into dense form */
                     for(u = 0; u < (max_compact * 2); u++) {
                         /* Create attribute */
-                        sprintf(attrname, "attr %02u", u);
+                        HDsprintf(attrname, "attr %02u", u);
                         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -6220,9 +6220,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                         HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
                         ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
                         if(order == H5_ITER_INC)
-                            sprintf(attrname, "attr %02u", (u + 1));
+                            HDsprintf(attrname, "attr %02u", (u + 1));
                         else
-                            sprintf(attrname, "attr %02u", ((max_compact * 2) - (u + 2)));
+                            HDsprintf(attrname, "attr %02u", ((max_compact * 2) - (u + 2)));
                         ret = HDstrcmp(attrname, tmpname);
                         VERIFY(ret, 0, "H5Aget_name_by_idx");
                     } /* end for */
@@ -6266,7 +6266,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     /* Create attributes, to push into dense form */
                     for(u = 0; u < (max_compact * 2); u++) {
                         /* Create attribute */
-                        sprintf(attrname, "attr %02u", u);
+                        HDsprintf(attrname, "attr %02u", u);
                         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -6331,9 +6331,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                         HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
                         ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
                         if(order == H5_ITER_INC)
-                            sprintf(attrname, "attr %02u", ((u * 2) + 1));
+                            HDsprintf(attrname, "attr %02u", ((u * 2) + 1));
                         else
-                            sprintf(attrname, "attr %02u", ((max_compact * 2) - ((u * 2) + 2)));
+                            HDsprintf(attrname, "attr %02u", ((max_compact * 2) - ((u * 2) + 2)));
                         ret = HDstrcmp(attrname, tmpname);
                         VERIFY(ret, 0, "H5Aget_name_by_idx");
                     } /* end for */
@@ -6380,9 +6380,9 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                         HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
                         ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
                         if(order == H5_ITER_INC)
-                            sprintf(attrname, "attr %02u", ((u * 2) + 3));
+                            HDsprintf(attrname, "attr %02u", ((u * 2) + 3));
                         else
-                            sprintf(attrname, "attr %02u", ((max_compact * 2) - ((u * 2) + 4)));
+                            HDsprintf(attrname, "attr %02u", ((max_compact * 2) - ((u * 2) + 4)));
                         ret = HDstrcmp(attrname, tmpname);
                         VERIFY(ret, 0, "H5Aget_name_by_idx");
                     } /* end for */
@@ -6472,7 +6472,7 @@ HDfprintf(stderr, "op_data->curr = %Hd\n", op_data->curr);
     } /* end if */
 
     /* Verify name of link */
-    sprintf(attrname, "attr %02u", (unsigned)my_info.corder);
+    HDsprintf(attrname, "attr %02u", (unsigned)my_info.corder);
     if(HDstrcmp(attr_name, attrname))
         return(H5_ITER_ERROR);
 
@@ -6981,7 +6981,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     /* Create attributes, up to limit of compact form */
                     for(u = 0; u < max_compact; u++) {
                         /* Create attribute */
-                        sprintf(attrname, "attr %02u", u);
+                        HDsprintf(attrname, "attr %02u", u);
                         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -7051,7 +7051,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     /* Create more attributes, to push into dense form */
                     for(u = max_compact; u < (max_compact * 2); u++) {
                         /* Create attribute */
-                        sprintf(attrname, "attr %02u", u);
+                        HDsprintf(attrname, "attr %02u", u);
                         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -7327,7 +7327,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     /* Create attributes, up to limit of compact form */
                     for(u = 0; u < max_compact; u++) {
                         /* Create attribute */
-                        sprintf(attrname, "attr %02u", u);
+                        HDsprintf(attrname, "attr %02u", u);
                         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -7385,7 +7385,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     /* Create more attributes, to push into dense form */
                     for(u = max_compact; u < (max_compact * 2); u++) {
                         /* Create attribute */
-                        sprintf(attrname, "attr %02u", u);
+                        HDsprintf(attrname, "attr %02u", u);
                         attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                         CHECK(attr, FAIL, "H5Acreate2");
 
@@ -7490,7 +7490,7 @@ attr_open_check(hid_t fid, const char *dsetname, hid_t obj_id,
     /* Open each attribute on object by index and check that it's the correct one */
     for(u = 0; u < max_attrs; u++) {
         /* Open the attribute */
-        sprintf(attrname, "attr %02u", u);
+        HDsprintf(attrname, "attr %02u", u);
         attr_id = H5Aopen(obj_id, attrname, H5P_DEFAULT);
         CHECK(attr_id, FAIL, "H5Aopen");
 
@@ -7655,7 +7655,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             /* Create attributes, up to limit of compact form */
             for(u = 0; u < max_compact; u++) {
                 /* Create attribute */
-                sprintf(attrname, "attr %02u", u);
+                HDsprintf(attrname, "attr %02u", u);
                 attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                 CHECK(attr, FAIL, "H5Acreate2");
 
@@ -7722,7 +7722,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             /* Create more attributes, to push into dense form */
             for(u = max_compact; u < (max_compact * 2); u++) {
                 /* Create attribute */
-                sprintf(attrname, "attr %02u", u);
+                HDsprintf(attrname, "attr %02u", u);
                 attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
                 CHECK(attr, FAIL, "H5Acreate2");
 
@@ -7899,7 +7899,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             /* Create attributes, up to limit of compact form */
             for(u = 0; u < max_compact; u++) {
                 /* Create attribute */
-                sprintf(attrname, "attr %02u", u);
+                HDsprintf(attrname, "attr %02u", u);
                 attr = H5Acreate_by_name(fid, dsetname, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
                 CHECK(attr, FAIL, "H5Acreate_by_name");
 
@@ -7956,7 +7956,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             /* Create more attributes, to push into dense form */
             for(u = max_compact; u < (max_compact * 2); u++) {
                 /* Create attribute */
-                sprintf(attrname, "attr %02u", u);
+                HDsprintf(attrname, "attr %02u", u);
                 attr = H5Acreate_by_name(fid, dsetname, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
                 CHECK(attr, FAIL, "H5Acreate_by_name");
 
@@ -8175,7 +8175,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
             /* Create attribute name */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
 
             /* Alternate between creating "small" & "big" attributes */
             if(u % 2) {
@@ -8501,7 +8501,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
             /* Create attribute name */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
 
             /* Alternate between creating "small" & "big" attributes */
             if(u % 2) {
@@ -8608,7 +8608,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
 
 
             /* Create new attribute name */
-            sprintf(attrname2, "new attr %02u", u);
+            HDsprintf(attrname2, "new attr %02u", u);
 
             /* Change second dataset's attribute's name */
             ret = H5Arename_by_name(fid, DSET2_NAME, attrname, attrname2, H5P_DEFAULT);
@@ -8942,7 +8942,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
             /* Create attribute name */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
 
             /* Alternate between creating "small" & "big" attributes */
             if(u % 2) {
@@ -9052,7 +9052,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
         /* Delete attributes from second dataset */
         for(u = 0; u < max_compact * 2; u++) {
             /* Create attribute name */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
 
             /* Delete second dataset's attribute */
             ret = H5Adelete_by_name(fid, DSET2_NAME, attrname, H5P_DEFAULT);
@@ -9306,7 +9306,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
             /* Create attribute name */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
 
             /* Alternate between creating "small" & "big" attributes */
             if(u % 2) {
@@ -9433,7 +9433,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
         /* Check ref count on  attributes of first dataset */
         for(u = 0; u < max_compact * 2; u++) {
             /* Create attribute name */
-            sprintf(attrname, "attr %02u", u);
+            HDsprintf(attrname, "attr %02u", u);
 
             /* Open attribute on first dataset */
             attr = H5Aopen(dataset, attrname, H5P_DEFAULT);
@@ -9705,7 +9705,7 @@ test_attr_bug2(hid_t fcpl, hid_t fapl)
 
     /* Create attributes on group */
     for (i=0; i<BUG2_NATTR; i++) {
-        sprintf(aname, "%03u", i);
+        HDsprintf(aname, "%03u", i);
         aid = H5Acreate2(gid, aname, H5T_STD_I32LE, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(aid, FAIL, "H5Acreate2");
 
@@ -9715,7 +9715,7 @@ test_attr_bug2(hid_t fcpl, hid_t fapl)
 
     /* Delete every other attribute */
     for (i=1; i<BUG2_NATTR; i+=2) {
-        sprintf(aname, "%03u", i);
+        HDsprintf(aname, "%03u", i);
         ret = H5Adelete(gid, aname);
         CHECK(ret, FAIL, "H5Adelete");
     }
@@ -9739,7 +9739,7 @@ test_attr_bug2(hid_t fcpl, hid_t fapl)
 
     /* Open an attribute in the middle */
     i = (BUG2_NATTR / 4) * 2;
-    sprintf(aname, "%03u", i);
+    HDsprintf(aname, "%03u", i);
     aid = H5Aopen(gid, aname, H5P_DEFAULT);
     CHECK(aid, FAIL, "H5Aopen");
 
@@ -9782,7 +9782,7 @@ test_attr_bug2(hid_t fcpl, hid_t fapl)
 
     /* Create attributes on group */
     for (i=0; i<BUG2_NATTR2; i++) {
-        sprintf(aname, "%03u", i);
+        HDsprintf(aname, "%03u", i);
         aid = H5Acreate2(gid, aname, H5T_STD_I32LE, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(aid, FAIL, "H5Acreate2");
 
@@ -9792,7 +9792,7 @@ test_attr_bug2(hid_t fcpl, hid_t fapl)
 
     /* Delete every other attribute */
     for (i=0; i<BUG2_NATTR2; i++) {
-        sprintf(aname, "%03u", i);
+        HDsprintf(aname, "%03u", i);
         ret = H5Adelete(gid, aname);
         CHECK(ret, FAIL, "H5Adelete");
     }
diff --git a/test/tcheck_version.c b/test/tcheck_version.c
index c2b454f..bbc0f52 100644
--- a/test/tcheck_version.c
+++ b/test/tcheck_version.c
@@ -29,7 +29,7 @@
 
 #include "h5test.h"
 
-#define	progname	"tcheck_version"
+#define    progname    "tcheck_version"
 
 /* prototypes */
 void showhelp(void);
@@ -37,20 +37,20 @@ void parse(int ac, char **av);
 void abort_intercept (int H5_ATTR_UNUSED sig);
 
 /* global variables */
-unsigned	major = H5_VERS_MAJOR;
-unsigned	minor = H5_VERS_MINOR;
-unsigned	release = H5_VERS_RELEASE;
+unsigned    major = H5_VERS_MAJOR;
+unsigned    minor = H5_VERS_MINOR;
+unsigned    release = H5_VERS_RELEASE;
 
 void
 showhelp(void)
 {
-    printf("Usage: " progname " [-h] [-t<vers>]\n");
-    printf("\t-h\tShow this page and version information\n");
-    printf("\t-t<vers>: Test by changing (adding 1 to) the <vers> to trigger\n");
-    printf("\t\t  the warning. <vers> can be:\n");
-    printf("\t\t\tM for Major version number (%d)\n", H5_VERS_MAJOR);
-    printf("\t\t\tm for Minor version number (%d)\n", H5_VERS_MINOR);
-    printf("\t\t\tr for Release number (%d)\n", H5_VERS_RELEASE);
+    HDprintf("Usage: " progname " [-h] [-t<vers>]\n");
+    HDprintf("\t-h\tShow this page and version information\n");
+    HDprintf("\t-t<vers>: Test by changing (adding 1 to) the <vers> to trigger\n");
+    HDprintf("\t\t  the warning. <vers> can be:\n");
+    HDprintf("\t\t\tM for Major version number (%d)\n", H5_VERS_MAJOR);
+    HDprintf("\t\t\tm for Minor version number (%d)\n", H5_VERS_MINOR);
+    HDprintf("\t\t\tr for Release number (%d)\n", H5_VERS_RELEASE);
 }
 
 
@@ -60,36 +60,36 @@ parse(int ac, char **av)
     char *pt;
 
     while (--ac > 0){
-	pt = *(++av);
-	if (*pt != '-') {
-	    fprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
-	    exit(EXIT_FAILURE);
-	}else{
-	    switch(*(++pt)) {
-		case 't': 	/* option -t */
-		    switch(*(++pt)) {
-			case 'M':
-			    major++;
-			    break;
-			case 'm':
-			    minor++;
-			    break;
-			case 'r':
-			    release++;
-			    break;
-			default:
-			    fprintf(stderr, "Unknown -v parameter (%s). Aborted.\n", *av);
-			    exit(EXIT_FAILURE);
-		    }
-		    break;
-		case 'h':	/* help page */
-		    showhelp();
-		    exit(EXIT_SUCCESS);
-		default:
-		    fprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
-		    exit(EXIT_FAILURE);
-	    }
-	}
+    pt = *(++av);
+    if (*pt != '-') {
+        HDfprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
+        HDexit(EXIT_FAILURE);
+    }else{
+        switch(*(++pt)) {
+        case 't':     /* option -t */
+            switch(*(++pt)) {
+            case 'M':
+                major++;
+                break;
+            case 'm':
+                minor++;
+                break;
+            case 'r':
+                release++;
+                break;
+            default:
+                HDfprintf(stderr, "Unknown -v parameter (%s). Aborted.\n", *av);
+                HDexit(EXIT_FAILURE);
+            }
+            break;
+        case 'h':    /* help page */
+            showhelp();
+            HDexit(EXIT_SUCCESS);
+        default:
+            HDfprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
+            HDexit(EXIT_FAILURE);
+        }
+    }
     }
 }
 
diff --git a/test/tconfig.c b/test/tconfig.c
index fe4f400..1a81d50 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -19,7 +19,6 @@
 *
 *************************************************************/
 
-#include "hdf5.h"
 #include "testhdf5.h"
 
 /* macros definitions */
@@ -40,22 +39,22 @@
 /* Needs this extra step so that we can print the macro name. */
 #define vrfy_macrosize(type, macro, macroname) \
     if (sizeof(type) != macro) \
-	TestErrPrintf("Error: sizeof(%s) is %d but %s is %d\n", \
-	    #type, sizeof(type), macroname, macro);
+    TestErrPrintf("Error: sizeof(%s) is %zu but %s is %d\n", \
+        #type, sizeof(type), macroname, (int)macro);
 
 /* local routine prototypes */
 void test_config_ctypes(void);
 void test_exit_definitions(void);
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_configure
+ * Function:    test_configure
  *
- * Purpose:	Main configure definitions testing routine
+ * Purpose:    Main configure definitions testing routine
  *
- * Return:	none (error is fed back via global variable num_errs)
+ * Return:    none (error is fed back via global variable num_errs)
  *
- * Programmer:	Albert Cheng
+ * Programmer:    Albert Cheng
  *              September 25, 2001
  *
  *-------------------------------------------------------------------------
@@ -69,15 +68,15 @@ test_configure(void)
     test_exit_definitions();
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_configure
+ * Function:    cleanup_configure
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Albert Cheng
+ * Programmer:    Albert Cheng
  *              September 25, 2001
  *
  * Modifications:
@@ -90,20 +89,20 @@ cleanup_configure(void)
     /* no file to clean */
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_config_ctypes
+ * Function:    test_config_ctypes
  *
- * Purpose:	test C language data type sizes
+ * Purpose:    test C language data type sizes
  *
- * Return:	none (error is fed back via global variable num_errs)
+ * Return:    none (error is fed back via global variable num_errs)
  *
- * Programmer:	Albert Cheng
+ * Programmer:    Albert Cheng
  *              September 25, 2001
  *
  * Modifications:
- *	Albert Cheng, 2004/10/14
- *	Verified both signed and unsigned int types.
+ *    Albert Cheng, 2004/10/14
+ *    Verified both signed and unsigned int types.
  *
  *-------------------------------------------------------------------------
  */
@@ -201,15 +200,15 @@ test_config_ctypes(void)
 
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_exit_definitions
+ * Function:    test_exit_definitions
  *
- * Purpose:	test the exit macros values
+ * Purpose:    test the exit macros values
  *
- * Return:	none (error is fed back via global variable num_errs)
+ * Return:    none (error is fed back via global variable num_errs)
  *
- * Programmer:	Albert Cheng
+ * Programmer:    Albert Cheng
  *              October 12, 2009
  *
  * Modifications:
@@ -222,9 +221,9 @@ test_exit_definitions(void)
     /* Verify the EXIT_SUCCESS and EXIT_FAILURE are 0 and 1 respectively. */
     /* This should be true for POSIX compliant systems. */
     if (EXIT_SUCCESS != 0) \
-	TestErrPrintf("Error: EXIT_SUCCESS is %d, should be %d\n", \
-	    EXIT_SUCCESS, 0);
+    TestErrPrintf("Error: EXIT_SUCCESS is %d, should be %d\n", \
+        EXIT_SUCCESS, 0);
     if (EXIT_FAILURE != 1) \
-	TestErrPrintf("Error: EXIT_FAILURE is %d, should be %d\n", \
-	    EXIT_FAILURE, 1);
+    TestErrPrintf("Error: EXIT_FAILURE is %d, should be %d\n", \
+        EXIT_FAILURE, 1);
 }
diff --git a/test/testframe.c b/test/testframe.c
index 80a3e01..231bcc9 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -15,7 +15,7 @@
  * Programmer:  Quincey Koziol <koziol@ncsa.uiuc.edu>
  *              Tuesday, January  6, 2004
  *
- * Purpose:	Provides support functions for the testing framework.
+ * Purpose:    Provides support functions for the testing framework.
  *
  */
 
@@ -29,34 +29,34 @@
 #define MAXTESTDESC     64
 
 typedef struct TestStruct {
-	int    NumErrors;
-	char   Description[MAXTESTDESC];
-	int    SkipFlag;
-	char   Name[MAXTESTNAME];
-	void (*Call)(void);
-	void (*Cleanup)(void);
-	const void *Parameters;
+    int    NumErrors;
+    char   Description[MAXTESTDESC];
+    int    SkipFlag;
+    char   Name[MAXTESTNAME];
+    void (*Call)(void);
+    void (*Cleanup)(void);
+    const void *Parameters;
 } TestStruct;
 
 
 /*
  * Variables used by testing framework.
  */
-static int num_errs = 0;        /* Total number of errors during testing */
+static int enable_error_stack = 0;   /* enable error stack; disable=0 enable=1 */
+static int num_errs = 0;             /* Total number of errors during testing */
 int TestVerbosity = VERBO_DEF;       /* Default Verbosity is Low */
-static int Summary = 0;		/* Show test summary. Default is no. */
-static int CleanUp = 1;		/* Do cleanup or not. Default is yes. */
-static int TestExpress = -1;	/* Do TestExpress or not. -1 means not set yet. */
-static H5E_auto_t	*PrintErrorStackFunc;
-static void		**PrintErrorStackData;
-static TestStruct Test[MAXNUMOFTESTS];
-static int    Index = 0;
+static int Summary = 0;         /* Show test summary. Default is no. */
+static int CleanUp = 1;         /* Do cleanup or not. Default is yes. */
+static int TestExpress = -1;    /* Do TestExpress or not. -1 means not set yet. */
+static TestStruct *Test = NULL; /* Array of tests */
+static unsigned TestAlloc = 0;  /* Size of the Test array */
+static unsigned Index = 0;
 static const void *Test_parameters = NULL;
 static const char *TestProgName = NULL;
 static void (*TestPrivateUsage)(void) = NULL;
 static int (*TestPrivateParser)(int ac, char *av[]) = NULL;
 
-
+
 /*
  * Setup a test function and add it to the list of tests.
  *      It must have no parameters and returns void.
@@ -75,30 +75,44 @@ AddTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), con
 {
     /* Sanity checking */
     if (Index >= MAXNUMOFTESTS) {
-        printf("Too many tests added, increase MAXNUMOFTESTS(%d).\n",
-		MAXNUMOFTESTS);
-        exit(EXIT_FAILURE);
+        HDprintf("Too many tests added, increase MAXNUMOFTESTS(%d).\n", MAXNUMOFTESTS);
+        HDexit(EXIT_FAILURE);
     }                           /* end if */
     if (HDstrlen(TheDescr) >= MAXTESTDESC) {
-        printf("Test description too long, increase MAXTESTDESC(%d).\n",
-		MAXTESTDESC);
-        exit(EXIT_FAILURE);
+        HDprintf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n", TheDescr, MAXTESTDESC);
+        HDexit(EXIT_FAILURE);
     } /* end if */
     if (HDstrlen(TheName) >= MAXTESTNAME) {
-        printf("Test name too long, increase MAXTESTNAME(%d).\n",
-		MAXTESTNAME);
-        exit(EXIT_FAILURE);
+        HDprintf("Test name too long, increase MAXTESTNAME(%d).\n",
+                MAXTESTNAME);
+        HDexit(EXIT_FAILURE);
+    } /* end if */
+
+    /* Check for increasing the Test array size */
+    if(Index >= TestAlloc) {
+        TestStruct *newTest = Test;        /* New array of tests */
+        unsigned newAlloc = MAX(1, TestAlloc * 2);      /* New array size */
+
+        /* Reallocate array */
+        if(NULL == (newTest = (TestStruct *)HDrealloc(Test, newAlloc * sizeof(TestStruct)))) {
+            HDprintf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc, newAlloc);
+            exit(EXIT_FAILURE);
+        } /* end if */
+
+        /* Update info */
+        Test = newTest;
+        TestAlloc = newAlloc;
     } /* end if */
 
     /* Set up test function */
     HDstrcpy(Test[Index].Description, TheDescr);
-    if (*TheName != '-'){
-	HDstrcpy(Test[Index].Name, TheName);
-	Test[Index].SkipFlag = 0;
+    if(*TheName != '-') {
+        HDstrcpy(Test[Index].Name, TheName);
+        Test[Index].SkipFlag = 0;
     }
-    else {	/* skip test by default */
-	HDstrcpy(Test[Index].Name, TheName+1);
-	Test[Index].SkipFlag = 1;
+    else {    /* skip test by default */
+        HDstrcpy(Test[Index].Name, TheName+1);
+        Test[Index].SkipFlag = 1;
     }
     Test[Index].Call = TheCall;
     Test[Index].Cleanup = Cleanup;
@@ -109,7 +123,7 @@ AddTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), con
     Index++;
 }
 
-
+
 /*
  * Initialize testing framework
  *
@@ -121,74 +135,73 @@ AddTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), con
  *      private options.  Default to NULL which means none is provided.
  *
  * Modifications:
- *     	Albert Cheng 2004/08/17
- *     	Added the ProgName, private_usage and private_parser arguments.
+ *         Albert Cheng 2004/08/17
+ *         Added the ProgName, private_usage and private_parser arguments.
  */
 void TestInit(const char *ProgName, void (*private_usage)(void), int (*private_parser)(int ac, char *av[]))
 {
-    /* Save error printing settings */
-    H5Eget_auto2(H5E_DEFAULT, PrintErrorStackFunc, PrintErrorStackData);
     /*
      * Turn off automatic error reporting since we do it ourselves.  Besides,
      * half the functions this test calls are private, so automatic error
      * reporting wouldn't do much good since it's triggered at the API layer.
      */
-    PrintErrorStackOff();
+    if (enable_error_stack == 0)
+        H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     /*
      * Record the program name and private routines if provided.
      */
     TestProgName = ProgName;
-    if (NULL != private_usage)
-	TestPrivateUsage = private_usage;
-    if (NULL != private_parser)
-	TestPrivateParser = private_parser;
+    if(NULL != private_usage)
+        TestPrivateUsage = private_usage;
+    if(NULL != private_parser)
+        TestPrivateParser = private_parser;
 }
 
-
+
 /*
  * Print test usage.
- *	First print the common test options, then the extra options if provided.
+ *    First print the common test options, then the extra options if provided.
  *
  * Modification:
- * 	2004/08/18 Albert Cheng.  Add TestPrivateUsage feature.
+ *     2004/08/18 Albert Cheng.  Add TestPrivateUsage feature.
  */
 void TestUsage(void)
 {
-	int i;
-
-	print_func("Usage: %s [-v[erbose] (l[ow]|m[edium]|h[igh]|0-9)] %s\n",
-	    TestProgName, (TestPrivateUsage ? "<extra options>" : ""));
-	print_func("              [-[e]x[clude] name]+ \n");
-	print_func("              [-o[nly] name]+ \n");
-	print_func("              [-b[egin] name] \n");
-	print_func("              [-s[ummary]]  \n");
-	print_func("              [-c[leanoff]]  \n");
-	print_func("              [-h[elp]]  \n");
-	print_func("\n\n");
-	print_func("verbose   controls the amount of information displayed\n");
-	print_func("exclude   to exclude tests by name\n");
-	print_func("only      to name tests which should be run\n");
-	print_func("begin     start at the name of the test givin\n");
-	print_func("summary   prints a summary of test results at the end\n");
-	print_func("cleanoff  does not delete *.hdf files after execution of tests\n");
-	print_func("help      print out this information\n");
-	if (TestPrivateUsage){
-	    print_func("\nExtra options\n");
-	    TestPrivateUsage();
-	}
-	print_func("\n\n");
-	print_func("This program currently tests the following: \n\n");
-	print_func("%16s %s\n", "Name", "Description");
-	print_func("%16s %s\n", "----", "-----------");
-
-	for (i = 0; i < Index; i++)
-		print_func("%16s %s\n", Test[i].Name, Test[i].Description);
-
-	print_func("\n\n");
+    unsigned i;
+
+    print_func("Usage: %s [-v[erbose] (l[ow]|m[edium]|h[igh]|0-9)] %s\n",
+            TestProgName, (TestPrivateUsage ? "<extra options>" : ""));
+    print_func("              [-[e]x[clude] name]+ \n");
+    print_func("              [-o[nly] name]+ \n");
+    print_func("              [-b[egin] name] \n");
+    print_func("              [-s[ummary]]  \n");
+    print_func("              [-c[leanoff]]  \n");
+    print_func("              [-h[elp]]  \n");
+    print_func("\n\n");
+    print_func("verbose   controls the amount of information displayed\n");
+    print_func("exclude   to exclude tests by name\n");
+    print_func("only      to name tests which should be run\n");
+    print_func("begin     start at the name of the test givin\n");
+    print_func("summary   prints a summary of test results at the end\n");
+    print_func("cleanoff  does not delete *.hdf files after execution of tests\n");
+    print_func("help      print out this information\n");
+    if (TestPrivateUsage){
+        print_func("\nExtra options\n");
+        TestPrivateUsage();
+    }
+    print_func("\n\n");
+    print_func("This program currently tests the following: \n\n");
+    print_func("%16s %s\n", "Name", "Description");
+    print_func("%16s %s\n", "----", "-----------");
+
+    for (i = 0; i < Index; i++)
+        print_func("%16s %s\n", Test[i].Name, Test[i].Description);
+
+    print_func("\n\n");
 }
 
-
+
 /*
  * Print test info.
  */
@@ -202,7 +215,7 @@ void TestInfo(const char *ProgName)
     print_func("Linked with hdf5 version %u.%u release %u\n", major, minor, release);
 }
 
-
+
 /*
  * Parse command line information.
  *      argc, argv: the usual command line argument count and strings
@@ -211,87 +224,94 @@ void TestInfo(const char *ProgName)
  *    exit EXIT_FAILURE if error is encountered.
  *
  * Modification:
- * 	2004/08/18 Albert Cheng.  Add extra_parse feature.
+ *     2004/08/18 Albert Cheng.  Add extra_parse feature.
  */
 void TestParseCmdLine(int argc, char *argv[])
 {
     int ret_code;
 
     while (argv++, --argc > 0){
-	if ((HDstrcmp(*argv, "-verbose") == 0) ||
-				(HDstrcmp(*argv, "-v") == 0)) {
-	    if (argc > 0){
-		--argc; ++argv;
-		ParseTestVerbosity(*argv);
-	    }else{
-		TestUsage();
-		exit(EXIT_FAILURE);
-	    }
-	}
-	else if (((HDstrcmp(*argv, "-exclude") == 0) ||
-				    (HDstrcmp(*argv, "-x") == 0))) {
-	    if (argc > 0){
-		--argc; ++argv;
-		SetTest(*argv, SKIPTEST);
-	    }else{
-		TestUsage();
-		exit(EXIT_FAILURE);
-	    }
-	}
-	else if (((HDstrcmp(*argv, "-begin") == 0) ||
-				    (HDstrcmp(*argv, "-b") == 0))) {
-	    if (argc > 0){
-		--argc; ++argv;
-		SetTest(*argv, BEGINTEST);
-	    }else{
-		TestUsage();
-		exit(EXIT_FAILURE);
-	    }
-	}
-	else if (((HDstrcmp(*argv, "-only") == 0) ||
-				    (HDstrcmp(*argv, "-o") == 0))) {
-	    if (argc > 0){
-		int Loop;
-		--argc; ++argv;
-		/* Skip all tests, then activate only one. */
-		for (Loop = 0; Loop < Index; Loop++)
-		    Test[Loop].SkipFlag = 1;
-		SetTest(*argv, ONLYTEST);
-	    }else{
-		TestUsage();
-		exit(EXIT_FAILURE);
-	    }
-	}
-	else if ((HDstrcmp(*argv, "-summary") == 0) || (HDstrcmp(*argv, "-s") == 0))
+        if ((HDstrcmp(*argv, "-verbose") == 0) || (HDstrcmp(*argv, "-v") == 0)) {
+            if (argc > 0){
+                --argc; ++argv;
+                ParseTestVerbosity(*argv);
+            }
+            else{
+                TestUsage();
+                HDexit(EXIT_FAILURE);
+            }
+        }
+        else if (((HDstrcmp(*argv, "-exclude") == 0) ||
+                (HDstrcmp(*argv, "-x") == 0))) {
+            if (argc > 0){
+                --argc; ++argv;
+                SetTest(*argv, SKIPTEST);
+            }
+            else{
+                TestUsage();
+                HDexit(EXIT_FAILURE);
+            }
+        }
+        else if (((HDstrcmp(*argv, "-begin") == 0) ||
+                (HDstrcmp(*argv, "-b") == 0))) {
+            if (argc > 0){
+                --argc; ++argv;
+                SetTest(*argv, BEGINTEST);
+            }
+            else{
+                TestUsage();
+                HDexit(EXIT_FAILURE);
+            }
+        }
+        else if (((HDstrcmp(*argv, "-only") == 0) ||
+                (HDstrcmp(*argv, "-o") == 0))) {
+            if(argc > 0) {
+                unsigned Loop;
+
+                --argc; ++argv;
+
+                /* Skip all tests, then activate only one. */
+                for(Loop = 0; Loop < Index; Loop++)
+                    Test[Loop].SkipFlag = 1;
+                SetTest(*argv, ONLYTEST);
+            }
+            else{
+                TestUsage();
+                HDexit(EXIT_FAILURE);
+            }
+        }
+        else if ((HDstrcmp(*argv, "-summary") == 0) || (HDstrcmp(*argv, "-s") == 0))
             Summary = 1;
-	else if ((HDstrcmp(*argv, "-help") == 0) || (HDstrcmp(*argv, "-h") == 0)) {
+        else if (HDstrcmp(*argv, "-enable-error-stack") == 0)
+            enable_error_stack = 1;
+        else if ((HDstrcmp(*argv, "-help") == 0) || (HDstrcmp(*argv, "-h") == 0)) {
             TestUsage();
-            exit(EXIT_SUCCESS);
+            HDexit(EXIT_SUCCESS);
+        }
+        else if ((HDstrcmp(*argv, "-cleanoff") == 0) || (HDstrcmp(*argv, "-c") == 0))
+            SetTestNoCleanup();
+        else {
+            /* non-standard option.  Break out. */
+            break;
         }
-	else if ((HDstrcmp(*argv, "-cleanoff") == 0) || (HDstrcmp(*argv, "-c") == 0))
-	    SetTestNoCleanup();
-	else {
-	    /* non-standard option.  Break out. */
-	    break;
-	}
 
     }
 
     /* Call extra parsing function if provided. */
     if (NULL != TestPrivateParser){
-	ret_code=TestPrivateParser(argc+1, argv-1);
-	if (ret_code != 0)
-	    exit(EXIT_FAILURE);
+        ret_code=TestPrivateParser(argc+1, argv-1);
+        if (ret_code != 0)
+            HDexit(EXIT_FAILURE);
     }
 }
 
-
+
 /*
  * Perform Tests.
  */
 void PerformTests(void)
 {
-    int                     Loop;
+    unsigned                     Loop;
 
     for (Loop = 0; Loop < Index; Loop++)
         if (Test[Loop].SkipFlag) {
@@ -300,10 +320,10 @@ void PerformTests(void)
             MESSAGE(2, ("Testing  -- %s (%s) \n", Test[Loop].Description, Test[Loop].Name));
             MESSAGE(5, ("===============================================\n"));
             Test[Loop].NumErrors = num_errs;
-	    Test_parameters = Test[Loop].Parameters;
-	    ALARM_ON;
+            Test_parameters = Test[Loop].Parameters;
+            ALARM_ON;
             Test[Loop].Call();
-	    ALARM_OFF;
+            ALARM_OFF;
             Test[Loop].NumErrors = num_errs - Test[Loop].NumErrors;
             MESSAGE(5, ("===============================================\n"));
             MESSAGE(5, ("There were %d errors detected.\n\n", (int)Test[Loop].NumErrors));
@@ -318,13 +338,13 @@ void PerformTests(void)
         print_func("All tests were successful. \n\n");
 }
 
-
+
 /*
  * Display test summary.
  */
 void TestSummary(void)
 {
-    int                     Loop;
+    unsigned                     Loop;
 
     print_func("Summary of Test Results:\n");
     print_func("Name of Test     Errors Description of Test\n");
@@ -340,13 +360,13 @@ void TestSummary(void)
     print_func("\n\n");
 }
 
-
+
 /*
  * Cleanup files from testing
  */
 void TestCleanup(void)
 {
-    int                     Loop;
+    unsigned                     Loop;
 
     MESSAGE(2, ("\nCleaning Up temp files...\n\n"));
 
@@ -356,7 +376,17 @@ void TestCleanup(void)
             Test[Loop].Cleanup();
 }
 
-
+
+/*
+ * Shutdown the test infrastructure
+ */
+void TestShutdown(void)
+{
+    if(Test)
+        HDfree(Test);
+}
+
+
 /*
  * Retrieve the verbosity level for the testing framework
  */
@@ -412,18 +442,18 @@ int GetTestExpress(void)
     /* set it here for now.  Should be done in something like h5test_init(). */
     if(TestExpress==-1)
     {
-       env_val = getenv("HDF5TestExpress");
-
-       if(env_val == NULL)
-         SetTestExpress(1);
-       else if(strcmp(env_val, "0") == 0)
-         SetTestExpress(0);
-       else if(strcmp(env_val, "1") == 0)
-         SetTestExpress(1);
-       else if(strcmp(env_val, "2") == 0)
-         SetTestExpress(2);
-       else
-         SetTestExpress(3);
+        env_val = getenv("HDF5TestExpress");
+
+        if(env_val == NULL)
+            SetTestExpress(1);
+        else if(strcmp(env_val, "0") == 0)
+            SetTestExpress(0);
+        else if(strcmp(env_val, "1") == 0)
+            SetTestExpress(1);
+        else if(strcmp(env_val, "2") == 0)
+            SetTestExpress(2);
+        else
+            SetTestExpress(3);
     }
 
     return(TestExpress);
@@ -480,16 +510,16 @@ int SetTestNoCleanup(void)
 void ParseTestVerbosity(char *argv)
 {
     if (*argv == 'l')
-	SetTestVerbosity(VERBO_LO);
+        SetTestVerbosity(VERBO_LO);
     else if (*argv == 'm')
-	SetTestVerbosity(VERBO_MED);
+        SetTestVerbosity(VERBO_MED);
     else if (*argv == 'h')
-	SetTestVerbosity(VERBO_HI);
+        SetTestVerbosity(VERBO_HI);
     else
-	SetTestVerbosity(atoi(argv));
+        SetTestVerbosity(atoi(argv));
 }
 
-
+
 /*
  * Retrieve the number of testing errors for the testing framework
  */
@@ -498,7 +528,7 @@ int GetTestNumErrs(void)
     return(num_errs);
 }
 
-
+
 /*
  * Increment the number of testing errors
  */
@@ -507,7 +537,7 @@ void IncTestNumErrs(void)
     num_errs++;
 }
 
-
+
 /*
  * Retrieve the current Test Parameters pointer.
  */
@@ -516,7 +546,7 @@ const void *GetTestParameters(void)
     return(Test_parameters);
 }
 
-
+
 /*
  * This routine is designed to provide equivalent functionality to 'printf'
  * and also increment the error count for the testing framework.
@@ -531,15 +561,15 @@ TestErrPrintf(const char *format, ...)
     num_errs++;
 
     /* Print the requested information */
-    va_start(arglist, format);
-    ret_value = vprintf(format, arglist);
-    va_end(arglist);
+    HDva_start(arglist, format);
+    ret_value = HDvprintf(format, arglist);
+    HDva_end(arglist);
 
     /* Return the length of the string produced (like printf() does) */
     return ret_value;
 }
 
-
+
 /*
  * Set (control) which test will be tested.
  * SKIPTEST: skip this test
@@ -549,48 +579,49 @@ TestErrPrintf(const char *format, ...)
  */
 void SetTest(const char *testname, int action)
 {
-    int Loop;
+    unsigned Loop;
+
     switch (action){
-	case SKIPTEST:
-	    for (Loop = 0; Loop < Index; Loop++)
-		if (HDstrcmp(testname, Test[Loop].Name) == 0){
-		    Test[Loop].SkipFlag = 1;
-		    break;
-		}
-	    break;
-	case BEGINTEST:
-	    for (Loop = 0; Loop < Index; Loop++) {
-		if (HDstrcmp(testname, Test[Loop].Name) != 0)
-		    Test[Loop].SkipFlag = 1;
-		else{
-		    /* Found it. Set it to run.  Done. */
-		    Test[Loop].SkipFlag = 0;
-		    break;
-		}
-	    }
-	    break;
-	case ONLYTEST:
-	    for (Loop = 0; Loop < Index; Loop++) {
-		if (HDstrcmp(testname, Test[Loop].Name) != 0)
-		    Test[Loop].SkipFlag = 1;
-		else {
-		    /* Found it. Set it to run. Break to skip the rest. */
-		    Test[Loop].SkipFlag = 0;
-		    break;
-		}
-	    }
-	    /* skip the rest */
-	    while (++Loop < Index)
-		Test[Loop].SkipFlag = 1;
-	    break;
-	default:
-	    /* error */
-	    printf("*** ERROR: Unknown action (%d) for SetTest\n", action);
-	    break;
+    case SKIPTEST:
+        for (Loop = 0; Loop < Index; Loop++)
+            if (HDstrcmp(testname, Test[Loop].Name) == 0){
+                Test[Loop].SkipFlag = 1;
+                break;
+            }
+        break;
+    case BEGINTEST:
+        for (Loop = 0; Loop < Index; Loop++) {
+            if (HDstrcmp(testname, Test[Loop].Name) != 0)
+                Test[Loop].SkipFlag = 1;
+            else{
+                /* Found it. Set it to run.  Done. */
+                Test[Loop].SkipFlag = 0;
+                break;
+            }
+        }
+        break;
+    case ONLYTEST:
+        for (Loop = 0; Loop < Index; Loop++) {
+            if (HDstrcmp(testname, Test[Loop].Name) != 0)
+                Test[Loop].SkipFlag = 1;
+            else {
+                /* Found it. Set it to run. Break to skip the rest. */
+                Test[Loop].SkipFlag = 0;
+                break;
+            }
+        }
+        /* skip the rest */
+        while (++Loop < Index)
+            Test[Loop].SkipFlag = 1;
+        break;
+    default:
+        /* error */
+        HDprintf("*** ERROR: Unknown action (%d) for SetTest\n", action);
+        break;
     }
 }
 
-
+
 /*
  * Enable alarm on test execution, configurable by environment variable
  */
@@ -607,19 +638,3 @@ void TestAlarmOn(void)
     HDalarm((unsigned)alarm_sec);
 }
 
-
-/*
- * Enable error stack printing when errors occur.
- */
-void PrintErrorStackOn(void)
-{
-    H5Eset_auto2(H5E_DEFAULT, PrintErrorStackFunc, PrintErrorStackData);
-}
-
-/*
- * Disable error stack printing when errors occur.
- */
-void PrintErrorStackOff(void)
-{
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-}
diff --git a/test/testhdf5.c b/test/testhdf5.c
index de1c23d..7b600ef 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -85,11 +85,14 @@ main(int argc, char *argv[])
     if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP"))
         TestCleanup();
 
+    /* Release test infrastructure */
+    TestShutdown();
+
     /* Exit failure if errors encountered; else exit success. */
     /* No need to print anything since PerformTests() already does. */
     if (GetTestNumErrs() > 0)
-	exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     else
-	exit(EXIT_SUCCESS);
+        HDexit(EXIT_SUCCESS);
 }   /* end main() */
 
diff --git a/test/testhdf5.h b/test/testhdf5.h
index fd9d68d..04db0d5 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -18,142 +18,152 @@
 #ifndef TESTHDF5_H
 #define TESTHDF5_H
 
-/*
- * Include required headers.  This file tests internal library functions,
- * so we include the private headers here.
- */
-#include "H5private.h"
-#include "H5Eprivate.h"
-
 /* Include generic testing header also */
 #include "h5test.h"
 
 /* Use %ld to print the value because long should cover most cases. */
 /* Used to make certain a return value _is_not_ a value */
-#define CHECK(ret, val, where) do {					      \
-    if (VERBOSE_HI) print_func("   Call to routine: %15s at line %4d " \
-				"in %s returned %ld \n",		      \
-				where, (int)__LINE__, __FILE__,		      \
-				(long)(ret));				      \
-    if ((ret) == (val)) {						      \
-	TestErrPrintf("*** UNEXPECTED RETURN from %s is %ld at line %4d "     \
-		   "in %s\n", where, (long)(ret), (int)__LINE__, __FILE__);   \
-	H5Eprint2(H5E_DEFAULT, stdout);				      \
-    }									      \
+#define CHECK(ret, val, where) do {                                                 \
+    if (VERBOSE_HI) {                                                               \
+        print_func("   Call to routine: %15s at line %4d "                          \
+            "in %s returned %ld \n",                                                \
+            where, (int)__LINE__, __FILE__,                                         \
+            (long)(ret));                                                           \
+    }                                                                               \
+    if ((ret) == (val)) {                                                           \
+        TestErrPrintf("*** UNEXPECTED RETURN from %s is %ld at line %4d "           \
+            "in %s\n", where, (long)(ret), (int)__LINE__, __FILE__);                \
+        H5Eprint2(H5E_DEFAULT, stdout);                                             \
+    }                                                                               \
 } while(0)
 
-#define CHECK_I(ret,where) {						      \
-   if (VERBOSE_HI) {						      \
-      print_func("   Call to routine: %15s at line %4d in %s returned %ld\n", \
-                 (where), (int)__LINE__, __FILE__, (long)(ret));	      \
-   }									      \
-   if ((ret)<0) {							      \
-      TestErrPrintf ("*** UNEXPECTED RETURN from %s is %ld line %4d in %s\n", \
-                  (where), (long)(ret), (int)__LINE__, __FILE__);	      \
-      H5Eprint2(H5E_DEFAULT, stdout);				      \
-   }									      \
+#define CHECK_I(ret,where) {                                                        \
+   if (VERBOSE_HI) {                                                                \
+      print_func("   Call to routine: %15s at line %4d in %s returned %ld\n",       \
+                 (where), (int)__LINE__, __FILE__, (long)(ret));                    \
+   }                                                                                \
+   if ((ret)<0) {                                                                   \
+      TestErrPrintf ("*** UNEXPECTED RETURN from %s is %ld line %4d in %s\n",       \
+                  (where), (long)(ret), (int)__LINE__, __FILE__);                   \
+      H5Eprint2(H5E_DEFAULT, stdout);                                               \
+   }                                                                                \
+}
+
+/* Check that a pointer is valid (i.e.: not NULL) */
+#define CHECK_PTR(ret,where) {                                                      \
+   if (VERBOSE_HI) {                                                                \
+      print_func("   Call to routine: %15s at line %4d in %s returned %p\n",        \
+                 (where), (int)__LINE__, __FILE__, (ret));                          \
+   }                                                                                \
+   if (!(ret)) {                                                                    \
+      TestErrPrintf ("*** UNEXPECTED RETURN from %s is NULL line %4d in %s\n",      \
+                  (where), (int)__LINE__, __FILE__);                                \
+      H5Eprint2(H5E_DEFAULT, stdout);                                               \
+   }                                                                                \
 }
 
-#define CHECK_PTR(ret,where) {						      \
-   if (VERBOSE_HI) {					      \
-      print_func("   Call to routine: %15s at line %4d in %s returned %p\n",  \
-                 (where), (int)__LINE__, __FILE__, (ret));		      \
-   }									      \
-   if (!(ret)) {							      \
-      TestErrPrintf ("*** UNEXPECTED RETURN from %s is NULL line %4d in %s\n", \
-                  (where), (int)__LINE__, __FILE__);			      \
-      H5Eprint2(H5E_DEFAULT, stdout);				      \
-   }									      \
+/* Check that a pointer is NULL */
+#define CHECK_PTR_NULL(ret,where) {                                                 \
+   if (VERBOSE_HI) {                                                                \
+      print_func("   Call to routine: %15s at line %4d in %s returned %p\n",        \
+                 (where), (int)__LINE__, __FILE__, (ret));                          \
+   }                                                                                \
+   if (ret) {                                                                       \
+      TestErrPrintf ("*** UNEXPECTED RETURN from %s is not NULL line %4d in %s\n",  \
+                  (where), (int)__LINE__, __FILE__);                                \
+      H5Eprint2(H5E_DEFAULT, stdout);                                               \
+   }                                                                                \
 }
 
-#define CHECK_PTR_NULL(ret,where) {						      \
-   if (VERBOSE_HI) {					      \
-      print_func("   Call to routine: %15s at line %4d in %s returned %p\n",  \
-                 (where), (int)__LINE__, __FILE__, (ret));		      \
-   }									      \
-   if (ret) {							      \
-      TestErrPrintf ("*** UNEXPECTED RETURN from %s is not NULL line %4d in %s\n", \
-                  (where), (int)__LINE__, __FILE__);			      \
-      H5Eprint2(H5E_DEFAULT, stdout);				      \
-   }									      \
+/* Check that two pointers are equal */
+#define CHECK_PTR_EQ(ret, val, where) {                                             \
+   if (VERBOSE_HI) {                                                                \
+      print_func("   Call to routine: %15s at line %4d in %s returned %p\n",        \
+                 (where), (int)__LINE__, __FILE__, (const void *)(ret));            \
+   }                                                                                \
+   if (ret != val) {                                                                \
+      TestErrPrintf ("*** UNEXPECTED RETURN from %s: returned value of %p is not equal to %p line %4d in %s\n",  \
+                  (where), (const void *)(ret), (const void *)(val), (int)__LINE__, __FILE__); \
+      H5Eprint2(H5E_DEFAULT, stdout);                                               \
+   }                                                                                \
 }
 
 /* Used to make certain a return value _is_ a value */
-#define VERIFY(_x, _val, where) do {					      \
-    long __x = (long)_x, __val = (long)_val;				      \
-    if(VERBOSE_HI) {				      \
-	print_func("   Call to routine: %15s at line %4d in %s had value "    \
-		   "%ld \n", (where), (int)__LINE__, __FILE__, __x);	      \
-    }									      \
-    if((__x) != (__val)) {						      \
-	TestErrPrintf("*** UNEXPECTED VALUE from %s should be %ld, but is %ld at line %4d " \
-		   "in %s\n", (where), __val, __x, (int)__LINE__, __FILE__);  \
-	H5Eprint2(H5E_DEFAULT, stdout);					      \
-    }									      \
+#define VERIFY(_x, _val, where) do {                                                \
+    long __x = (long)_x, __val = (long)_val;                                        \
+    if(VERBOSE_HI) {                                                                \
+        print_func("   Call to routine: %15s at line %4d in %s had value "          \
+            "%ld \n", (where), (int)__LINE__, __FILE__, __x);                       \
+    }                                                                               \
+    if((__x) != (__val)) {                                                          \
+        TestErrPrintf("*** UNEXPECTED VALUE from %s should be %ld, but is %ld at line %4d " \
+             "in %s\n", (where), __val, __x, (int)__LINE__, __FILE__);              \
+        H5Eprint2(H5E_DEFAULT, stdout);                                             \
+    }                                                                               \
 } while(0)
 
 /* Used to make certain a (non-'long' type's) return value _is_ a value */
-#define VERIFY_TYPE(_x, _val, _type, _format, where) do {					      \
-    _type __x = (_type)_x, __val = (_type)_val;				      \
-    if(VERBOSE_HI) {				      \
-	print_func("   Call to routine: %15s at line %4d in %s had value "    \
-		   _format " \n", (where), (int)__LINE__, __FILE__, __x);	      \
-    }									      \
-    if((__x) != (__val)) {						      \
-	TestErrPrintf("*** UNEXPECTED VALUE from %s should be " _format ", but is " _format " at line %4d " \
-		   "in %s\n", (where), __val, __x, (int)__LINE__, __FILE__);  \
-	H5Eprint2(H5E_DEFAULT, stdout);					      \
-    }									      \
+#define VERIFY_TYPE(_x, _val, _type, _format, where) do {                           \
+    _type __x = (_type)_x, __val = (_type)_val;                                     \
+    if(VERBOSE_HI) {                                                                \
+        print_func("   Call to routine: %15s at line %4d in %s had value "          \
+            _format " \n", (where), (int)__LINE__, __FILE__, __x);                  \
+    }                                                                               \
+    if((__x) != (__val)) {                                                          \
+        TestErrPrintf("*** UNEXPECTED VALUE from %s should be " _format ", but is " _format " at line %4d " \
+            "in %s\n", (where), __val, __x, (int)__LINE__, __FILE__);               \
+        H5Eprint2(H5E_DEFAULT, stdout);                                             \
+    }                                                                               \
 } while(0)
 
 /* Used to make certain a string return value _is_ a value */
-#define VERIFY_STR(x, val, where) do {					      \
-    if (VERBOSE_HI) {				              \
-	print_func("   Call to routine: %15s at line %4d in %s had value "    \
-		   "%s \n", (where), (int)__LINE__, __FILE__, x);    \
-    }									      \
-    if (HDstrcmp(x, val)) {					              \
-	TestErrPrintf("*** UNEXPECTED VALUE from %s should be %s, but is %s at line %4d " \
-		   "in %s\n", where, val, x, (int)__LINE__, __FILE__);        \
-	H5Eprint2(H5E_DEFAULT, stdout);				      \
-    }									      \
+#define VERIFY_STR(x, val, where) do {                                              \
+    if (VERBOSE_HI) {                                                               \
+        print_func("   Call to routine: %15s at line %4d in %s had value "          \
+            "%s \n", (where), (int)__LINE__, __FILE__, x);                          \
+    }                                                                               \
+    if (HDstrcmp(x, val)) {                                                         \
+        TestErrPrintf("*** UNEXPECTED VALUE from %s should be %s, but is %s at line %4d " \
+            "in %s\n", where, val, x, (int)__LINE__, __FILE__);                     \
+        H5Eprint2(H5E_DEFAULT, stdout);                                             \
+    }                                                                               \
 } while(0)
 
 /* Used to document process through a test and to check for errors */
-#define RESULT(ret,func) do {						      \
-    if (VERBOSE_MED) {					      \
-	print_func("   Call to routine: %15s at line %4d in %s returned "     \
-		   "%ld\n", func, (int)__LINE__, __FILE__, (long)(ret));      \
-    }									      \
-    if (VERBOSE_HI)					      \
-        H5Eprint2(H5E_DEFAULT, stdout);				      \
-    if ((ret) == FAIL) {						      \
-	TestErrPrintf("*** UNEXPECTED RETURN from %s is %ld at line %4d "     \
-		   "in %s\n", func, (long)(ret), (int)__LINE__, __FILE__);    \
-	H5Eprint2(H5E_DEFAULT, stdout);				      \
-    }									      \
+#define RESULT(ret,func) do {                                                       \
+    if (VERBOSE_MED) {                                                              \
+        print_func("   Call to routine: %15s at line %4d in %s returned "           \
+            "%ld\n", func, (int)__LINE__, __FILE__, (long)(ret));                   \
+    }                                                                               \
+    if (VERBOSE_HI)                                                                 \
+        H5Eprint2(H5E_DEFAULT, stdout);                                             \
+    if ((ret) == FAIL) {                                                            \
+        TestErrPrintf("*** UNEXPECTED RETURN from %s is %ld at line %4d "           \
+            "in %s\n", func, (long)(ret), (int)__LINE__, __FILE__);                 \
+        H5Eprint2(H5E_DEFAULT, stdout);                                             \
+    }                                                                               \
 } while(0)
 
 /* Used to document process through a test */
 #if defined(H5_HAVE_PARALLEL) && defined(H5_PARALLEL_TEST)
-#define MESSAGE(V,A) {                                                        \
-    int mpi_rank;                                                             \
-                                                                              \
-    MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);                                 \
-    if(mpi_rank == 0 && HDGetTestVerbosity() > (V))                           \
-        print_func A ;                                                        \
+#define MESSAGE(V,A) {                                                              \
+    int mpi_rank;                                                                   \
+                                                                                    \
+    MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);                                       \
+    if(mpi_rank == 0 && HDGetTestVerbosity() > (V))                                 \
+        print_func A ;                                                              \
 }
 #else /* H5_HAVE_PARALLEL */
 #define MESSAGE(V,A) {if (HDGetTestVerbosity() > (V)) print_func A;}
 #endif /* H5_HAVE_PARALLEL */
 
 /* Used to indicate an error that is complex to check for */
-#define ERROR(where) do {						      \
-    if(VERBOSE_HI)					                      \
-	print_func("   Call to routine: %15s at line %4d in %s returned "     \
-           "invalid result\n", where, (int)__LINE__, __FILE__);               \
-    TestErrPrintf("*** UNEXPECTED RESULT from %s at line %4d in %s\n",        \
-               where, (int)__LINE__, __FILE__);                               \
+#define ERROR(where) do {                                                           \
+    if(VERBOSE_HI)                                                                  \
+        print_func("   Call to routine: %15s at line %4d in %s returned "           \
+           "invalid result\n", where, (int)__LINE__, __FILE__);                     \
+    TestErrPrintf("*** UNEXPECTED RESULT from %s at line %4d in %s\n",              \
+               where, (int)__LINE__, __FILE__);                                     \
 } while(0)
 
 /* definitions for command strings */
diff --git a/test/testlinks_env.sh.in b/test/testlinks_env.sh.in
index d8d122a..3d6b3ce 100644
--- a/test/testlinks_env.sh.in
+++ b/test/testlinks_env.sh.in
@@ -19,23 +19,24 @@ nerrors=0
 
 ##############################################################################
 ##############################################################################
-###			  T H E   T E S T S                                ###
+###              T H E   T E S T S                                ###
 ##############################################################################
 ##############################################################################
 
 # test for external links with HDF5_EXT_PREFIX
 echo "Testing external link with HDF5_EXT_PREFIX"
-TEST_NAME=links_env 		# The test name
-TEST_BIN=`pwd`/$TEST_NAME 	# The path of the test binary
-ENVCMD="env HDF5_EXT_PREFIX=.:tmp" 	# The environment variable & value
+TEST_NAME=links_env         # The test name
+TEST_BIN=`pwd`/$TEST_NAME     # The path of the test binary
+ENVCMD="env HDF5_EXT_PREFIX=.:tmp_links_env"     # The environment variable & value
 #
 # Run the test
+echo "$ENVCMD $RUNSERIAL $TEST_BIN"
 $ENVCMD $RUNSERIAL $TEST_BIN
 exitcode=$?
 if [ $exitcode -eq 0 ]; then
         echo "Test for HDF5_EXT_PREFIX PASSED"
     else
- 	nerrors="`expr $nerrors + 1`"
-	echo "***Error encountered for HDF5_EXT_PREFIX test***"
+    nerrors="`expr $nerrors + 1`"
+    echo "***Error encountered for HDF5_EXT_PREFIX test***"
 fi
 exit $nerrors
diff --git a/test/testmeta.c b/test/testmeta.c
index b97eb68..9a40e6f 100644
--- a/test/testmeta.c
+++ b/test/testmeta.c
@@ -23,34 +23,34 @@
  */
 
 
-#include "hdf5.h"
+#include "h5test.h"
 
-#define FILEN		"testmeta.h5"
+#define FILEN           "testmeta.h5"
 
-#define CHUNK_SIZE		512
+#define CHUNK_SIZE       512
 
-#define NDATAARRAYS		3
-/*#define NPOINTS			2048*/
-#define NPOINTS			20
-#define NEXTARRAYS		10
-#define NDATAOBJECTS	100000
+#define NDATAARRAYS      3
+/*#define NPOINTS         2048*/
+#define NPOINTS          20
+#define NEXTARRAYS       10
+#define NDATAOBJECTS     100000
 
 int main(void)
 {
-    hid_t	file_id, prop_id, memspace_id, type_id;
-    hid_t	group_id;
-    hid_t	dataset_id, dataspace_id;
-    herr_t	status;
-    hsize_t	dims[1];
-    hsize_t	maxdims[1];
-    float	data[NPOINTS];
-    float	floatval;
-    unsigned	numdataobj	= 0;
-    unsigned	i, j;
-    char	name[80];
-    hsize_t	start[1]			= {0};
-    hsize_t	stride[1]			= {1};
-    hsize_t	count[1]			= {1};
+    hid_t      file_id, prop_id, memspace_id, type_id;
+    hid_t      group_id;
+    hid_t      dataset_id, dataspace_id;
+    herr_t     status;
+    hsize_t    dims[1];
+    hsize_t    maxdims[1];
+    float      data[NPOINTS];
+    float      floatval;
+    unsigned   numdataobj    = 0;
+    unsigned   i, j;
+    char       name[80];
+    hsize_t    start[1]            = {0};
+    hsize_t    stride[1]            = {1};
+    hsize_t    count[1]            = {1};
 
     /* Create a file */
     file_id = H5Fcreate(FILEN, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -64,8 +64,7 @@ int main(void)
                                     H5T_NATIVE_UINT, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write value to NumDataObj dataset */
-    status = H5Dwrite(dataset_id, H5T_NATIVE_UINT, H5S_ALL,
-            H5S_ALL, H5P_DEFAULT, &numdataobj);
+    status = H5Dwrite(dataset_id, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &numdataobj);
 
     /* Close the identifiers */
     status = H5Dclose(dataset_id);
@@ -78,16 +77,14 @@ int main(void)
     status = H5Pset_chunk(prop_id, 1, dims);
 
     /* Create dataspace */
-    dims[0]=1;
-    maxdims[0]=H5S_UNLIMITED;
+    dims[0] = 1;
+    maxdims[0] = H5S_UNLIMITED;
     dataspace_id = H5Screate_simple(1, dims, maxdims);
 
-    for(i=0; i<NEXTARRAYS; i++)
-    {
+    for(i = 0; i < NEXTARRAYS; i++) {
         /* Create dataset */
         sprintf(name, "/ExtArray%06d", i);
-        dataset_id = H5Dcreate2(file_id, name,
-                H5T_NATIVE_FLOAT, dataspace_id, H5P_DEFAULT, prop_id, H5P_DEFAULT);
+        dataset_id = H5Dcreate2(file_id, name, H5T_NATIVE_FLOAT, dataspace_id, H5P_DEFAULT, prop_id, H5P_DEFAULT);
 
         /* Close the identifier */
         status = H5Dclose(dataset_id);
@@ -101,47 +98,43 @@ int main(void)
     group_id = H5Gcreate2(file_id, "/DataArray", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     H5Gclose(group_id);
 
-    for(j=0; j<NDATAOBJECTS; j++)
-    {
+    for(j = 0; j < NDATAOBJECTS; j++) {
         /* Removed print statement as it would lock system resources on Windows */
         /*
-         * printf("\rWriting Object #%d of %d", j+1, NDATAOBJECTS);
+         * HDprintf("\rWriting Object #%d of %d", j+1, NDATAOBJECTS);
          * fflush(stdout);
          */
         floatval = (float)j;
 
         /* Create group to hold data arrays for this object */
-        sprintf(name, "/DataArray/%06d", j);
+        HDsprintf(name, "/DataArray/%06d", j);
         group_id = H5Gcreate2(file_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if(group_id < 0) {
-            fprintf(stderr, "Failed to create DataArray group.\n");
+            HDfprintf(stderr, "Failed to create DataArray group.\n");
             status = H5Fclose(file_id);
             return -1;
         }
 
         /* Loop over data arrays */
-        for(i=0; i<NDATAARRAYS; i++)
-        {
+        for(i = 0; i < NDATAARRAYS; i++) {
             /* Create dataspace */
             dims[0]=NPOINTS;
             maxdims[0]=NPOINTS;
             dataspace_id = H5Screate_simple(1 ,dims, maxdims);
 
             /* Create dataset */
-            sprintf(name, "DataArray%06d", i);
-            dataset_id = H5Dcreate2(group_id, name,
-                    H5T_NATIVE_FLOAT, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+            HDsprintf(name, "DataArray%06d", i);
+            dataset_id = H5Dcreate2(group_id, name, H5T_NATIVE_FLOAT, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
             if(dataset_id < 0) {
-                fprintf(stderr, "Failed to create DataArray dataset.\n");
+                HDfprintf(stderr, "Failed to create DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             }
 
             /* Write the data array data */
-            status = H5Dwrite(dataset_id, H5T_NATIVE_FLOAT, H5S_ALL,
-                    H5S_ALL, H5P_DEFAULT, data);
+            status = H5Dwrite(dataset_id, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
             if(status < 0) {
-                fprintf(stderr, "Failed to write DataArray dataset.\n");
+                HDfprintf(stderr, "Failed to write DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             }
@@ -154,17 +147,16 @@ int main(void)
         /* Open NumDataObj dataset */
         dataset_id = H5Dopen2(file_id, "/NumDataObj", H5P_DEFAULT);
         if(dataset_id < 0) {
-            fprintf(stderr, "Failed to open NumDataObj dataset.\n");
+            HDfprintf(stderr, "Failed to open NumDataObj dataset.\n");
             status = H5Fclose(file_id);
             return -1;
         }
 
         /* Write value to NumDataObj dataset */
         numdataobj = j + 1;
-        status = H5Dwrite(dataset_id, H5T_NATIVE_UINT, H5S_ALL,
-                H5S_ALL, H5P_DEFAULT, &numdataobj);
+        status = H5Dwrite(dataset_id, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &numdataobj);
         if(status < 0) {
-            fprintf(stderr, "Failed to write NumDataObj dataset.\n");
+            HDfprintf(stderr, "Failed to write NumDataObj dataset.\n");
             status = H5Fclose(file_id);
             return -1;
         }
@@ -176,10 +168,10 @@ int main(void)
         /* Extend attribute arrays */
         for(i = 0; i < NEXTARRAYS; i++) {
             /* Open extendable dataset */
-            sprintf(name, "/ExtArray%06d", i);
+            HDsprintf(name, "/ExtArray%06d", i);
             dataset_id = H5Dopen2(file_id, name, H5P_DEFAULT);
             if(dataset_id < 0) {
-                fprintf(stderr, "Failed to open ExtArray dataset.\n");
+                HDfprintf(stderr, "Failed to open ExtArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             } /* end if */
@@ -188,7 +180,7 @@ int main(void)
             dims[0] = (hsize_t)j + 1;
             status = H5Dset_extent(dataset_id, dims);
             if(status < 0) {
-                fprintf(stderr, "Failed to extend DataArray dataset.\n");
+                HDfprintf(stderr, "Failed to extend DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             } /* end if */
@@ -200,16 +192,12 @@ int main(void)
             type_id = H5Dget_type(dataset_id);
 
             start[0] = 0;
-            status = H5Sselect_hyperslab(memspace_id, H5S_SELECT_SET,
-                    start, stride, count, NULL);
+            status = H5Sselect_hyperslab(memspace_id, H5S_SELECT_SET, start, stride, count, NULL);
             start[0] = (hssize_t)j;
-            status = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET,
-                    start, stride, count, NULL);
-            status = H5Dwrite(dataset_id, type_id, memspace_id,
-                    dataspace_id, H5P_DEFAULT, &floatval);
-            if(status < 0)
-            {
-                fprintf(stderr, "Failed to write DataArray dataset.\n");
+            status = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, start, stride, count, NULL);
+            status = H5Dwrite(dataset_id, type_id, memspace_id, dataspace_id, H5P_DEFAULT, &floatval);
+            if(status < 0) {
+                HDfprintf(stderr, "Failed to write DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             }
@@ -226,7 +214,7 @@ int main(void)
     /* Close the file */
     status = H5Fclose(file_id);
 
-    printf("\n");
+    HDprintf("\n");
 
     return 0;
 }
diff --git a/test/tfile.c b/test/tfile.c
index db6b787..532ec9f 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -13,13 +13,12 @@
 
 /***********************************************************
 *
-* Test program:	 tfile
+* Test program:     tfile
 *
 * Test the low-level file I/O features.
 *
 *************************************************************/
 
-#include "hdf5.h"
 #include "testhdf5.h"
 #include "H5srcdir.h"
 
@@ -32,7 +31,7 @@
  */
 #define H5F_PACKAGE
 #define H5F_TESTING
-#include "H5Fpkg.h"		/* File access	 			*/
+#include "H5Fpkg.h"        /* File access                             */
 
 #define BAD_USERBLOCK_SIZE1  (hsize_t)1
 #define BAD_USERBLOCK_SIZE2  (hsize_t)2
@@ -43,47 +42,47 @@
 #define BAD_USERBLOCK_SIZE7  (hsize_t)6144
 
 #define F1_USERBLOCK_SIZE  (hsize_t)0
-#define F1_OFFSET_SIZE	   sizeof(haddr_t)
-#define F1_LENGTH_SIZE	   sizeof(hsize_t)
-#define F1_SYM_LEAF_K	   4
-#define F1_SYM_INTERN_K	   16
-#define FILE1	"tfile1.h5"
-#define SFILE1	"sys_file1"
+#define F1_OFFSET_SIZE       sizeof(haddr_t)
+#define F1_LENGTH_SIZE       sizeof(hsize_t)
+#define F1_SYM_LEAF_K       4
+#define F1_SYM_INTERN_K       16
+#define FILE1    "tfile1.h5"
+#define SFILE1    "sys_file1"
 
 #define REOPEN_FILE "tfile_reopen.h5"
 #define REOPEN_DSET "dset"
 
 #define F2_USERBLOCK_SIZE  (hsize_t)512
-#define F2_OFFSET_SIZE	   8
-#define F2_LENGTH_SIZE	   8
-#define F2_SYM_LEAF_K	   8
-#define F2_SYM_INTERN_K	   32
+#define F2_OFFSET_SIZE       8
+#define F2_LENGTH_SIZE       8
+#define F2_SYM_LEAF_K       8
+#define F2_SYM_INTERN_K       32
 #define F2_RANK            2
 #define F2_DIM0            4
 #define F2_DIM1            6
 #define F2_DSET            "dset"
-#define FILE2	"tfile2.h5"
+#define FILE2    "tfile2.h5"
 
 #define F3_USERBLOCK_SIZE  (hsize_t)0
-#define F3_OFFSET_SIZE	   F2_OFFSET_SIZE
-#define F3_LENGTH_SIZE	   F2_LENGTH_SIZE
-#define F3_SYM_LEAF_K	   F2_SYM_LEAF_K
-#define F3_SYM_INTERN_K	   F2_SYM_INTERN_K
-#define FILE3	"tfile3.h5"
+#define F3_OFFSET_SIZE       F2_OFFSET_SIZE
+#define F3_LENGTH_SIZE       F2_LENGTH_SIZE
+#define F3_SYM_LEAF_K       F2_SYM_LEAF_K
+#define F3_SYM_INTERN_K       F2_SYM_INTERN_K
+#define FILE3    "tfile3.h5"
 
 #define GRP_NAME         "/group"
 #define DSET_NAME         "dataset"
 #define ATTR_NAME          "attr"
 #define TYPE_NAME          "type"
-#define DSET_VL 	   "vlinteger"
-#define FILE4	           "tfile4.h5"
+#define DSET_VL        "vlinteger"
+#define FILE4               "tfile4.h5"
 
 #define OBJ_ID_COUNT_0     0
 #define OBJ_ID_COUNT_1     1
 #define OBJ_ID_COUNT_2     2
 #define OBJ_ID_COUNT_3     3
 #define OBJ_ID_COUNT_4     4
-#define OBJ_ID_COUNT_6	   6
+#define OBJ_ID_COUNT_6       6
 #define OBJ_ID_COUNT_8     8
 
 #define GROUP1  "Group1"
@@ -91,8 +90,8 @@
 #define DSET2   "/Group1/Dataset2"
 
 #define TESTA_GROUPNAME "group"
-#define TESTA_DSETNAME "dataset"
-#define TESTA_ATTRNAME "attribute"
+#define TESTA_DSETNAME  "dataset"
+#define TESTA_ATTRNAME  "attribute"
 #define TESTA_DTYPENAME "compound"
 #define TESTA_NAME_BUF_SIZE     64
 #define TESTA_RANK 2
@@ -102,12 +101,12 @@
 #define USERBLOCK_SIZE      ((hsize_t) 512)
 
 /* Declaration for test_libver_macros2() */
-#define FILE5		"tfile5.h5"	/* Test file */
+#define FILE5        "tfile5.h5"    /* Test file */
 
 /* Declaration for test_get_obj_ids() */
-#define FILE6			"tfile6.h5"	/* Test file */
-#define NGROUPS			2
-#define NDSETS			4
+#define FILE6            "tfile6.h5"    /* Test file */
+#define NGROUPS            2
+#define NDSETS            4
 
 static void
 create_objects(hid_t, hid_t, hid_t *, hid_t *, hid_t *, hid_t *);
@@ -124,14 +123,14 @@ check_file_id(hid_t, hid_t);
 static void
 test_file_create(void)
 {
-    hid_t		fid1, fid2, fid3; /* HDF5 File IDs		*/
-    hid_t		tmpl1, tmpl2;	/*file creation templates	*/
-    hsize_t		ublock;		/*sizeof userblock		*/
-    size_t		parm;		/*file-creation parameters	*/
-    size_t		parm2;		/*file-creation parameters	*/
-    unsigned		iparm;
-    unsigned		iparm2;
-    herr_t		ret;		/*generic return value		*/
+    hid_t        fid1, fid2, fid3; /* HDF5 File IDs        */
+    hid_t        tmpl1, tmpl2;    /*file creation templates    */
+    hsize_t        ublock;        /*sizeof userblock        */
+    size_t        parm;        /*file-creation parameters    */
+    size_t        parm2;        /*file-creation parameters    */
+    unsigned        iparm;
+    unsigned        iparm2;
+    herr_t        ret;        /*generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Low-Level File Creation I/O\n"));
@@ -383,7 +382,7 @@ test_file_create(void)
     /* Close third file */
     ret = H5Fclose(fid3);
     CHECK(ret, FAIL, "H5Fclose");
-}				/* test_file_create() */
+}                /* test_file_create() */
 
 /****************************************************************
 **
@@ -393,17 +392,17 @@ test_file_create(void)
 static void
 test_file_open(void)
 {
-    hid_t		fid1, fid2;     /*HDF5 File IDs			*/
+    hid_t        fid1, fid2;     /*HDF5 File IDs            */
     hid_t               did;            /*dataset ID                    */
     hid_t               fapl_id;        /*file access property list ID  */
-    hid_t		tmpl1;		/*file creation templates	*/
-    hsize_t		ublock;		/*sizeof user block		*/
-    size_t		parm;		/*file-creation parameters	*/
-    size_t		parm2;		/*file-creation parameters	*/
-    unsigned		iparm;
-    unsigned		iparm2;
-    unsigned		intent;
-    herr_t		ret;		/*generic return value		*/
+    hid_t        tmpl1;        /*file creation templates    */
+    hsize_t        ublock;        /*sizeof user block        */
+    size_t        parm;        /*file-creation parameters    */
+    size_t        parm2;        /*file-creation parameters    */
+    unsigned        iparm;
+    unsigned        iparm2;
+    unsigned        intent;
+    herr_t        ret;        /*generic return value        */
 
     /*
      * Test single file open
@@ -567,7 +566,7 @@ test_file_close(void)
 {
     hid_t               fid1, fid2;
     hid_t               fapl_id, access_id;
-    hid_t		dataset_id, group_id1, group_id2, group_id3;
+    hid_t        dataset_id, group_id1, group_id2, group_id3;
     H5F_close_degree_t  fc_degree;
     herr_t              ret;
 
@@ -757,7 +756,7 @@ test_file_close(void)
 
     /* Create more new files and test object count and ID list functions */
     test_obj_count_and_id(fid1, fid2, dataset_id, group_id1,
-				group_id2, group_id3);
+                group_id2, group_id3);
 
     /* Close first open */
     ret = H5Fclose(fid1);
@@ -813,22 +812,22 @@ test_file_close(void)
     CHECK(ret, FAIL, "H5Pget_fclose_degree");
 
     switch(fc_degree) {
-	case H5F_CLOSE_STRONG:
-    	    /* Close first open */
-    	    ret = H5Fclose(fid1);
-    	    CHECK(ret, FAIL, "H5Fclose");
-    	    /* Close second open */
-    	    ret = H5Fclose(fid2);
-    	    CHECK(ret, FAIL, "H5Fclose");
-	    break;
-	case H5F_CLOSE_SEMI:
+        case H5F_CLOSE_STRONG:
             /* Close first open */
             ret = H5Fclose(fid1);
             CHECK(ret, FAIL, "H5Fclose");
-    	    ret = H5Dclose(dataset_id);
+            /* Close second open */
+            ret = H5Fclose(fid2);
+            CHECK(ret, FAIL, "H5Fclose");
+            break;
+        case H5F_CLOSE_SEMI:
+            /* Close first open */
+            ret = H5Fclose(fid1);
+            CHECK(ret, FAIL, "H5Fclose");
+            ret = H5Dclose(dataset_id);
             CHECK(ret, FAIL, "H5Dclose");
             ret = H5Gclose(group_id1);
-    	    CHECK(ret, FAIL, "H5Gclose");
+            CHECK(ret, FAIL, "H5Gclose");
             ret = H5Gclose(group_id2);
             CHECK(ret, FAIL, "H5Gclose");
             ret = H5Gclose(group_id3);
@@ -836,8 +835,8 @@ test_file_close(void)
             /* Close second open */
             ret = H5Fclose(fid2);
             CHECK(ret, FAIL, "H5Fclose");
-	    break;
-	case H5F_CLOSE_WEAK:
+            break;
+        case H5F_CLOSE_WEAK:
             /* Close first open */
             ret = H5Fclose(fid1);
             CHECK(ret, FAIL, "H5Fclose");
@@ -852,7 +851,8 @@ test_file_close(void)
             CHECK(ret, FAIL, "H5Gclose");
             ret = H5Gclose(group_id3);
             CHECK(ret, FAIL, "H5Gclose");
-	    break;
+            break;
+        case H5F_CLOSE_DEFAULT:
         default:
             CHECK(fc_degree, H5F_CLOSE_DEFAULT, "H5Pget_fclose_degree");
             break;
@@ -873,10 +873,10 @@ test_file_close(void)
 ****************************************************************/
 static void
 create_objects(hid_t fid1, hid_t fid2, hid_t *ret_did, hid_t *ret_gid1,
-		hid_t *ret_gid2, hid_t *ret_gid3)
+        hid_t *ret_gid2, hid_t *ret_gid3)
 {
-    ssize_t	oid_count;
-    herr_t	ret;
+    ssize_t    oid_count;
+    herr_t    ret;
 
     /* Check reference counts of file IDs and opened object IDs.
      * The verification is hard-coded.  If in any case, this testing
@@ -978,7 +978,7 @@ create_objects(hid_t fid1, hid_t fid2, hid_t *ret_did, hid_t *ret_gid1,
 /****************************************************************
 **
 **  test_get_obj_ids(): Test the bug and the fix for Jira 8528.
-**                      H5Fget_obj_ids overfilled the list of 
+**                      H5Fget_obj_ids overfilled the list of
 **                      object IDs by one.  This is an enhancement
 **                      for test_obj_count_and_id().
 **
@@ -1005,14 +1005,14 @@ test_get_obj_ids(void)
 
     /* creates NGROUPS groups under the root group */
     for(m = 0; m < NGROUPS; m++) {
-        sprintf(gname, "group%d", m);
+        HDsprintf(gname, "group%d", m);
         gid[m] = H5Gcreate2(fid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(gid[m], FAIL, "H5Gcreate2");
     }
 
     /* create NDSETS datasets under the root group */
     for(n = 0; n < NDSETS; n++) {
-         sprintf(dname, "dataset%d", n);
+         HDsprintf(dname, "dataset%d", n);
          dset[n] = H5Dcreate2(fid, dname, H5T_NATIVE_INT, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
          CHECK(dset[n], FAIL, "H5Dcreate2");
     }
@@ -1025,14 +1025,14 @@ test_get_obj_ids(void)
     oid_list = (hid_t *)HDcalloc((size_t)oid_list_size, sizeof(hid_t));
     CHECK(oid_list, NULL, "HDcalloc");
 
-    /* Call the public function H5F_get_obj_ids to use H5F_get_objects.  User reported having problem here. 
-     * that the returned size (ret_count) from H5Fget_obj_ids is one greater than the size passed in 
+    /* Call the public function H5F_get_obj_ids to use H5F_get_objects.  User reported having problem here.
+     * that the returned size (ret_count) from H5Fget_obj_ids is one greater than the size passed in
      * (oid_list_size) */
     ret_count = H5Fget_obj_ids(fid, H5F_OBJ_ALL, (size_t)oid_list_size, oid_list);
     CHECK(ret_count, FAIL, "H5Fget_obj_ids");
     VERIFY(ret_count, oid_list_size, "H5Fget_obj_count");
 
-    /* Close all object IDs on the list except the file ID. The first ID is supposed to be file ID according 
+    /* Close all object IDs on the list except the file ID. The first ID is supposed to be file ID according
      * to the library design */
     for(i = 0; i< ret_count; i++) {
         if(fid != oid_list[i]) {
@@ -1047,7 +1047,7 @@ test_get_obj_ids(void)
     CHECK(oid_count, FAIL, "H5Fget_obj_count");
     VERIFY(oid_count, NGROUPS + 2, "H5Fget_obj_count");
 
-    /* Get the IDs of the left opend objects */ 
+    /* Get the IDs of the left opend objects */
     ret_count = H5Fget_obj_ids(fid, H5F_OBJ_ALL, (size_t)oid_list_size, oid_list);
     CHECK(ret_count, FAIL, "H5Fget_obj_ids");
     VERIFY(ret_count, oid_list_size, "H5Fget_obj_count");
@@ -1059,20 +1059,20 @@ test_get_obj_ids(void)
             CHECK(ret, FAIL, "H5Oclose");
         }
     }
-  
+
     H5Sclose(filespace);
     H5Fclose(fid);
 
     HDfree(oid_list);
 
-    /* Reopen the file to check whether H5Fget_obj_count and H5Fget_obj_ids still works 
-     * when the file is closed first */ 
+    /* Reopen the file to check whether H5Fget_obj_count and H5Fget_obj_ids still works
+     * when the file is closed first */
     fid = H5Fopen(FILE6, H5F_ACC_RDONLY, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fopen");
 
     /* Open NDSETS datasets under the root group */
     for(n = 0; n < NDSETS; n++) {
-         sprintf(dname, "dataset%d", n);
+         HDsprintf(dname, "dataset%d", n);
          dset[n] = H5Dopen2(fid, dname, H5P_DEFAULT);
          CHECK(dset[n], FAIL, "H5Dcreate2");
     }
@@ -1109,7 +1109,7 @@ static void
 test_get_file_id(void)
 {
     hid_t               fid, fid2, fid3;
-    hid_t		datatype_id, dataset_id, dataspace_id, group_id, attr_id;
+    hid_t        datatype_id, dataset_id, dataspace_id, group_id, attr_id;
     hid_t               plist;
     hsize_t             dims[F2_RANK];
     unsigned            intent;
@@ -1267,7 +1267,7 @@ check_file_id(hid_t fid, hid_t object_id)
 ****************************************************************/
 static void
 test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
-			hid_t gid2, hid_t gid3)
+            hid_t gid2, hid_t gid3)
 {
     hid_t    fid3, fid4;
     ssize_t  oid_count, ret_count;
@@ -1308,7 +1308,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
     oid_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_ALL);
     CHECK(oid_count, FAIL, "H5Fget_obj_count");
     VERIFY(oid_count, OBJ_ID_COUNT_8, "H5Fget_obj_count");
- 
+
     if(oid_count > 0) {
         hid_t *oid_list;
 
@@ -1316,8 +1316,8 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
         if(oid_list != NULL) {
             int   i;
 
-	    ret_count = H5Fget_obj_ids((hid_t)H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list);
-	    CHECK(ret_count, FAIL, "H5Fget_obj_ids");
+        ret_count = H5Fget_obj_ids((hid_t)H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list);
+        CHECK(ret_count, FAIL, "H5Fget_obj_ids");
 
             for(i = 0; i < oid_count; i++) {
                 H5I_type_t id_type;
@@ -1418,11 +1418,11 @@ test_file_perm(void)
 /****************************************************************
 **
 **  test_file_perm2(): low-level file test routine.
-**      This test verifies that no object can be created in a 
+**      This test verifies that no object can be created in a
 **      file that is opened for read-only.
 **
 *****************************************************************/
-static void 
+static void
 test_file_perm2(void)
 {
     hid_t    file;      /* File opened with read-write permission */
@@ -1432,7 +1432,7 @@ test_file_perm2(void)
     hid_t    dset;      /* Dataset ID */
     hid_t    type;      /* Datatype ID */
     hid_t    attr;      /* Attribute ID */
-    herr_t   ret; 
+    herr_t   ret;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Low-Level File Permissions again\n"));
@@ -1495,9 +1495,9 @@ test_file_perm2(void)
 **      situations.
 **
 **  Modifications:
-**	Vailin Choi; July 2012
-**	Remove datasets in reverse order so that all file spaces are shrunk.
-**	(A change due to H5FD_FLMAP_DICHOTOMY.)
+**    Vailin Choi; July 2012
+**    Remove datasets in reverse order so that all file spaces are shrunk.
+**    (A change due to H5FD_FLMAP_DICHOTOMY.)
 **
 *****************************************************************/
 static void
@@ -1510,7 +1510,7 @@ test_file_freespace(void)
     hid_t    dspace;    /* Dataspace ID */
     hid_t    dset;      /* Dataset ID */
     hid_t    dcpl;      /* Dataset creation property list */
-    int k;		/* Local index variable */
+    int k;        /* Local index variable */
     unsigned u;         /* Local index variable */
     char     name[32];  /* Dataset name */
     herr_t   ret;
@@ -1659,7 +1659,7 @@ test_file_ishdf5(void)
     CHECK(fd, FAIL, "HDopen");
 
     /* Initialize information to write */
-    for(u=0; u<1024; u++)
+    for(u = 0; u < 1024; u++)
         buf[u]=(unsigned char)u;
 
     /* Write some information */
@@ -2130,15 +2130,15 @@ test_file_double_dataset_open(void)
 **
 **  test_open2x_vlen():
 **      This is the helper routine used by test_open2x_vlen().
-**	This is modified based on the customer's test program.
-**	(HDFFV-9469):
-**	--read from the specified dataset
+**    This is modified based on the customer's test program.
+**    (HDFFV-9469):
+**    --read from the specified dataset
 **
 *****************************************************************/
-static void 
+static void
 CheckRead(hid_t did)
 {
-    hid_t mtid = -1; 
+    hid_t mtid = -1;
     hid_t sid = -1;
     hvl_t *read = NULL;
     herr_t ret;
@@ -2176,11 +2176,11 @@ CheckRead(hid_t did)
 **
 **  test_open2x_vlen():
 **      This test is modified based on the customer's test program.
-**	(HDFFV-9469):
-** 	--open a file and a dataset with variable length type twice
-** 	--close both opens of the file
-**	--close the dataset from first open
-**	--verify that reading from the dataset (second open) is successful
+**    (HDFFV-9469):
+**     --open a file and a dataset with variable length type twice
+**     --close both opens of the file
+**    --close the dataset from first open
+**    --verify that reading from the dataset (second open) is successful
 **
 *****************************************************************/
 static void
@@ -2194,7 +2194,7 @@ test_open2x_vlen(void)
     hsize_t dims[1] = { 1 };
     int64_t integers[10] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
     hvl_t written;
-    herr_t ret;         			/* Generic return value */
+    herr_t ret;                     /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing open file and variable length dataset twice and closing 1 dataset\n"));
@@ -3039,15 +3039,15 @@ test_libver_bounds(void)
 /****************************************************************
 **
 **  test_libver_macros():
-**	Verify that H5_VERSION_GE and H5_VERSION_LE work correactly.
+**    Verify that H5_VERSION_GE and H5_VERSION_LE work correactly.
 **
 ****************************************************************/
 static void
 test_libver_macros(void)
 {
-    unsigned	major = H5_VERS_MAJOR;
-    unsigned	minor = H5_VERS_MINOR;
-    unsigned	release = H5_VERS_RELEASE;
+    unsigned    major = H5_VERS_MAJOR;
+    unsigned    minor = H5_VERS_MINOR;
+    unsigned    release = H5_VERS_RELEASE;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing macros for library version comparison\n"));
@@ -3086,7 +3086,7 @@ test_libver_macros(void)
 /****************************************************************
 **
 **  test_libver_macros2():
-**	Verify that H5_VERSION_GE works correactly and show how
+**    Verify that H5_VERSION_GE works correactly and show how
 **      to use it.
 **
 ****************************************************************/
@@ -3119,9 +3119,9 @@ test_libver_macros2(void)
     ret = H5Gclose(grp);
     CHECK(ret, FAIL, "H5Gclose");
 
-    /* 
+    /*
      * Delete the group using different function based on the library version.
-     *  And verify the action. 
+     *  And verify the action.
      */
 #if H5_VERSION_GE(1,8,0)
     ret = H5Ldelete(file, "Group", H5P_DEFAULT);
@@ -3175,7 +3175,7 @@ test_file(void)
     test_file_double_group_open();      /* Test opening same group from two files works properly */
     test_file_double_dataset_open();    /* Test opening same dataset from two files works properly */
     test_file_double_datatype_open();   /* Test opening same named datatype from two files works properly */
-    test_open2x_vlen();		/* Test opening file and variable length dataset twice and closing 1 dataset */
+    test_open2x_vlen();        /* Test opening file and variable length dataset twice and closing 1 dataset */
     test_userblock_file_size(); /* Tests that files created with a userblock have the correct size */
     test_cached_stab_info();    /* Tests that files are created with cached stab info in the superblock */
     test_rw_noupdate();         /* Test to ensure that RW permissions don't write the file unless dirtied */
@@ -3185,15 +3185,15 @@ test_file(void)
     test_libver_macros2();      /* Show the use of the macros for library version comparison */
 } /* test_file() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_file
+ * Function:    cleanup_file
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Albert Cheng
+ * Programmer:    Albert Cheng
  *              July 2, 1998
  *
  * Modifications:
diff --git a/test/tgenprop.c b/test/tgenprop.c
index d6f4ac7..175e8b9 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -680,7 +680,7 @@ test_genprop_basic_list(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
-	printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
+	HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
 	    "H5Pget", *PROP2_DEF_VALUE, prop2_value, (int)__LINE__, __FILE__);
 
 
@@ -772,7 +772,7 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
-	printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
+	HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
 	    "H5Pget", *PROP2_DEF_VALUE, prop2_value, (int)__LINE__, __FILE__);
 
 
@@ -785,7 +785,7 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
-	printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
+	HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
 	    "H5Pget", *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Delete permanent property */
@@ -822,7 +822,7 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
-	printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
+	HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
 	    "H5Pget", *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Close list */
@@ -1236,7 +1236,7 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
-	printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
+	HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
 	    "H5Pget", *PROP2_DEF_VALUE, prop2_value, (int)__LINE__, __FILE__);
 
     /* Check values of temporary properties (set with regular values) */
@@ -1251,7 +1251,7 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
-	printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
+	HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
 	    "H5Pget", *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Verify get callback information for properties tracked */
diff --git a/test/th5s.c b/test/th5s.c
index c56f0cc..cfb7b11 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -191,7 +191,7 @@ test_h5s_basic(void)
 	CHECK_I(ret, "H5Fclose");
     }
     else
-	printf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n",
+	HDprintf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n",
 	    testfile);
     }
 
@@ -661,7 +661,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata[i][j]);
                 }
             }
@@ -683,7 +683,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata_short[i][j]);
                 }
             }
@@ -750,7 +750,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata[i][j]);
                 }
         }
@@ -776,7 +776,7 @@ test_h5s_zero_dim(void)
                 for(k=0; k<SPACE1_DIM3; k++) {
                     if(rdata_real[i][j][k] != wdata_real[i][j][k]) {
                         H5_FAILED();
-                        printf("element [%d][%d][%d] is %d but should have been %d\n",
+                        HDprintf("element [%d][%d][%d] is %d but should have been %d\n",
                            i, j, k, rdata_real[i][j][k], wdata_real[i][j][k]);
                     }
                 }
@@ -800,7 +800,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata[i][j]);
                 }
         }
@@ -847,7 +847,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata[i][j]);
                 }
         }
@@ -891,7 +891,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata[i][j]);
                 }
             }
@@ -923,7 +923,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata[i][j]);
                 }
             }
@@ -945,7 +945,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata_short[i][j]);
                 }
             }
@@ -1007,7 +1007,7 @@ test_h5s_zero_dim(void)
                 for(k=0; k<SPACE1_DIM3; k++) {
                     if(rdata_real[i][j][k] != wdata_real[i][j][k]) {
                         H5_FAILED();
-                        printf("element [%d][%d][%d] is %d but should have been %d\n",
+                        HDprintf("element [%d][%d][%d] is %d but should have been %d\n",
                            i, j, k, rdata_real[i][j][k], wdata_real[i][j][k]);
                     }
                 }
@@ -1094,7 +1094,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata[i][j]);
                 }
             }
@@ -1132,7 +1132,7 @@ test_h5s_zero_dim(void)
             for(j=0; j<SPACE1_DIM3; j++) {
                 if(rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %d but should have been 7\n",
+                    HDprintf("element [%d][%d] is %d but should have been 7\n",
                            i, j, rdata_short[i][j]);
                 }
             }
@@ -1678,9 +1678,9 @@ test_h5s_compound_scalar_read(void)
     ret = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
     if(HDmemcmp(&space4_data,&rdata,sizeof(struct space4_struct))) {
-        printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n",space4_data.c1,rdata.c1);
-        printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n",space4_data.u,rdata.u);
-        printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n",space4_data.f,rdata.f);
+        HDprintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n",space4_data.c1,rdata.c1);
+        HDprintf("scalar data different: space4_data.u=%u, read_data4.u=%u\n",space4_data.u,rdata.u);
+        HDprintf("scalar data different: space4_data.f=%f, read_data4.f=%f\n",space4_data.f,rdata.f);
         TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n",space4_data.c1,rdata.c2);
      } /* end if */
 
diff --git a/test/titerate.c b/test/titerate.c
index 5c8960c..3170342 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -13,15 +13,14 @@
 
 /***********************************************************
 *
-* Test program:	 titerate
+* Test program:     titerate
 *
 * Test the Group & Attribute functionality
 *
 *************************************************************/
 
 #include "testhdf5.h"
-
-#include "hdf5.h"
+#include "H5srcdir.h"
 
 #define DATAFILE   "titerate.h5"
 
@@ -38,8 +37,8 @@
 #define NAMELEN     80
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_RANK	1
-#define SPACE1_DIM1	4
+#define SPACE1_RANK    1
+#define SPACE1_DIM1    4
 
 typedef enum {
     RET_ZERO,
@@ -106,7 +105,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_
             return(count2 > 10 ? 1 : 0);
 
         default:
-            printf("invalid iteration command");
+            HDprintf("invalid iteration command");
             return(-1);
     } /* end switch */
 } /* end liter_cb() */
@@ -131,7 +130,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     char dataset_name[NAMELEN];  /* dataset name */
     iter_info info;         /* Custom iteration information */
     H5G_info_t ginfo;       /* Buffer for querying object's info */
-    herr_t ret;		    /* Generic return value */
+    herr_t ret;            /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Group Iteration Functionality\n"));
@@ -153,13 +152,13 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     CHECK(filespace, FAIL, "H5Screate");
 
     for(i=0; i< NDATASETS; i++) {
-        sprintf(name,"Dataset %d",i);
+        HDsprintf(name,"Dataset %d",i);
         dataset = H5Dcreate2(file, name, datatype, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(dataset, FAIL, "H5Dcreate2");
 
         /* Keep a copy of the dataset names around for later */
         lnames[i] = HDstrdup(name);
-        CHECK(lnames[i], NULL, "strdup");
+        CHECK_PTR(lnames[i], "strdup");
 
         ret = H5Dclose(dataset);
         CHECK(ret, FAIL, "H5Dclose");
@@ -170,13 +169,13 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     CHECK(ret, FAIL, "H5Gcreate2");
 
     lnames[NDATASETS] = HDstrdup("grp");
-    CHECK(lnames[NDATASETS], NULL, "strdup");
+    CHECK_PTR(lnames[NDATASETS], "strdup");
 
     ret = H5Tcommit2(file, "dtype", datatype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Tcommit2");
 
     lnames[NDATASETS + 1] = HDstrdup("dtype");
-    CHECK(lnames[NDATASETS], NULL, "strdup");
+    CHECK_PTR(lnames[NDATASETS], "strdup");
 
     /* Close everything up */
     ret = H5Tclose(datatype);
@@ -281,7 +280,8 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     /* Test all objects in group, when callback always returns 1 */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = RET_TWO;
-    idx = i = 0;
+    i = 0;
+    idx = 0;
     while((ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) > 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 2, "H5Literate");
@@ -306,7 +306,8 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     /* Test all objects in group, when callback changes return value */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = new_format ? RET_CHANGE2 : RET_CHANGE;
-    idx = i = 0;
+    i = 0;
+    idx = 0;
     while((ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) >= 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 1, "H5Literate");
@@ -367,7 +368,7 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_
             return(count2 > 10 ? 1 : 0);
 
         default:
-            printf("invalid iteration command");
+            HDprintf("invalid iteration command");
             return(-1);
     } /* end switch */
 } /* end aiter_cb() */
@@ -388,7 +389,7 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
     char name[NAMELEN];     /* temporary name buffer */
     char *anames[NATTR];    /* Names of the attributes created */
     iter_info info;         /* Custom iteration information */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Attribute Iteration Functionality\n"));
@@ -404,13 +405,13 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
     CHECK(dataset, FAIL, "H5Dcreate2");
 
     for(i = 0; i < NATTR; i++) {
-        sprintf(name, "Attribute %02d", i);
+        HDsprintf(name, "Attribute %02d", i);
         attribute = H5Acreate2(dataset, name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attribute, FAIL, "H5Acreate2");
 
         /* Keep a copy of the attribute names around for later */
         anames[i] = HDstrdup(name);
-        CHECK(anames[i], NULL, "strdup");
+        CHECK_PTR(anames[i], "strdup");
 
         ret = H5Aclose(attribute);
         CHECK(ret, FAIL, "H5Aclose");
@@ -460,7 +461,8 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
     /* Test all attributes on dataset, when callback always returns 1 */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = RET_TWO;
-    idx = i = 0;
+    i = 0;
+    idx = 0;
     while((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 2, "H5Aiterate2");
@@ -486,7 +488,8 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
     /* Test all attributes on dataset, when callback changes return value */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = new_format ? RET_CHANGE2 : RET_CHANGE;
-    idx = i = 0;
+    i = 0;
+    idx = 0;
     while((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 1, "H5Aiterate2");
@@ -541,7 +544,7 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info_t H5_ATTR_UNUSED *link_
 {
     const iter_info *test_info = (const iter_info *)opdata;
     H5O_info_t oinfo;
-    herr_t ret;		/* Generic return value		*/
+    herr_t ret;        /* Generic return value        */
 
     if(HDstrcmp(name, test_info->name)) {
         TestErrPrintf("name = '%s', test_info = '%s'\n", name, test_info->name);
@@ -571,16 +574,16 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info_t H5_ATTR_UNUSED *link_
 static void
 test_iter_group_large(hid_t fapl)
 {
-    hid_t		file;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		group;      /* Group ID             */
-    hid_t		sid;       /* Dataspace ID			*/
-    hid_t		tid;       /* Datatype ID			*/
-    hsize_t		dims[] = {SPACE1_DIM1};
-    herr_t		ret;		/* Generic return value		*/
-    char gname[20];         /* Temporary group name */
-    iter_info names[ITER_NGROUPS+2]; /* Names of objects in the root group */
-    iter_info *curr_name;        /* Pointer to the current name in the root group */
+    hid_t        file;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        group;      /* Group ID             */
+    hid_t        sid;       /* Dataspace ID            */
+    hid_t        tid;       /* Datatype ID            */
+    hsize_t        dims[] = {SPACE1_DIM1};
+    herr_t        ret;        /* Generic return value        */
+    char gname[20];             /* Temporary group name */
+    iter_info *names;           /* Names of objects in the root group */
+    iter_info *curr_name;       /* Pointer to the current name in the root group */
     int                 i;
 
     /* Compound datatype */
@@ -590,7 +593,9 @@ test_iter_group_large(hid_t fapl)
         float c;
     } s1_t;
 
-    HDmemset(names, 0, sizeof names);
+    /* Allocate & initialize array */
+    names = (iter_info *)HDcalloc(sizeof(iter_info), (ITER_NGROUPS + 2));
+    CHECK_PTR(names, "HDcalloc");
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Large Group Iteration Functionality\n"));
@@ -605,7 +610,7 @@ test_iter_group_large(hid_t fapl)
 
     /* Create a bunch of groups */
     for(i = 0; i < ITER_NGROUPS; i++) {
-        sprintf(gname, "Group_%d", i);
+        HDsprintf(gname, "Group_%d", i);
 
         /* Add the name to the list of objects in the root group */
         HDstrcpy(names[i].name, gname);
@@ -670,7 +675,7 @@ test_iter_group_large(hid_t fapl)
     ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, NULL, liter_cb2, curr_name);
     CHECK(ret, FAIL, "H5Literate");
     for(i = 1; i < 100; i++) {
-        hsize_t idx = i;
+        hsize_t idx = (hsize_t)i;
 
         curr_name = &names[i];
         ret = H5Literate(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb2, curr_name);
@@ -680,6 +685,9 @@ test_iter_group_large(hid_t fapl)
     /* Close file */
     ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
+
+    /* Release memory */
+    HDfree(names);
 } /* test_iterate_group_large() */
 
 /****************************************************************
@@ -702,7 +710,7 @@ static void test_grp_memb_funcs(hid_t fapl)
     char dataset_name[NAMELEN];  /* dataset name */
     ssize_t name_len;       /* Length of object's name */
     H5G_info_t ginfo;       /* Buffer for querying object's info */
-    herr_t ret;		    /* Generic return value */
+    herr_t ret = SUCCEED;    /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Group Member Information Functionality\n"));
@@ -718,13 +726,13 @@ static void test_grp_memb_funcs(hid_t fapl)
     CHECK(filespace, FAIL, "H5Screate");
 
     for(i = 0; i < NDATASETS; i++) {
-        sprintf(name, "Dataset %d", i);
+        HDsprintf(name, "Dataset %d", i);
         dataset = H5Dcreate2(file, name, datatype, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(dataset, FAIL, "H5Dcreate2");
 
         /* Keep a copy of the dataset names around for later */
         dnames[i] = HDstrdup(name);
-        CHECK(dnames[i], NULL, "strdup");
+        CHECK_PTR(dnames[i], "strdup");
 
         ret = H5Dclose(dataset);
         CHECK(ret, FAIL, "H5Dclose");
@@ -735,13 +743,13 @@ static void test_grp_memb_funcs(hid_t fapl)
     CHECK(ret, FAIL, "H5Gcreate2");
 
     dnames[NDATASETS] = HDstrdup("grp");
-    CHECK(dnames[NDATASETS], NULL, "strdup");
+    CHECK_PTR(dnames[NDATASETS], "strdup");
 
     ret = H5Tcommit2(file, "dtype", datatype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Tcommit2");
 
     dnames[NDATASETS + 1] = HDstrdup("dtype");
-    CHECK(dnames[NDATASETS], NULL, "strdup");
+    CHECK_PTR(dnames[NDATASETS], "strdup");
 
     /* Close everything up */
     ret = H5Tclose(datatype);
@@ -788,7 +796,7 @@ static void test_grp_memb_funcs(hid_t fapl)
 
         /* Keep a copy of the dataset names around for later */
         obj_names[i] = HDstrdup(dataset_name);
-        CHECK(obj_names[i], NULL, "strdup");
+        CHECK_PTR(obj_names[i], "strdup");
 
         ret = H5Oget_info_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Oget_info_by_idx");
@@ -842,7 +850,7 @@ static void test_links(hid_t fapl)
     hid_t    gid, gid1;
     H5G_info_t ginfo;       /* Buffer for querying object's info */
     hsize_t i;
-    herr_t ret;		    /* Generic return value */
+    herr_t ret;            /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Soft and Hard Link Iteration Functionality\n"));
@@ -951,15 +959,15 @@ test_iterate(void)
     CHECK(ret, FAIL, "H5Pclose");
 }   /* test_iterate() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_iterate
+ * Function:    cleanup_iterate
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              April 5, 2000
  *
  * Modifications:
@@ -969,6 +977,6 @@ test_iterate(void)
 void
 cleanup_iterate(void)
 {
-    remove(DATAFILE);
+    HDremove(DATAFILE);
 }
 
diff --git a/test/tmisc.c b/test/tmisc.c
index aae1a99..26c1eb0 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -26,7 +26,6 @@
 /* Define this macro to indicate that the testing APIs should be available */
 #define H5D_TESTING
 
-#include "hdf5.h"
 #include "testhdf5.h"
 #include "H5srcdir.h"
 #include "H5Dpkg.h"    /* Datasets         */
@@ -178,17 +177,12 @@ typedef struct
 #define MISC13_GROUP1_NAME     "Group1"
 #define MISC13_GROUP2_NAME     "Group2"
 #define MISC13_DTYPE_NAME      "Datatype"
-#define MISC13_RANK            2
-#define MISC13_DIM1            20
-#define MISC13_DIM2            30
+#define MISC13_RANK            1
+#define MISC13_DIM1            600
 #define MISC13_CHUNK_DIM1      10
-#define MISC13_CHUNK_DIM2      15
 #define MISC13_USERBLOCK_SIZE  512
 #define MISC13_COPY_BUF_SIZE   4096
 
-unsigned m13_data[MISC13_DIM1][MISC13_DIM2];           /* Data to write to dataset */
-unsigned m13_rdata[MISC13_DIM1][MISC13_DIM2];          /* Data read from dataset */
-
 /* Definitions for misc. test #14 */
 #define MISC14_FILE             "tmisc14.h5"
 #define MISC14_DSET1_NAME       "Dataset1"
@@ -465,10 +459,11 @@ static void test_misc2_write_attribute(void)
     ret = H5Aread(att1, type, &data_check);
     CHECK(ret, FAIL, "H5Aread");
 
-    HDfree(data_check.string);
+    ret = H5Dvlen_reclaim(type, dataspace, H5P_DEFAULT, &data_check);
+    CHECK(ret, FAIL, "H5Dvlen_reclaim");
 
     ret = H5Aclose(att1);
-    CHECK(ret, FAIL, "HAclose");
+    CHECK(ret, FAIL, "H5Aclose");
 
     ret = H5Gclose(root1);
     CHECK(ret, FAIL, "H5Gclose");
@@ -490,10 +485,11 @@ static void test_misc2_write_attribute(void)
     ret = H5Aread(att2, type, &data_check);
     CHECK(ret, FAIL, "H5Aread");
 
-    HDfree(data_check.string);
+    ret = H5Dvlen_reclaim(type, dataspace, H5P_DEFAULT, &data_check);
+    CHECK(ret, FAIL, "H5Dvlen_reclaim");
 
     ret = H5Aclose(att2);
-    CHECK(ret, FAIL, "HAclose");
+    CHECK(ret, FAIL, "H5Aclose");
 
     ret = H5Gclose(root2);
     CHECK(ret, FAIL, "H5Gclose");
@@ -517,6 +513,7 @@ static void test_misc2_read_attribute(const char *filename, const char *att_name
 {
     hid_t file, root, att;
     hid_t type;
+    hid_t space;
     herr_t ret;
     misc2_struct data_check;
 
@@ -531,10 +528,17 @@ static void test_misc2_read_attribute(const char *filename, const char *att_name
     att = H5Aopen(root, att_name, H5P_DEFAULT);
     CHECK(att, FAIL, "H5Aopen");
 
+    space = H5Aget_space(att);
+    CHECK(space, FAIL, "H5Aget_space");
+
     ret = H5Aread(att, type, &data_check);
     CHECK(ret, FAIL, "H5Aread");
 
-    HDfree(data_check.string);
+    ret = H5Dvlen_reclaim(type, space, H5P_DEFAULT, &data_check);
+    CHECK(ret, FAIL, "H5Dvlen_reclaim");
+
+    ret = H5Sclose(space);
+    CHECK(ret, FAIL, "H5Sclose");
 
     ret = H5Aclose(att);
     CHECK(ret, FAIL, "H5Aclose");
@@ -716,8 +720,8 @@ create_struct3(void)
     misc5_struct3_hndl *str3hndl;       /* New 'struct3' created */
     herr_t ret;                         /* For error checking */
 
-    str3hndl = HDmalloc(sizeof(misc5_struct3_hndl));
-    CHECK(str3hndl,NULL,"malloc");
+    str3hndl = (misc5_struct3_hndl *)HDmalloc(sizeof(misc5_struct3_hndl));
+    CHECK_PTR(str3hndl, "malloc");
 
     str3hndl->st3h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct3));
     CHECK(str3hndl->st3h_base, FAIL, "H5Tcreate");
@@ -725,10 +729,10 @@ create_struct3(void)
     ret = H5Tinsert(str3hndl->st3h_base, "st3_el1", HOFFSET( misc5_struct3, st3_el1), H5T_NATIVE_INT);
     CHECK(ret,FAIL,"H5Tinsert");
 
-    str3hndl->st3h_id=H5Tvlen_create(str3hndl->st3h_base);
+    str3hndl->st3h_id = H5Tvlen_create(str3hndl->st3h_base);
     CHECK(str3hndl->st3h_id,FAIL,"H5Tvlen_create");
 
-    return(str3hndl);
+    return str3hndl;
 }
 
 static void
@@ -736,10 +740,10 @@ delete_struct3(misc5_struct3_hndl *str3hndl)
 {
     herr_t ret;                         /* For error checking */
 
-    ret=H5Tclose(str3hndl->st3h_id);
+    ret = H5Tclose(str3hndl->st3h_id);
     CHECK(ret,FAIL,"H5Tclose");
 
-    ret=H5Tclose(str3hndl->st3h_base);
+    ret = H5Tclose(str3hndl->st3h_base);
     CHECK(ret,FAIL,"H5Tclose");
 
     HDfree(str3hndl);
@@ -759,8 +763,8 @@ create_struct2(void)
     misc5_struct2_hndl *str2hndl;       /* New 'struct2' created */
     herr_t ret;                         /* For error checking */
 
-    str2hndl = HDmalloc(sizeof(misc5_struct2_hndl));
-    CHECK(str2hndl, NULL, "malloc");
+    str2hndl = (misc5_struct2_hndl *)HDmalloc(sizeof(misc5_struct2_hndl));
+    CHECK_PTR(str2hndl, "HDmalloc");
 
     str2hndl->st2h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct2));
     CHECK(str2hndl->st2h_base, FAIL, "H5Tcreate");
@@ -768,16 +772,16 @@ create_struct2(void)
     ret = H5Tinsert(str2hndl->st2h_base, "st2_el1", HOFFSET(misc5_struct2, st2_el1), H5T_NATIVE_INT);
     CHECK(ret, FAIL, "H5Tinsert");
 
-    str2hndl->st2h_st3hndl=create_struct3();
-    CHECK(str2hndl->st2h_st3hndl,NULL,"create_struct3");
+    str2hndl->st2h_st3hndl = create_struct3();
+    CHECK_PTR(str2hndl->st2h_st3hndl, "create_struct3");
 
-    ret=H5Tinsert(str2hndl->st2h_base, "st2_el2", HOFFSET(misc5_struct2, st2_el2), str2hndl->st2h_st3hndl->st3h_id);
+    ret = H5Tinsert(str2hndl->st2h_base, "st2_el2", HOFFSET(misc5_struct2, st2_el2), str2hndl->st2h_st3hndl->st3h_id);
     CHECK(ret,FAIL,"H5Tinsert");
 
-    str2hndl->st2h_id= H5Tvlen_create(str2hndl->st2h_base);
+    str2hndl->st2h_id = H5Tvlen_create(str2hndl->st2h_base);
     CHECK(str2hndl->st2h_id,FAIL,"H5Tvlen_create");
 
-    return(str2hndl);
+    return str2hndl;
 }
 
 static void
@@ -801,11 +805,11 @@ set_struct2(misc5_struct2 *buf)
 {
     unsigned i;         /* Local index variable */
 
-    buf->st2_el1=MISC5_DBGELVAL2;
-    buf->st2_el2.len=MISC5_DBGNELM3;
+    buf->st2_el1 = MISC5_DBGELVAL2;
+    buf->st2_el2.len = MISC5_DBGNELM3;
 
-    buf->st2_el2.p=HDmalloc((buf->st2_el2.len)*sizeof(misc5_struct3));
-    CHECK(buf->st2_el2.p,NULL,"malloc");
+    buf->st2_el2.p = HDmalloc((buf->st2_el2.len)*sizeof(misc5_struct3));
+    CHECK_PTR(buf->st2_el2.p, "HDmalloc");
 
     for(i=0; i<(buf->st2_el2.len); i++)
         set_struct3(&(((misc5_struct3 *)(buf->st2_el2.p))[i]));
@@ -825,8 +829,8 @@ create_struct1(void)
     misc5_struct1_hndl *str1hndl;       /* New 'struct1' created */
     herr_t ret;                         /* For error checking */
 
-    str1hndl = HDmalloc(sizeof(misc5_struct1_hndl));
-    CHECK(str1hndl, NULL, "malloc");
+    str1hndl = (misc5_struct1_hndl *)HDmalloc(sizeof(misc5_struct1_hndl));
+    CHECK_PTR(str1hndl, "HDmalloc");
 
     str1hndl->st1h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct1));
     CHECK(str1hndl->st1h_base, FAIL, "H5Tcreate");
@@ -835,15 +839,15 @@ create_struct1(void)
     CHECK(ret, FAIL, "H5Tinsert");
 
     str1hndl->st1h_st2hndl=create_struct2();
-    CHECK(str1hndl->st1h_st2hndl,NULL,"create_struct2");
+    CHECK_PTR(str1hndl->st1h_st2hndl, "create_struct2");
 
-    ret=H5Tinsert(str1hndl->st1h_base, "st1_el2", HOFFSET(misc5_struct1, st1_el2), str1hndl->st1h_st2hndl->st2h_id);
+    ret = H5Tinsert(str1hndl->st1h_base, "st1_el2", HOFFSET(misc5_struct1, st1_el2), str1hndl->st1h_st2hndl->st2h_id);
     CHECK(ret,FAIL,"H5Tinsert");
 
-    str1hndl->st1h_id=H5Tvlen_create(str1hndl->st1h_base);
+    str1hndl->st1h_id = H5Tvlen_create(str1hndl->st1h_base);
     CHECK(str1hndl->st1h_id,FAIL,"H5Tvlen_create");
 
-    return(str1hndl);
+    return str1hndl;
 }
 
 static void
@@ -851,12 +855,12 @@ delete_struct1(misc5_struct1_hndl *str1hndl)
 {
     herr_t ret;                         /* For error checking */
 
-    ret=H5Tclose(str1hndl->st1h_id);
+    ret = H5Tclose(str1hndl->st1h_id);
     CHECK(ret,FAIL,"H5Tclose");
 
     delete_struct2(str1hndl->st1h_st2hndl);
 
-    ret=H5Tclose(str1hndl->st1h_base);
+    ret = H5Tclose(str1hndl->st1h_base);
     CHECK(ret,FAIL,"H5Tclose");
 
     HDfree(str1hndl);
@@ -871,7 +875,7 @@ set_struct1(misc5_struct1 *buf)
     buf->st1_el2.len=MISC5_DBGNELM2;
 
     buf->st1_el2.p=HDmalloc((buf->st1_el2.len)*sizeof(misc5_struct2));
-    CHECK(buf->st1_el2.p,NULL,"malloc");
+    CHECK_PTR(buf->st1_el2.p, "HDmalloc");
 
     for(i=0; i<(buf->st1_el2.len); i++)
         set_struct2(&(((misc5_struct2 *)(buf->st1_el2.p))[i]));
@@ -907,7 +911,7 @@ test_misc5(void)
 
     /* Create the memory structure to write */
     str1hndl = create_struct1();
-    CHECK(str1hndl, NULL, "create_struct1");
+    CHECK_PTR(str1hndl, "create_struct1");
 
     /* Create the dataspace */
     dims[0] = MISC5_NELMTOPLVL;
@@ -921,7 +925,7 @@ test_misc5(void)
     /* Create the variable-length buffer */
     buf.len = MISC5_DBGNELM1;
     buf.p = HDmalloc((buf.len) * sizeof(misc5_struct1));
-    CHECK(buf.p, NULL, "malloc");
+    CHECK_PTR(buf.p, "HDmalloc");
 
     /* Create the top-level VL information */
     for(i = 0; i < MISC5_DBGNELM1; i++)
@@ -976,13 +980,13 @@ test_misc5(void)
 
     /* Verify the correct information was read in */
     for(i=0; i<(buf.len); i++) {
-        /* printf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */
+        /* HDprintf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */
         VERIFY(((misc5_struct1 *)(buf.p))[i].st1_el1,MISC5_DBGELVAL1,"H5Dread");
         for(j=0; j<(((misc5_struct1 *)(buf.p)) [i].st1_el2.len); j++) {
-            /* printf("   [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *) (buf.p))[i].st1_el2.p))[j].st2_el1); */
+            /* HDprintf("   [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *) (buf.p))[i].st1_el2.p))[j].st2_el1); */
             VERIFY(((misc5_struct2 *)(((misc5_struct1 *) (buf.p))[i].st1_el2.p))[j].st2_el1, MISC5_DBGELVAL2,"H5Dread");
             for(k=0; k<(((misc5_struct2 *) (((misc5_struct1 *)(buf.p))[i].  st1_el2.p))[j].st2_el2.len); k++) {
-                /* printf("      [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1 *)(buf.p))[i].  st1_el2.p))[j].st2_el2.p))[k].st3_el1); */
+                /* HDprintf("      [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1 *)(buf.p))[i].  st1_el2.p))[j].st2_el2.p))[k].st3_el1); */
                 VERIFY(((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1 *)(buf.p))[i].  st1_el2.p))[j].st2_el2.p))[k].st3_el1, MISC5_DBGELVAL3,"H5Dread");
             } /* end for */
         }
@@ -1059,7 +1063,7 @@ test_misc6(void)
     /* Loop through adding attributes to each dataset */
     for(u = 0; u < MISC6_NUMATTR; u++) {
         /* Create name for attribute */
-        sprintf(attr_name, "Attr#%u", u);
+        HDsprintf(attr_name, "Attr#%u", u);
 
         /* Open the file */
         loc_id = H5Fopen(MISC6_FILE, H5F_ACC_RDWR, H5P_DEFAULT);
@@ -1246,18 +1250,18 @@ test_misc8(void)
     MESSAGE(5, ("Testing dataset storage sizes\n"));
 
     /* Allocate space for the data to write & read */
-    wdata=HDmalloc(sizeof(int)*MISC8_DIM0*MISC8_DIM1);
-    CHECK(wdata,NULL,"malloc");
+    wdata = (int *)HDmalloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1);
+    CHECK_PTR(wdata, "HDmalloc");
 #ifdef VERIFY_DATA
-    rdata=HDmalloc(sizeof(int)*MISC8_DIM0*MISC8_DIM1);
-    CHECK(rdata,NULL,"malloc");
+    rdata = (int *)HDmalloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1);
+    CHECK_PTR(rdata, "HDmalloc");
 #endif /* VERIFY_DATA */
 
     /* Initialize values */
     tdata=wdata;
     for(u=0; u<MISC8_DIM0; u++)
         for(v=0; v<MISC8_DIM1; v++)
-            *tdata++=((u*MISC8_DIM1)+v)%13;
+            *tdata++ = (int)(((u * MISC8_DIM1) + v) % 13);
 
     /* Create a file acccess property list */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
@@ -1313,7 +1317,7 @@ test_misc8(void)
     /* Check the storage size */
     storage_size = H5Dget_storage_size(did);
     CHECK(storage_size, 0, "H5Dget_storage_size");
-    VERIFY(storage_size, MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Close dataset ID */
     ret = H5Dclose(did);
@@ -1339,7 +1343,7 @@ test_misc8(void)
     /* Check the storage size after data is written */
     storage_size = H5Dget_storage_size(did);
     CHECK(storage_size, 0, "H5Dget_storage_size");
-    VERIFY(storage_size, MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Close dataset ID */
     ret = H5Dclose(did);
@@ -1364,7 +1368,7 @@ test_misc8(void)
     /* Check the storage size after data is written */
     storage_size = H5Dget_storage_size(did);
     CHECK(storage_size, 0, "H5Dget_storage_size");
-    VERIFY(storage_size, MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Close dataset ID */
     ret = H5Dclose(did);
@@ -1408,7 +1412,7 @@ test_misc8(void)
     /* Check the storage size */
     storage_size = H5Dget_storage_size(did);
     CHECK(storage_size, 0, "H5Dget_storage_size");
-    VERIFY(storage_size, MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Close dataset ID */
     ret = H5Dclose(did);
@@ -1435,7 +1439,7 @@ test_misc8(void)
     /* Check the storage size after data is written */
     storage_size = H5Dget_storage_size(did);
     CHECK(storage_size, 0, "H5Dget_storage_size");
-    VERIFY(storage_size, MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Close dataset ID */
     ret = H5Dclose(did);
@@ -1465,7 +1469,7 @@ test_misc8(void)
     /* Check the storage size after data is written */
     storage_size = H5Dget_storage_size(did);
     CHECK(storage_size, 0, "H5Dget_storage_size");
-    VERIFY(storage_size, MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Close dataset ID */
     ret = H5Dclose(did);
@@ -1489,7 +1493,7 @@ test_misc8(void)
 
     /* Check the storage size after only four chunks are written */
     storage_size = H5Dget_storage_size(did);
-    VERIFY(storage_size, 4 * MISC8_CHUNK_DIM0 * MISC8_CHUNK_DIM1 * H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(4 * MISC8_CHUNK_DIM0 * MISC8_CHUNK_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Write entire dataset */
     ret = H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
@@ -1512,7 +1516,7 @@ test_misc8(void)
     /* Check the storage size after data is written */
     storage_size = H5Dget_storage_size(did);
     CHECK(storage_size, 0, "H5Dget_storage_size");
-    VERIFY(storage_size, MISC8_DIM0*MISC8_DIM1*H5Tget_size(H5T_NATIVE_INT), "H5Dget_storage_size");
+    VERIFY(storage_size, (hsize_t)(MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)), "H5Dget_storage_size");
 
     /* Close dataset ID */
     ret = H5Dclose(did);
@@ -1739,20 +1743,12 @@ test_misc10(void)
     hid_t       dataset, dataset_new;   /* Dataset IDs for old & new datasets */
     hid_t       dcpl;           /* Dataset creation property list */
     hid_t       space, type;    /* Old dataset's dataspace & datatype */
-    char testfile[512]="";          /* Character buffer for corrected test file name */
-    char *srcdir = HDgetenv("srcdir");    /* Pointer to the directory the source code is located within */
+    const char *testfile = H5_get_srcdir_filename(MISC10_FILE_OLD); /* Corrected test file name */
     herr_t      ret;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing using old dataset creation property list\n"));
 
-    /* Generate the correct name for the test file, by prepending the source path */
-    if(srcdir && ((HDstrlen(srcdir) + HDstrlen(MISC10_FILE_OLD) + 1) < sizeof(testfile))) {
-        HDstrcpy(testfile, srcdir);
-        HDstrcat(testfile, "/");
-    }
-    HDstrcat(testfile, MISC10_FILE_OLD);
-
     /*
      * Open the old file and the dataset and get old settings.
      */
@@ -1870,7 +1866,7 @@ test_misc11(void)
 
     /* This should fail as (32770*2) will exceed ^16 - 2 bytes for storing btree entries */
     H5E_BEGIN_TRY {
-	ret=H5Pset_sym_k(fcpl, 32770, 0);
+    ret=H5Pset_sym_k(fcpl, 32770, 0);
     } H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Pset_sym_k");
 
@@ -1879,7 +1875,7 @@ test_misc11(void)
 
     /* This should fail as (32770*2) will exceed ^16 - 2 bytes for storing btree entries */
     H5E_BEGIN_TRY {
-	ret=H5Pset_istore_k(fcpl, 32770);
+    ret=H5Pset_istore_k(fcpl, 32770);
     } H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Pset_istore_k");
 
@@ -1992,19 +1988,19 @@ test_misc12(void)
        "las palabras del que murio en la cruz."
         };
     char        *rdata [MISC12_SPACE1_DIM1+MISC12_APPEND_SIZE]; /* Information read in */
-    hid_t		fid1;
-    hid_t		dataset;
-    hid_t		sid1, space, memspace;
-    hid_t		tid1, cparms;
-    hsize_t		dims1[] = {MISC12_SPACE1_DIM1};
-    hsize_t		dimsn[] = {MISC12_APPEND_SIZE};
-    hsize_t		maxdims1[1] = {H5S_UNLIMITED};
-    hsize_t		chkdims1[1] = {MISC12_CHUNK_SIZE};
+    hid_t        fid1;
+    hid_t        dataset;
+    hid_t        sid1, space, memspace;
+    hid_t        tid1, cparms;
+    hsize_t        dims1[] = {MISC12_SPACE1_DIM1};
+    hsize_t        dimsn[] = {MISC12_APPEND_SIZE};
+    hsize_t        maxdims1[1] = {H5S_UNLIMITED};
+    hsize_t        chkdims1[1] = {MISC12_CHUNK_SIZE};
     hsize_t     newsize[1] = {MISC12_SPACE1_DIM1+MISC12_APPEND_SIZE};
-    hsize_t    	offset[1] = {MISC12_SPACE1_DIM1};
+    hsize_t        offset[1] = {MISC12_SPACE1_DIM1};
     hsize_t     count[1] = {MISC12_APPEND_SIZE};
     int         i;          /* counting variable */
-    herr_t		ret;		/* Generic return value  */
+    herr_t        ret;        /* Generic return value  */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing VL-type in chunked dataset\n"));
@@ -2096,38 +2092,36 @@ test_misc12(void)
 
 /* Various routines for misc. 13 test */
 static void
-init_data(void)
+misc13_init_data(unsigned *original_data)
 {
-    unsigned u,v;       /* Local index variables */
+    unsigned u;
 
-    for(u=0; u<MISC13_DIM1; u++)
-        for(v=0; v<MISC13_DIM2; v++)
-            m13_data[u][v]=(u*MISC13_DIM2)+v;
+    for(u = 0; u < MISC13_DIM1; u++)
+        original_data[u] = u;
 }
 
-static int
-verify_data(void)
+static hbool_t
+misc13_verify_data_match(const unsigned *original_data, const unsigned *read_data)
 {
-    unsigned u,v;       /* Local index variables */
+    unsigned u;
+
+    for(u = 0; u < MISC13_DIM1; u++)
+        if(original_data[u] != read_data[u])
+            return FALSE;
 
-    for(u=0; u<MISC13_DIM1; u++)
-        for(v=0; v<MISC13_DIM2; v++)
-            if(m13_data[u][v]!=m13_rdata[u][v])
-                return(-1);
-    return(0);
+    return TRUE;
 }
 
 static void
-create_dataset(hid_t loc_id, const char *name, hid_t dcpl)
+misc13_create_dataset(hid_t loc_id, const char *name, hid_t dcpl, const unsigned *data)
 {
-    hid_t dsid;         /* Dataset ID */
-    hid_t sid;          /* Dataspace ID */
-    hsize_t dims[MISC13_RANK]; /* Dataset dimensions */
-    herr_t ret;         /* Generic return value */
+    hid_t dsid = -1;            /* Dataset ID */
+    hid_t sid = -1;             /* Dataspace ID */
+    hsize_t dims[MISC13_RANK];  /* Dataset dimensions */
+    herr_t ret;                 /* Generic return value */
 
     /* Create dataspace for use with dataset */
     dims[0] = MISC13_DIM1;
-    dims[1] = MISC13_DIM2;
     sid = H5Screate_simple(MISC13_RANK, dims, NULL);
     CHECK(sid, FAIL, "H5Screate_simple");
 
@@ -2136,7 +2130,7 @@ create_dataset(hid_t loc_id, const char *name, hid_t dcpl)
     CHECK(dsid, FAIL, "H5Dcreate2");
 
     /* Write some data to dataset */
-    ret = H5Dwrite(dsid, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, m13_data);
+    ret = H5Dwrite(dsid, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close the contiguous dataset */
@@ -2146,64 +2140,74 @@ create_dataset(hid_t loc_id, const char *name, hid_t dcpl)
     /* Close the dataspace */
     ret = H5Sclose(sid);
     CHECK(ret, FAIL, "H5Sclose");
-}
+
+} /* end misc13_create_dataset() */
 
 static void
-verify_dataset(hid_t loc_id, const char *name)
+misc13_verify_dataset(hid_t loc_id, const char *name, const unsigned *data)
 {
-    hid_t dsid;         /* Dataset ID */
-    herr_t ret;         /* Generic return value */
+    unsigned *read_data = NULL;     /* Data to write to dataset */
+    hid_t dsid = -1;                /* Dataset ID */
+    herr_t ret;                     /* Generic return value */
+
+    /* Create a data buffer for the dataset read */
+    read_data = (unsigned *)HDcalloc(MISC13_DIM1, sizeof(unsigned));
+    CHECK_PTR(read_data, "HDcalloc");
 
     /* Open the contiguous dataset in the root group */
     dsid = H5Dopen2(loc_id, name, H5P_DEFAULT);
     CHECK(dsid, FAIL, "H5Dopen2");
 
     /* Read the data */
-    ret = H5Dread(dsid, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, m13_rdata);
+    ret = H5Dread(dsid, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_data);
     CHECK(ret, FAIL, "H5Dread");
 
-    /* Verify that the data is correct */
-    ret=verify_data();
-    CHECK(ret, FAIL, "verify_data");
+    /* Verify that the data are correct */
+    ret = misc13_verify_data_match(data, read_data);
+    CHECK(ret, FAIL, "misc13_verify_data_match");
 
     /* Close the contiguous dataset */
     ret = H5Dclose(dsid);
     CHECK(ret, FAIL, "H5Dclose");
-}
+
+    /* Free the dataset read buffer */
+    HDfree(read_data);
+
+} /* end misc13_verify_dataset() */
 
 static void
-create_hdf_file(const char *name)
+misc13_create_hdf_file(const char *name, const unsigned *data)
 {
-    hid_t fid;          /* File ID */
-    hid_t gid,gid2;     /* Group IDs */
-    hid_t tid;          /* Datatype ID */
-    hid_t dcpl;         /* Dataset creation property list ID */
-    hsize_t chunk_dims[MISC13_RANK]; /* Chunk dimensions */
-    herr_t ret;         /* Generic return value */
+    hid_t fid = -1;                     /* File ID */
+    hid_t gid1 = -1;                    /* Group ID (level 1) */
+    hid_t gid2 = -1;                    /* Group ID (level 2) */
+    hid_t tid = -1;                     /* Datatype ID */
+    hid_t dcplid = -1;                  /* Dataset creation property list ID */
+    hsize_t chunk_dims[MISC13_RANK];    /* Chunk dimensions */
+    herr_t ret;                         /* Generic return value */
 
     /* Create file */
-    fid=H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    fid = H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fcreate");
 
     /* Create DCPL for use with datasets */
-    dcpl = H5Pcreate(H5P_DATASET_CREATE);
-    CHECK(dcpl, FAIL, "H5Pcreate");
+    dcplid = H5Pcreate(H5P_DATASET_CREATE);
+    CHECK(dcplid, FAIL, "H5Pcreate");
 
     /* Set the DCPL to be chunked */
-    ret = H5Pset_layout(dcpl, H5D_CHUNKED);
+    ret = H5Pset_layout(dcplid, H5D_CHUNKED);
     CHECK(ret, FAIL, "H5Pset_layout");
 
     /* Use chunked storage for this DCPL */
     chunk_dims[0] = MISC13_CHUNK_DIM1;
-    chunk_dims[1] = MISC13_CHUNK_DIM2;
-    ret = H5Pset_chunk(dcpl, MISC13_RANK, chunk_dims);
+    ret = H5Pset_chunk(dcplid, MISC13_RANK, chunk_dims);
     CHECK(ret, FAIL, "H5Pset_chunk");
 
     /* Create contiguous dataset in root group */
-    create_dataset(fid, MISC13_DSET1_NAME, H5P_DEFAULT);
+    misc13_create_dataset(fid, MISC13_DSET1_NAME, H5P_DEFAULT, data);
 
     /* Create chunked dataset in root group */
-    create_dataset(fid, MISC13_DSET2_NAME, dcpl);
+    misc13_create_dataset(fid, MISC13_DSET2_NAME, dcplid, data);
 
     /* Create a datatype to commit to the file */
     tid = H5Tcopy(H5T_NATIVE_INT);
@@ -2218,11 +2222,11 @@ create_hdf_file(const char *name)
     CHECK(ret, FAIL, "H5Tclose");
 
     /* Create a group in the root group */
-    gid = H5Gcreate2(fid, MISC13_GROUP1_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    CHECK(gid, FAIL, "H5Gcreate2");
+    gid1 = H5Gcreate2(fid, MISC13_GROUP1_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(gid1, FAIL, "H5Gcreate2");
 
     /* Create another group in the new group */
-    gid2 = H5Gcreate2(gid, MISC13_GROUP2_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    gid2 = H5Gcreate2(gid1, MISC13_GROUP2_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(gid2, FAIL, "H5Gcreate2");
 
     /* Close the second group */
@@ -2230,17 +2234,17 @@ create_hdf_file(const char *name)
     CHECK(ret, FAIL, "H5Gclose");
 
     /* Create contiguous dataset in new group */
-    create_dataset(gid, MISC13_DSET1_NAME, H5P_DEFAULT);
+    misc13_create_dataset(gid1, MISC13_DSET1_NAME, H5P_DEFAULT, data);
 
     /* Create chunked dataset in new group */
-    create_dataset(gid, MISC13_DSET2_NAME, dcpl);
+    misc13_create_dataset(gid1, MISC13_DSET2_NAME, dcplid, data);
 
     /* Create a datatype to commit to the new group */
     tid = H5Tcopy(H5T_NATIVE_INT);
     CHECK(tid, FAIL, "H5Tcopy");
 
     /* Create a named datatype in the new group */
-    ret = H5Tcommit2(gid, MISC13_DTYPE_NAME, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    ret = H5Tcommit2(gid1, MISC13_DTYPE_NAME, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Tcommit2");
 
     /* Close named datatype */
@@ -2248,65 +2252,66 @@ create_hdf_file(const char *name)
     CHECK(ret, FAIL, "H5Tclose");
 
     /* Close the first group */
-    ret = H5Gclose(gid);
+    ret = H5Gclose(gid1);
     CHECK(ret, FAIL, "H5Gclose");
 
     /* Close the DCPL */
-    ret = H5Pclose(dcpl);
+    ret = H5Pclose(dcplid);
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Close the file */
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
     CHECK(ret, FAIL, "H5Fclose");
-}
+
+} /* end misc13_create_hdf_file() */
 
 static void
-insert_user_block(const char *old_name, const char *new_name,const char *str,size_t size)
+misc13_insert_user_block(const char *old_name, const char *new_name, const char *str, size_t size)
 {
-    FILE *new_fp, *old_fp;      /* Pointers to new & old files */
-    void *user_block;           /* Pointer to user block to write to file */
-    void *copy_buf;             /* Pointer to buffer for copying data */
+    FILE *new_fp = NULL;        /* Pointers to new & old files */
+    FILE *old_fp = NULL;
+    void *user_block = NULL;    /* Pointer to user block to write to file */
+    void *copy_buf = NULL;      /* Pointer to buffer for copying data */
     size_t written;             /* Amount of data written to new file */
     size_t read_in;             /* Amount of data read in from old file */
     int ret;                    /* Generic status value */
 
     /* Allocate space for the user block */
     user_block = HDcalloc(size, (size_t)1);
-    CHECK(user_block, NULL, "HDcalloc");
+    CHECK_PTR(user_block, "HDcalloc");
 
     /* Copy in the user block data */
-    HDmemcpy(user_block,str,strlen(str));
+    HDmemcpy(user_block, str, HDstrlen(str));
 
     /* Open the new file */
-    new_fp=HDfopen(new_name,"wb");
-    CHECK(new_fp, NULL, "HDfopen");
+    new_fp = HDfopen(new_name,"wb");
+    CHECK_PTR(new_fp, "HDfopen");
 
     /* Write the user block to the new file */
     written = HDfwrite(user_block, (size_t)1, size, new_fp);
     VERIFY(written, size, "HDfwrite");
 
     /* Open the old file */
-    old_fp=HDfopen(old_name,"rb");
-    CHECK(old_fp, NULL, "HDfopen");
+    old_fp = HDfopen(old_name,"rb");
+    CHECK_PTR(old_fp, "HDfopen");
 
     /* Allocate space for the copy buffer */
     copy_buf = HDmalloc((size_t)MISC13_COPY_BUF_SIZE);
-    CHECK(copy_buf, NULL, "HDmalloc");
+    CHECK_PTR(copy_buf, "HDmalloc");
 
     /* Copy data from the old file to the new file */
     while((read_in = HDfread(copy_buf, (size_t)1, (size_t)MISC13_COPY_BUF_SIZE, old_fp)) > 0) {
         /* Write the data to the new file */
         written = HDfwrite(copy_buf, (size_t)1, read_in, new_fp);
         VERIFY(written, read_in, "HDfwrite");
-    } /* end while */
+    }
 
     /* Close the old file */
-    ret=HDfclose(old_fp);
+    ret = HDfclose(old_fp);
     VERIFY(ret, 0, "HDfclose");
 
     /* Close the new file */
-    ret=HDfclose(new_fp);
+    ret = HDfclose(new_fp);
     VERIFY(ret, 0, "HDfclose");
 
     /* Free the copy buffer */
@@ -2314,81 +2319,84 @@ insert_user_block(const char *old_name, const char *new_name,const char *str,siz
 
     /* Free the user block */
     HDfree(user_block);
-}
+
+} /* end misc13_insert_user_block() */
 
 static void
-verify_file(const char *name, hsize_t blk_size, unsigned check_new_data)
+misc13_verify_file(const char *name, const unsigned *data, hsize_t userblock_size,
+                    hbool_t check_for_new_dataset)
 {
-    hid_t fid;          /* File ID */
-    hid_t gid,gid2;     /* Group IDs */
-    hid_t tid;          /* Datatype ID */
-    hid_t fcpl;         /* File creation property list ID */
-    hsize_t userblock;  /* Userblock size retrieved from FCPL */
-    herr_t ret;         /* Generic return value */
+    hid_t fid = -1;         /* File ID */
+    hid_t gid1 = -1;        /* Group IDs */
+    hid_t gid2 = -1;        /* Group IDs */
+    hid_t tid = -1;         /* Datatype ID */
+    hid_t fcplid = -1;      /* File creation property list ID */
+    hsize_t ub_size_out;    /* Userblock size retrieved from FCPL */
+    herr_t ret;             /* Generic return value */
 
     /* Open the file */
-    fid=H5Fopen(name, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid = H5Fopen(name, H5F_ACC_RDONLY, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fopen");
 
     /* Get the file's FCPL */
-    fcpl=H5Fget_create_plist(fid);
-    CHECK(fcpl, FAIL, "H5Fget_create_plist");
+    fcplid = H5Fget_create_plist(fid);
+    CHECK(fcplid, FAIL, "H5Fget_create_plist");
 
     /* Get the user block size for the file */
-    ret=H5Pget_userblock(fcpl,&userblock);
+    ret = H5Pget_userblock(fcplid, &ub_size_out);
     CHECK(ret, FAIL, "H5Pget_userblock");
 
     /* Check the userblock size */
-    VERIFY(userblock, blk_size, "H5Pget_userblock");
+    VERIFY(userblock_size, ub_size_out, "H5Pget_userblock");
 
     /* Close the FCPL */
-    ret = H5Pclose(fcpl);
+    ret = H5Pclose(fcplid);
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Verify the contiguous dataset in the root group */
-    verify_dataset(fid,MISC13_DSET1_NAME);
+    misc13_verify_dataset(fid, MISC13_DSET1_NAME, data);
 
     /* Verify the chunked dataset in the root group */
-    verify_dataset(fid,MISC13_DSET2_NAME);
+    misc13_verify_dataset(fid, MISC13_DSET2_NAME, data);
 
     /* Verify the "new" contiguous dataset in the root group, if asked */
-    if(check_new_data)
-        verify_dataset(fid,MISC13_DSET3_NAME);
+    if(check_for_new_dataset)
+        misc13_verify_dataset(fid, MISC13_DSET3_NAME, data);
 
     /* Open the named datatype in the root group */
     tid = H5Topen2(fid, MISC13_DTYPE_NAME, H5P_DEFAULT);
     CHECK(tid, FAIL, "H5Topen2");
 
     /* Verify the type is correct */
-    VERIFY(H5Tequal(tid,H5T_NATIVE_INT), TRUE, "H5Tequal");
+    VERIFY(H5Tequal(tid, H5T_NATIVE_INT), TRUE, "H5Tequal");
 
     /* Close named datatype */
-    ret=H5Tclose(tid);
+    ret = H5Tclose(tid);
     CHECK(ret, FAIL, "H5Tclose");
 
     /* Open the first group */
-    gid = H5Gopen2(fid, MISC13_GROUP1_NAME, H5P_DEFAULT);
-    CHECK(gid, FAIL, "H5Gopen2");
+    gid1 = H5Gopen2(fid, MISC13_GROUP1_NAME, H5P_DEFAULT);
+    CHECK(gid1, FAIL, "H5Gopen2");
 
     /* Verify the contiguous dataset in the first group */
-    verify_dataset(gid,MISC13_DSET1_NAME);
+    misc13_verify_dataset(gid1, MISC13_DSET1_NAME, data);
 
     /* Verify the chunked dataset in the first group */
-    verify_dataset(gid,MISC13_DSET2_NAME);
+    misc13_verify_dataset(gid1, MISC13_DSET2_NAME, data);
 
     /* Open the named datatype in the first group */
-    tid = H5Topen2(gid,MISC13_DTYPE_NAME, H5P_DEFAULT);
+    tid = H5Topen2(gid1, MISC13_DTYPE_NAME, H5P_DEFAULT);
     CHECK(tid, FAIL, "H5Topen2");
 
     /* Verify the type is correct */
-    VERIFY(H5Tequal(tid,H5T_NATIVE_INT), TRUE, "H5Tequal");
+    VERIFY(H5Tequal(tid, H5T_NATIVE_INT), TRUE, "H5Tequal");
 
     /* Close named datatype */
-    ret=H5Tclose(tid);
+    ret = H5Tclose(tid);
     CHECK(ret, FAIL, "H5Tclose");
 
     /* Open the second group */
-    gid2 = H5Gopen2(gid, MISC13_GROUP2_NAME, H5P_DEFAULT);
+    gid2 = H5Gopen2(gid1, MISC13_GROUP2_NAME, H5P_DEFAULT);
     CHECK(gid2, FAIL, "H5Gopen2");
 
     /* Close the second group */
@@ -2396,31 +2404,33 @@ verify_file(const char *name, hsize_t blk_size, unsigned check_new_data)
     CHECK(ret, FAIL, "H5Gclose");
 
     /* Close the first group */
-    ret = H5Gclose(gid);
+    ret = H5Gclose(gid1);
     CHECK(ret, FAIL, "H5Gclose");
 
     /* Close the file */
     ret = H5Fclose(fid);
     CHECK(ret, FAIL, "H5Fclose");
-}
+
+} /* end misc13_verify_file() */
 
 static void
-add_to_new_file(const char *name)
+misc13_add_to_new_file(const char *name, const unsigned *data)
 {
-    hid_t fid;          /* File ID */
+    hid_t fid = -1;     /* File ID */
     herr_t ret;         /* Generic return value */
 
     /* Open the file */
-    fid=H5Fopen(name, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid = H5Fopen(name, H5F_ACC_RDWR, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fopen");
 
     /* Create new contiguous dataset in root group */
-    create_dataset(fid, MISC13_DSET3_NAME, H5P_DEFAULT);
+    misc13_create_dataset(fid, MISC13_DSET3_NAME, H5P_DEFAULT, data);
 
     /* Close the file */
     ret = H5Fclose(fid);
     CHECK(ret, FAIL, "H5Fclose");
-}
+
+} /* end misc13_add_to_new_file() */
 
 /****************************************************************
 **
@@ -2431,26 +2441,44 @@ add_to_new_file(const char *name)
 static void
 test_misc13(void)
 {
+    unsigned    *data = NULL;           /* Data to write to dataset */
+    hsize_t     userblock_size;         /* Correct size of userblock */
+    hbool_t     check_for_new_dataset;  /* Whether to check for the post-userblock-creation dataset */
+
+    /* Create a data buffer for the datasets */
+    data = (unsigned *)HDcalloc(MISC13_DIM1, sizeof(unsigned));
+    CHECK_PTR(data, "HDcalloc");
+
     /* Initialize data to write */
-    init_data();
+    misc13_init_data(data);
 
     /* Create first file, with no user block */
-    create_hdf_file(MISC13_FILE_1);
+    misc13_create_hdf_file(MISC13_FILE_1, data);
 
     /* Verify file contents are correct */
-    verify_file(MISC13_FILE_1,(hsize_t)0,0);
+    userblock_size = 0;
+    check_for_new_dataset = FALSE;
+    misc13_verify_file(MISC13_FILE_1, data, userblock_size, check_for_new_dataset);
 
     /* Create a new file by inserting a user block in front of the first file */
-    insert_user_block(MISC13_FILE_1, MISC13_FILE_2, "Test String", (size_t)MISC13_USERBLOCK_SIZE);
+    misc13_insert_user_block(MISC13_FILE_1, MISC13_FILE_2, "Test String", (size_t)MISC13_USERBLOCK_SIZE);
 
     /* Verify file contents are still correct */
-    verify_file(MISC13_FILE_2,(hsize_t)MISC13_USERBLOCK_SIZE,0);
+    userblock_size = MISC13_USERBLOCK_SIZE;
+    check_for_new_dataset = FALSE;
+    misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset);
 
     /* Make certain we can modify the new file */
-    add_to_new_file(MISC13_FILE_2);
+    misc13_add_to_new_file(MISC13_FILE_2, data);
 
     /* Verify file contents are still correct */
-    verify_file(MISC13_FILE_2,(hsize_t)MISC13_USERBLOCK_SIZE,1);
+    userblock_size = MISC13_USERBLOCK_SIZE;
+    check_for_new_dataset = TRUE;
+    misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset);
+
+    /* Free the dataset buffer */
+    HDfree(data);
+
 } /* end test_misc13() */
 
 /****************************************************************
@@ -2509,7 +2537,7 @@ test_misc14(void)
     /* Check data from first dataset */
     ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata, data1))
+    if(!H5_DBL_ABS_EQUAL(rdata, data1))
         TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
 
     /* Unlink second dataset */
@@ -2523,7 +2551,7 @@ test_misc14(void)
     /* Verify the data from dataset #1 */
     ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata,data1))
+    if(!H5_DBL_ABS_EQUAL(rdata,data1))
         TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
 
     /* Close first dataset */
@@ -2557,7 +2585,7 @@ test_misc14(void)
     /* Check data from second dataset */
     ret = H5Dread(Dataset2, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata,data2))
+    if(!H5_DBL_ABS_EQUAL(rdata,data2))
         TestErrPrintf("Error on line %d: data2!=rdata\n",__LINE__);
 
     /* Unlink first dataset */
@@ -2571,7 +2599,7 @@ test_misc14(void)
     /* Verify the data from dataset #2 */
     ret = H5Dread(Dataset2, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata,data2))
+    if(!H5_DBL_ABS_EQUAL(rdata,data2))
         TestErrPrintf("Error on line %d: data2!=rdata\n",__LINE__);
 
     /* Close second dataset */
@@ -2612,13 +2640,13 @@ test_misc14(void)
     /* Check data from first dataset */
     ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata,data1))
+    if(!H5_DBL_ABS_EQUAL(rdata,data1))
         TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
 
     /* Check data from third dataset */
     ret = H5Dread(Dataset3, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata,data3))
+    if(!H5_DBL_ABS_EQUAL(rdata,data3))
         TestErrPrintf("Error on line %d: data3!=rdata\n",__LINE__);
 
     /* Unlink second dataset */
@@ -2632,13 +2660,13 @@ test_misc14(void)
     /* Verify the data from dataset #1 */
     ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata,data1))
+    if(!H5_DBL_ABS_EQUAL(rdata,data1))
         TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
 
     /* Verify the data from dataset #3 */
     ret = H5Dread(Dataset3, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
-    if(!DBL_ABS_EQUAL(rdata,data3))
+    if(!H5_DBL_ABS_EQUAL(rdata,data3))
         TestErrPrintf("Error on line %d: data3!=rdata\n",__LINE__);
 
     /* Close first dataset */
@@ -2694,9 +2722,6 @@ test_misc15(void)
     fapl = H5Fget_access_plist(file);
     CHECK(fapl, FAIL, "H5Fget_access_plist");
 
-    ret = H5Pclose(fapl);
-    CHECK(ret, FAIL, "H5Pclose");
-
     ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
 
@@ -2704,6 +2729,9 @@ test_misc15(void)
     ret = H5Fis_hdf5(MISC15_FILE);
     CHECK(ret, FAIL, "H5Fis_hdf5");
 
+    ret = H5Pclose(fapl);
+    CHECK(ret, FAIL, "H5Pclose");
+
     file = H5Fopen(MISC15_FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
     CHECK(file, FAIL, "H5Fopen");
 
@@ -2724,15 +2752,21 @@ test_misc16(void)
 {
     hid_t file;         /* File ID */
     herr_t ret;         /* Generic return value */
-    const char wdata[MISC16_SPACE_DIM][MISC16_STR_SIZE] =
-                        {"1234567", "1234567\0", "12345678", {NULL}};
+    char wdata[MISC16_SPACE_DIM][MISC16_STR_SIZE];
     char rdata[MISC16_SPACE_DIM][MISC16_STR_SIZE];  /* Information read in */
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid;       /* Dataspace ID			*/
-    hid_t		tid;       /* Datatype ID			*/
-    hsize_t		dims[] = {MISC16_SPACE_DIM};
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid;       /* Dataspace ID            */
+    hid_t        tid;       /* Datatype ID            */
+    hsize_t        dims[] = {MISC16_SPACE_DIM};
     int                 i;
 
+    /* Initialize the data */
+    /* (Note that these are supposed to stress the code, so are a little weird) */
+    HDmemcpy(wdata[0], "1234567", MISC16_STR_SIZE);
+    HDmemcpy(wdata[1], "1234567\0", MISC16_STR_SIZE);
+    HDmemcpy(wdata[2], "12345678", MISC16_STR_SIZE);
+    HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE);
+
     /* Create the file */
     file = H5Fcreate(MISC16_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(file, FAIL, "H5Fcreate");
@@ -2766,11 +2800,11 @@ test_misc16(void)
     /* Compare data read in */
     for(i = 0; i < MISC16_SPACE_DIM; i++) {
         if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
-            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
+            TestErrPrintf("Line %u: VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(unsigned)__LINE__, (int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
             continue;
         } /* end if */
         if(HDstrcmp(wdata[i], rdata[i]) != 0 ) {
-            TestErrPrintf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",(int)i,wdata[i],(int)i,rdata[i]);
+            TestErrPrintf("Line %u: VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",(unsigned)__LINE__, (int)i,wdata[i],(int)i,rdata[i]);
             continue;
         } /* end if */
     } /* end for */
@@ -2803,15 +2837,21 @@ test_misc17(void)
 {
     hid_t file;         /* File ID */
     herr_t ret;         /* Generic return value */
-    const char wdata[MISC17_SPACE_DIM1][MISC17_SPACE_DIM2] =
-                        {"1234567", "1234567\0", "12345678", {NULL}};
+    char wdata[MISC17_SPACE_DIM1][MISC17_SPACE_DIM2];
     char rdata[MISC17_SPACE_DIM1][MISC17_SPACE_DIM2];  /* Information read in */
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid;       /* Dataspace ID			*/
-    hid_t		tid;       /* Datatype ID			*/
-    hsize_t		dims[] = {MISC17_SPACE_DIM1, MISC17_SPACE_DIM2};
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid;       /* Dataspace ID            */
+    hid_t        tid;       /* Datatype ID            */
+    hsize_t        dims[] = {MISC17_SPACE_DIM1, MISC17_SPACE_DIM2};
     int                 i;
 
+    /* Initialize the data */
+    /* (Note that these are supposed to stress the code, so are a little weird) */
+    HDmemcpy(wdata[0], "1234567", MISC17_SPACE_DIM2);
+    HDmemcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2);
+    HDmemcpy(wdata[2], "12345678", MISC17_SPACE_DIM2);
+    HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2);
+
     /* Create the file */
     file = H5Fcreate(MISC17_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(file, FAIL, "H5Fcreate");
@@ -2842,11 +2882,11 @@ test_misc17(void)
     /* Compare data in the way of strings. */
     for(i = 0; i < MISC17_SPACE_DIM1; i++) {
         if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
-            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
+            TestErrPrintf("Line %u: VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(unsigned)__LINE__, (int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
             continue;
         } /* end if */
         if(HDstrcmp(wdata[i], rdata[i]) != 0 ) {
-            TestErrPrintf("VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",(int)i,wdata[i],(int)i,rdata[i]);
+            TestErrPrintf("Line %u: VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n",(unsigned)__LINE__, (int)i,wdata[i],(int)i,rdata[i]);
             continue;
         } /* end if */
     } /* end for */
@@ -2922,25 +2962,25 @@ test_misc18(void)
     /* Loop creating attributes on each dataset, flushing them to the file each time */
     for(u = 0; u < 10; u++) {
         /* Set up attribute name */
-        sprintf(attr_name, "Attr %u", u);
+        HDsprintf(attr_name, "Attr %u", u);
 
         /* Create & close attribute on first dataset */
         aid = H5Acreate2(did1, attr_name, H5T_STD_U32LE, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(aid, FAIL, "H5Acreate2");
 
         ret = H5Aclose(aid);
-        CHECK(ret, FAIL, "HAclose");
+        CHECK(ret, FAIL, "H5Aclose");
 
         /* Create & close attribute on second dataset */
         aid = H5Acreate2(did2, attr_name, H5T_STD_U32LE, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(aid, FAIL, "H5Acreate2");
 
         ret = H5Aclose(aid);
-        CHECK(ret, FAIL, "HAclose");
+        CHECK(ret, FAIL, "H5Aclose");
 
         /* Flush file, to 'fix' size of dataset object headers */
         ret = H5Fflush(fid,H5F_SCOPE_GLOBAL);
-        CHECK(ret, FAIL, "HAclose");
+        CHECK(ret, FAIL, "H5Fflush");
     } /* end for */
 
     /* Get object information for dataset #1 now */
@@ -2985,19 +3025,21 @@ test_misc18(void)
 static void
 test_misc19(void)
 {
-    hid_t fid;          /* File ID */
-    hid_t sid;          /* 'Space ID */
-    hid_t did;          /* Dataset ID */
-    hid_t tid;          /* 'Type ID */
-    hid_t aid;          /* Attribute ID */
-    hid_t plid;         /* Property List ID */
-    hid_t pcid;         /* Property Class ID */
-    hid_t gid;          /* Group ID */
-    hid_t ecid;         /* Error Class ID */
-    hid_t emid;         /* Error Message ID */
-    hid_t esid;         /* Error Stack ID */
-    int rc;             /* Reference count */
-    herr_t ret;         /* Generic return value */
+    hid_t fid = -1;                 /* File ID                  */
+    hid_t sid = -1;                 /* Dataspace ID             */
+    hid_t did = -1;                 /* Dataset ID               */
+    hid_t tid = -1;                 /* Datatype ID              */
+    hid_t aid = -1;                 /* Attribute ID             */
+    hid_t plid = -1;                /* Property List ID         */
+    hid_t pcid = -1;                /* Property Class ID        */
+    hid_t gid = -1;                 /* Group ID                 */
+    hid_t ecid = -1;                /* Error Class ID           */
+    hid_t emid = -1;                /* Error Message ID         */
+    hid_t esid = -1;                /* Error Stack ID           */
+    hid_t vfdid = -1;               /* Virtual File Driver ID   */
+    H5FD_class_t *vfd_cls = NULL;   /* VFD class                */
+    int rc;                         /* Reference count          */
+    herr_t ret;                     /* Generic return value     */
 
 /* Check H5I operations on files */
 
@@ -3407,6 +3449,45 @@ test_misc19(void)
     } H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Eclose_stack");
 
+
+/* Check H5I operations on virtual file drivers */
+
+    /* Get a VFD class to register */
+    vfd_cls = h5_get_dummy_vfd_class();
+    CHECK_PTR(vfd_cls, "h5_get_dummy_vfd_class");
+
+    /* Register a virtual file driver */
+    vfdid = H5FDregister(vfd_cls);
+    CHECK(vfdid, FAIL, "H5FDregister");
+
+    /* Check the reference count */
+    rc = H5Iget_ref(vfdid);
+    VERIFY(rc, 1, "H5Iget_ref");
+
+    /* Increment the reference count */
+    rc = H5Iinc_ref(vfdid);
+    VERIFY(rc, 2, "H5Iinc_ref");
+
+    /* Unregister the VFD normally */
+    ret = H5FDunregister(vfdid);
+    CHECK(ret, FAIL, "H5FDunregister");
+
+    /* Check the reference count */
+    rc = H5Iget_ref(vfdid);
+    VERIFY(rc, 1, "H5Iget_ref");
+
+    /* Unregister the VFD by decrementing the reference count */
+    rc = H5Idec_ref(vfdid);
+    VERIFY(rc, 0, "H5Idec_ref");
+
+    /* Try unregistering the VFD again (should fail) */
+    H5E_BEGIN_TRY {
+        ret = H5FDunregister(vfdid);
+    } H5E_END_TRY;
+    VERIFY(ret, FAIL, "H5FDunregister");
+
+    HDfree(vfd_cls);
+
 } /* end test_misc19() */
 
 /****************************************************************
@@ -3427,8 +3508,7 @@ test_misc20(void)
     hsize_t small_dims[MISC20_SPACE_RANK]={MISC20_SPACE2_DIM0,MISC20_SPACE2_DIM1};      /* Small dimensions */
     unsigned version;   /* Version of storage layout info */
     hsize_t contig_size;        /* Size of contiguous storage size from layout into */
-    char testfile[512]="";          /* Character buffer for corrected test file name */
-    char *srcdir = HDgetenv("srcdir");    /* Pointer to the directory the source code is located within */
+    const char *testfile = H5_get_srcdir_filename(MISC20_FILE_OLD); /* Corrected test file name */
     herr_t ret;         /* Generic return value */
 
     /* Output message about test being performed */
@@ -3542,13 +3622,6 @@ test_misc20(void)
 
     /* Verify that the storage size is computed correctly for older versions of layout info */
 
-    /* Generate the correct name for the test file, by prepending the source path */
-    if(srcdir && ((HDstrlen(srcdir) + HDstrlen(MISC20_FILE_OLD) + 1) < sizeof(testfile))) {
-        HDstrcpy(testfile, srcdir);
-        HDstrcat(testfile, "/");
-    }
-    HDstrcat(testfile, MISC20_FILE_OLD);
-
     /*
      * Open the old file and the dataset and get old settings.
      */
@@ -3733,13 +3806,13 @@ test_misc22(void)
 
                 /* compute the correct PPB that should be set by SZIP */
                 if(offsets[k] == 0)
-            	    correct = prec[j];
+                    correct = prec[j];
                 else
                     correct = H5Tget_size(idts[i]) * 8;
                 if(correct > 24) {
-            	    if(correct <= 32)
+                    if(correct <= 32)
                         correct = 32;
-            	    else if(correct <= 64)
+                    else if(correct <= 64)
                         correct = 64;
                 } /* end if */
 
@@ -3813,6 +3886,7 @@ test_misc23(void)
     char        objname[MISC23_NAME_BUF_SIZE];  /* Name of object */
     H5O_info_t  oinfo;
     htri_t      tri_status;
+    ssize_t     namelen;
     herr_t      status;
 
     /* Output message about test being performed */
@@ -3882,8 +3956,8 @@ test_misc23(void)
     CHECK(tmp_id, FAIL, "H5Gcreate2");
 
     /* Query that the name of the new group is correct */
-    status = H5Iget_name(tmp_id, objname, (size_t)MISC23_NAME_BUF_SIZE);
-    CHECK(status, FAIL, "H5Iget_name");
+    namelen = H5Iget_name(tmp_id, objname, (size_t)MISC23_NAME_BUF_SIZE);
+    CHECK(namelen, FAIL, "H5Iget_name");
     VERIFY_STR(objname, "/A/B01/grp", "H5Iget_name");
 
     status = H5Gclose(tmp_id);
@@ -4656,6 +4730,7 @@ test_misc25a(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc25a() */
 
+
 /****************************************************************
 **
 **  test_misc25b(): Exercise null object header message merge bug
@@ -4668,20 +4743,12 @@ test_misc25b(void)
 {
     hid_t fid;          /* File ID */
     hid_t gid;          /* Group ID */
-    char testfile[512]="";
-    char *srcdir = HDgetenv("srcdir");
+    const char *testfile = H5_get_srcdir_filename(MISC25B_FILE); /* Corrected test file name */
     herr_t      ret;            /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Exercise null object header message bug\n"));
 
-    /* Build the name of the file, with the source directory */
-    if (srcdir && ((HDstrlen(srcdir) + HDstrlen(MISC25B_FILE) + 1) < sizeof(testfile))){
-		HDstrcpy(testfile, srcdir);
-		HDstrcat(testfile, "/");
-    }
-    HDstrcat(testfile, MISC25B_FILE);
-
     /* Open file */
     fid = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fopen");
@@ -4699,7 +4766,7 @@ test_misc25b(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc25b() */
 
-
+
 /****************************************************************
 **
 **  test_misc25c(): Exercise another null object header message merge bug.
@@ -4833,7 +4900,7 @@ test_misc25c(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc25c() */
 
-
+
 /****************************************************************
 **
 **  test_misc26(): Regression test: ensure that copying filter
@@ -4919,7 +4986,7 @@ test_misc26(void)
     CHECK_I(ret, "H5Pclose");
 }
 
-
+
 /****************************************************************
 **
 **  test_misc27(): Ensure that objects with incorrect # of object
@@ -4933,20 +5000,12 @@ test_misc27(void)
 {
     hid_t fid;          /* File ID */
     hid_t gid;          /* Group ID */
-    char testfile[512]="";          /* Character buffer for corrected test file name */
-    char *srcdir = HDgetenv("srcdir");    /* Pointer to the directory the source code is located within */
+    const char *testfile = H5_get_srcdir_filename(MISC27_FILE); /* Corrected test file name */
     herr_t ret;         /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Corrupt object header handling\n"));
 
-    /* Generate the correct name for the test file, by prepending the source path */
-    if(srcdir && ((HDstrlen(srcdir) + HDstrlen(MISC27_FILE) + 1) < sizeof(testfile))) {
-        HDstrcpy(testfile, srcdir);
-        HDstrcat(testfile, "/");
-    }
-    HDstrcat(testfile, MISC27_FILE);
-
     /* Open the file */
     fid = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fopen");
@@ -4972,7 +5031,7 @@ test_misc27(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc27() */
 
-
+
 /****************************************************************
 **
 **  test_misc28(): Ensure that the dataset chunk cache will hold
@@ -5038,7 +5097,7 @@ test_misc28(void)
 
     /* Initialize write buffer */
     for(i=0; i<MISC28_SIZE; i++)
-        buf[i] = i;
+        buf[i] = (char)i;
 
     /* Create memory dataspace and selection in file dataspace */
     sidm = H5Screate_simple(1, mdims, NULL);
@@ -5059,7 +5118,7 @@ test_misc28(void)
 
     /* Initialize write buffer */
     for(i=0; i<MISC28_SIZE; i++)
-        buf[i] = MISC28_SIZE - 1 - i;
+        buf[i] = (char)(MISC28_SIZE - 1 - i);
 
     /* Select new hyperslab */
     start[1] = 1;
@@ -5149,7 +5208,7 @@ test_misc28(void)
     CHECK_I(ret, "H5Pclose");
 } /* end test_misc28() */
 
-
+
 /****************************************************************
 **
 **  test_misc29(): Ensure that speculative metadata reads don't
@@ -5198,7 +5257,7 @@ test_misc30_get_info(hid_t loc_id)
     return H5Literate(loc_id, H5_INDEX_NAME, H5_ITER_INC, NULL, test_misc30_get_info_cb, NULL);
 }
 
-
+
 /****************************************************************
 **
 **  test_misc30(): Exercise local heap code that loads prefix
@@ -5230,19 +5289,19 @@ test_misc30(void)
         CHECK(ret, FAIL, "H5Gclose");
         ret = H5Fclose(fid);
         CHECK(ret, FAIL, "H5Fclose");
-        
+
         for(i = 0; i < 20; i++) {
             char gname[32];
 
             fid = H5Fopen(MISC30_FILE, H5F_ACC_RDWR, H5P_DEFAULT);
             CHECK(fid, FAIL, "H5Fopen");
-    
+
             if(get_info) {
-                ret = test_misc30_get_info(fid);      
+                ret = test_misc30_get_info(fid);
                 CHECK(ret, FAIL, "test_misc30_get_info");
             }
 
-            sprintf(gname, "/g0/group%d", i);
+            HDsprintf(gname, "/g0/group%d", i);
             gid = H5Gcreate2(fid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
             CHECK(gid, FAIL, "H5Gcreate2");
 
@@ -5250,20 +5309,20 @@ test_misc30(void)
             CHECK(ret, FAIL, "H5Gclose");
             ret = H5Fclose(fid);
             CHECK(ret, FAIL, "H5Fclose");
-        } 
-        
+        }
+
         fid = H5Fopen(MISC30_FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
         CHECK(fid, FAIL, "H5Fopen");
         ret = H5Fget_filesize(fid, &file_size[get_info]);
         CHECK(fid, FAIL, "H5Fget_filesize");
         ret = H5Fclose(fid);
         CHECK(ret, FAIL, "H5Fclose");
-    } 
-    
+    }
+
     VERIFY(file_size[0], file_size[1], "test_misc30");
 } /* end test_misc30() */
 
-
+
 /****************************************************************
 **
 **  test_misc31(): Test reentering library through deprecated
@@ -5354,14 +5413,14 @@ test_misc31(void)
     CHECK(ret, FAIL, "H5Fclose");
     ret = H5Tclose(dtype_id);
     CHECK(ret, FAIL, "H5Tclose");
-    
+
 #else /* H5_NO_DEPRECATED_SYMBOLS */
     /* Output message about test being skipped */
     MESSAGE(5, (" ...Skipped"));
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 } /* end test_misc31() */
 
-
+
 /****************************************************************
  *
  *  test_misc32(): Simple test of filter memory allocation
@@ -5425,7 +5484,7 @@ test_misc32(void)
     resized = H5resize_memory(NULL, 0);
     CHECK_PTR_NULL(resized, "H5resize_memory"); /*BAD*/
 #endif /* NDEBUG */
-    
+
 } /* end test_misc32() */
 
 /****************************************************************
@@ -5477,7 +5536,6 @@ test_misc33(void)
 
 } /* end test_misc33() */
 
-
 /****************************************************************
 **
 **  test_misc(): Main misc. test routine.
@@ -5529,19 +5587,16 @@ test_misc(void)
 
 } /* test_misc() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_misc
+ * Function:    cleanup_misc
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Albert Cheng
+ * Programmer:    Albert Cheng
  *              July 2, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -5583,5 +5638,5 @@ cleanup_misc(void)
     HDremove(MISC29_COPY_FILE);
     HDremove(MISC30_FILE);
     HDremove(MISC31_FILE);
-}
+} /* end cleanup_misc() */
 
diff --git a/test/trefer.c b/test/trefer.c
index d5a1bb8..207267b 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -13,7 +13,7 @@
 
 /***********************************************************
 *
-* Test program:	 trefer
+* Test program:     trefer
 *
 * Test the Reference functionality
 *
@@ -21,24 +21,22 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
-
-#define FILE1   "trefer1.h5"
-#define FILE2	"trefer2.h5"
-#define FILE3	"trefer3.h5"
+#define FILE1    "trefer1.h5"
+#define FILE2    "trefer2.h5"
+#define FILE3    "trefer3.h5"
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_RANK	1
-#define SPACE1_DIM1	4
+#define SPACE1_RANK    1
+#define SPACE1_DIM1    4
 
 /* 2-D dataset with fixed dimensions */
-#define SPACE2_RANK	2
-#define SPACE2_DIM1	10
-#define SPACE2_DIM2	10
+#define SPACE2_RANK    2
+#define SPACE2_DIM1    10
+#define SPACE2_DIM2    10
 
 /* Larger 1-D dataset with fixed dimensions */
-#define SPACE3_RANK	1
-#define SPACE3_DIM1	100
+#define SPACE3_RANK    1
+#define SPACE3_DIM1    100
 
 /* Element selection information */
 #define POINT1_NPOINTS 10
@@ -80,8 +78,9 @@ test_reference_params(void)
     unsigned   *tu32;       /* Temporary pointer to uint32 data */
     int         i;          /* counting variables */
     const char *write_comment = "Foo!"; /* Comments for group */
+    hid_t    ret_id;        /* Generic hid_t return value    */
+    ssize_t     name_size;  /* Size of reference name */
     herr_t      ret;        /* Generic return value     */
-    size_t      name_size;  /* Size of reference name */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Reference Parameters\n"));
@@ -112,7 +111,7 @@ test_reference_params(void)
     CHECK(dataset, FAIL, "H5Dcreate2");
 
     for(tu32 = (unsigned *)wbuf, i = 0; i < SPACE1_DIM1; i++)
-        *tu32++=i*3;
+        *tu32++ = (unsigned)i * 3;
 
     /* Write selection to disk */
     ret = H5Dwrite(dataset, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
@@ -201,12 +200,12 @@ test_reference_params(void)
     VERIFY(name_size, FAIL, "H5Rget_name type");
 
     /* Test parameters to H5Rget_region */
-    ret = H5Rget_region((hid_t)-1, H5R_OBJECT, &rbuf[0]);
-    VERIFY(ret, FAIL, "H5Rget_region loc_id");
-    ret = H5Rget_region(fid1, H5R_OBJECT, NULL);
-    VERIFY(ret, FAIL, "H5Rget_region ref");
-    ret = H5Rget_region(fid1, H5R_OBJECT, &rbuf[0]);
-    VERIFY(ret, FAIL, "H5Rget_region type");
+    ret_id = H5Rget_region((hid_t)-1, H5R_OBJECT, &rbuf[0]);
+    VERIFY(ret_id, FAIL, "H5Rget_region loc_id");
+    ret_id = H5Rget_region(fid1, H5R_OBJECT, NULL);
+    VERIFY(ret_id, FAIL, "H5Rget_region ref");
+    ret_id = H5Rget_region(fid1, H5R_OBJECT, &rbuf[0]);
+    VERIFY(ret_id, FAIL, "H5Rget_region type");
 
     /* Close disk dataspace */
     ret = H5Sclose(sid1);
@@ -235,13 +234,14 @@ test_reference_params(void)
 static void
 test_reference_obj(void)
 {
-    hid_t		fid1;	    /* HDF5 File IDs		*/
-    hid_t		dataset,    /* Dataset ID			*/
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset,    /* Dataset ID            */
                         dset2;      /* Dereferenced dataset ID */
-    hid_t		group;      /* Group ID             */
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1;       /* Datatype ID			*/
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hid_t        group;      /* Group ID             */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1;       /* Datatype ID            */
+    hsize_t        dims1[] = {SPACE1_DIM1};
+    hid_t               dapl_id;    /* Dataset access property list */
     hobj_ref_t          *wbuf,      /* buffer to write to disk */
                         *rbuf,      /* buffer read from disk */
                         *tbuf;      /* temp. buffer read from disk */
@@ -251,7 +251,8 @@ test_reference_obj(void)
     const char *write_comment="Foo!"; /* Comments for group */
     char read_comment[10];
     H5O_type_t          obj_type;   /* Object type */
-    herr_t		ret;	    /* Generic return value		*/
+    ssize_t             size;       /* Comment length */
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Object Reference Functions\n"));
@@ -282,7 +283,7 @@ test_reference_obj(void)
     CHECK(dataset, FAIL, "H5Dcreate2");
 
     for(tu32 = (unsigned *)wbuf, i = 0; i < SPACE1_DIM1; i++)
-        *tu32++=i*3;
+        *tu32++ = (unsigned)i * 3;
 
     /* Write selection to disk */
     ret = H5Dwrite(dataset, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
@@ -413,8 +414,8 @@ test_reference_obj(void)
     CHECK(group, FAIL, "H5Rdereference");
 
     /* Get group's comment */
-    ret = H5Oget_comment(group, read_comment, (size_t)10);
-    CHECK(ret, FAIL, "H5Oget_comment");
+    size = H5Oget_comment(group, read_comment, (size_t)10);
+    CHECK(size, FAIL, "H5Oget_comment");
 
     /* Check for correct comment value */
     if(HDstrcmp(write_comment, read_comment) != 0)
@@ -474,36 +475,48 @@ test_reference_obj(void)
 static void
 test_reference_region(void)
 {
-    hid_t	fid1;		/* HDF5 File IDs		*/
-    hid_t	dset1,		/* Dataset ID			*/
-                dset2;		/* Dereferenced dataset ID */
-    hid_t	sid1,		/* Dataspace ID	#1		*/
-                sid2;		/* Dataspace ID	#2		*/
-    hsize_t	dims1[] = {SPACE1_DIM1},
-            	dims2[] = {SPACE2_DIM1, SPACE2_DIM2};
-    hsize_t	start[SPACE2_RANK];     /* Starting location of hyperslab */
-    hsize_t	stride[SPACE2_RANK];    /* Stride of hyperslab */
-    hsize_t	count[SPACE2_RANK];     /* Element count of hyperslab */
-    hsize_t	block[SPACE2_RANK];     /* Block size of hyperslab */
-    hsize_t	coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
-    hsize_t *   coords;			/* Coordinate buffer */
-    hsize_t	low[SPACE2_RANK];	/* Selection bounds */
-    hsize_t	high[SPACE2_RANK];	/* Selection bounds */
-    hdset_reg_ref_t      *wbuf,		/* buffer to write to disk */
-               *rbuf;       /* buffer read from disk */
-    hdset_reg_ref_t  nvrbuf[3]={{0},{101},{255}}; /* buffer with non-valid refs */
-    uint8_t    *dwbuf,      /* Buffer for writing numeric data to disk */
-               *drbuf;      /* Buffer for reading numeric data from disk */
-    uint8_t    *tu8;        /* Temporary pointer to uint8 data */
-    H5O_type_t  obj_type;       /* Type of object */
-    int        i, j;           /* counting variables */
-    herr_t	ret;		/* Generic return value		*/
-    haddr_t     addr = HADDR_UNDEF; /* test for undefined reference */
-    hid_t dset_NA;   /* Dataset id for undefined reference */
-    hid_t space_NA; /* Dataspace id for undefined reference */
-    hsize_t             dims_NA[1] = {1};  /* Dims array for undefined reference */
-    hdset_reg_ref_t     wdata_NA[1],       /* Write buffer */
-                        rdata_NA[1];       /* Read buffer */
+    hid_t fid1;         /* HDF5 File IDs */
+    hid_t fapl = -1;    /* File access property list */
+    hid_t dset1,        /* Dataset ID */
+          dset2,        /* Dereferenced dataset ID */
+          dset3;        /* Dereferenced dataset ID */
+    hid_t sid1,         /* Dataspace ID    #1 */
+          sid2,         /* Dataspace ID    #2 */
+          sid3;         /* Dataspace ID    #3 */
+    hid_t dapl_id;      /* Dataset access property list */
+    hsize_t dims1[] = {SPACE1_DIM1},
+            dims2[] = {SPACE2_DIM1, SPACE2_DIM2};
+    hsize_t start[SPACE2_RANK];     /* Starting location of hyperslab */
+    hsize_t stride[SPACE2_RANK];    /* Stride of hyperslab */
+    hsize_t count[SPACE2_RANK];     /* Element count of hyperslab */
+    hsize_t block[SPACE2_RANK];     /* Block size of hyperslab */
+    hsize_t coord1[POINT1_NPOINTS][SPACE2_RANK];    /* Coordinates for point selection */
+    hsize_t *coords;                /* Coordinate buffer */
+    hsize_t low[SPACE2_RANK];       /* Selection bounds */
+    hsize_t high[SPACE2_RANK];      /* Selection bounds */
+    hdset_reg_ref_t *wbuf,          /* buffer to write to disk */
+                    *rbuf;          /* buffer read from disk */
+    hdset_reg_ref_t nvrbuf[3]={{0},{101},{255}};    /* buffer with non-valid refs */
+    uint8_t *dwbuf,         /* Buffer for writing numeric data to disk */
+            *drbuf;         /* Buffer for reading numeric data from disk */
+    uint8_t *tu8;           /* Temporary pointer to uint8 data */
+    H5O_type_t obj_type;    /* Type of object */
+    int i, j;               /* counting variables */
+    hssize_t hssize_ret;    /* hssize_t return value */
+    htri_t tri_ret;         /* htri_t return value */
+    herr_t ret;             /* Generic return value */
+    haddr_t addr = HADDR_UNDEF;     /* test for undefined reference */
+    hid_t dset_NA;                  /* Dataset id for undefined reference */
+    hid_t space_NA;                 /* Dataspace id for undefined reference */
+    hsize_t dims_NA[1] = {1};       /* Dims array for undefined reference */
+    hdset_reg_ref_t wdata_NA[1],    /* Write buffer */
+                    rdata_NA[1];    /* Read buffer */
+    hsize_t numparticles = 8388608;
+    hsize_t ret_particles;
+    unsigned num_dsets = 513;
+    hsize_t total_particles = numparticles * num_dsets;
+    hsize_t vdsdims[1] = {total_particles};
+    hsize_t start3, count3, block3;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Dataset Region Reference Functions\n"));
@@ -527,7 +540,7 @@ test_reference_region(void)
     CHECK(dset2, FAIL, "H5Dcreate2");
 
     for(tu8 = dwbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++)
-        *tu8++ = i * 3;
+        *tu8++ = (uint8_t)(i * 3);
 
     /* Write selection to disk */
     ret = H5Dwrite(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dwbuf);
@@ -612,7 +625,7 @@ test_reference_region(void)
     /* Close and release resources for undefined region reference tests */
     ret = H5Dclose(dset_NA);
     CHECK(ret, FAIL, "H5Dclose");
-    ret = H5Sclose(space_NA); 
+    ret = H5Sclose(space_NA);
     CHECK(ret, FAIL, "H5Sclose");
 
     /* Close disk dataspace */
@@ -635,10 +648,10 @@ test_reference_region(void)
     fid1 = H5Fopen(FILE2, H5F_ACC_RDWR, H5P_DEFAULT);
     CHECK(fid1, FAIL, "H5Fopen");
 
-    /* 
-     * Start the test of an undefined reference 
+    /*
+     * Start the test of an undefined reference
      */
-    
+
     /* Open the dataset of the undefined references */
     dset_NA = H5Dopen2(fid1, "DS_NA", H5P_DEFAULT);
     CHECK(dset_NA, FAIL, "H5Dopen2");
@@ -646,28 +659,28 @@ test_reference_region(void)
     /* Read the data */
     ret = H5Dread(dset_NA, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata_NA);
     CHECK(ret, FAIL, "H5Dread");
-    
+
     /*
      * Dereference an undefined reference (should fail)
      */
     H5E_BEGIN_TRY {
       dset2 = H5Rdereference(dset_NA, H5R_DATASET_REGION, &rdata_NA[0]);
-    } H5E_END_TRY;                                  
-    VERIFY(dset2, FAIL, "H5Rdereference"); 
+    } H5E_END_TRY;
+    VERIFY(dset2, FAIL, "H5Rdereference");
 
     /* Close and release resources. */
     ret = H5Dclose(dset_NA);
     CHECK(ret, FAIL, "H5Dclose");
 
-    /* This close should fail since H5Rdereference never created 
+    /* This close should fail since H5Rdereference never created
      * the id of the referenced object. */
     H5E_BEGIN_TRY {
       ret = H5Dclose(dset2);
-    } H5E_END_TRY;                                  
-    VERIFY(ret, FAIL, "H5Dclose"); 
+    } H5E_END_TRY;
+    VERIFY(ret, FAIL, "H5Dclose");
 
-    /* 
-     * End the test of an undefined reference 
+    /*
+     * End the test of an undefined reference
      */
 
     /* Open the dataset */
@@ -714,7 +727,7 @@ test_reference_region(void)
     VERIFY(ret, 36, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_hyper_nblocks(sid2);
     VERIFY(ret, 1, "H5Sget_select_hyper_nblocks");
-    coords = (hsize_t *)HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */
+    coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */
     ret = H5Sget_select_hyper_blocklist(sid2, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist");
     VERIFY(coords[0], 2, "Hyperslab Coordinates");
@@ -742,7 +755,7 @@ test_reference_region(void)
     VERIFY(ret, 10, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_elem_npoints(sid2);
     VERIFY(ret, 10, "H5Sget_select_elem_npoints");
-    coords = (hsize_t *)HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t)); /* allocate space for the element points */
+    coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t)); /* allocate space for the element points */
     ret = H5Sget_select_elem_pointlist(sid2, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_elem_pointlist");
     VERIFY(coords[0], coord1[0][0], "Element Coordinates");
@@ -817,29 +830,29 @@ test_reference_region(void)
 static void
 test_reference_region_1D(void)
 {
-    hid_t	fid1;           /* HDF5 File IDs		*/
-    hid_t	dset1,          /* Dataset ID			*/
-                dset3;          /* Dereferenced dataset ID */
-    hid_t	sid1,           /* Dataspace ID	#1		*/
-                sid3;           /* Dataspace ID	#3		*/
-    hsize_t	dims1[] = {SPACE1_DIM1},
-            	dims3[] = {SPACE3_DIM1};
-    hsize_t	start[SPACE3_RANK];     /* Starting location of hyperslab */
-    hsize_t	stride[SPACE3_RANK];    /* Stride of hyperslab */
-    hsize_t	count[SPACE3_RANK];     /* Element count of hyperslab */
-    hsize_t	block[SPACE3_RANK];     /* Block size of hyperslab */
-    hsize_t	coord1[POINT1_NPOINTS][SPACE3_RANK]; /* Coordinates for point selection */
-    hsize_t *   coords;                 /* Coordinate buffer */
-    hsize_t	low[SPACE3_RANK];       /* Selection bounds */
-    hsize_t	high[SPACE3_RANK];      /* Selection bounds */
-    hdset_reg_ref_t      *wbuf,         /* buffer to write to disk */
-               *rbuf;   /* buffer read from disk */
-    uint8_t    *dwbuf,  /* Buffer for writing numeric data to disk */
-               *drbuf;  /* Buffer for reading numeric data from disk */
-    uint8_t    *tu8;    /* Temporary pointer to uint8 data */
-    H5O_type_t  obj_type;       /* Object type */
-    int         i;      /* counting variables */
-    herr_t	ret;    /* Generic return value		*/
+    hid_t fid1;        /* HDF5 File IDs        */
+    hid_t dset1,        /* Dataset ID            */
+          dset3;        /* Dereferenced dataset ID */
+    hid_t sid1,         /* Dataspace ID    #1        */
+          sid3;         /* Dataspace ID    #3        */
+    hsize_t dims1[] = {SPACE1_DIM1},
+            dims3[] = {SPACE3_DIM1};
+    hsize_t start[SPACE3_RANK];     /* Starting location of hyperslab */
+    hsize_t stride[SPACE3_RANK];    /* Stride of hyperslab */
+    hsize_t count[SPACE3_RANK];     /* Element count of hyperslab */
+    hsize_t block[SPACE3_RANK];     /* Block size of hyperslab */
+    hsize_t coord1[POINT1_NPOINTS][SPACE3_RANK]; /* Coordinates for point selection */
+    hsize_t *coords;                /* Coordinate buffer */
+    hsize_t low[SPACE3_RANK];       /* Selection bounds */
+    hsize_t high[SPACE3_RANK];      /* Selection bounds */
+    hdset_reg_ref_t *wbuf,          /* buffer to write to disk */
+                    *rbuf;          /* buffer read from disk */
+    uint8_t *dwbuf,  /* Buffer for writing numeric data to disk */
+            *drbuf;  /* Buffer for reading numeric data from disk */
+    uint8_t *tu8;    /* Temporary pointer to uint8 data */
+    H5O_type_t obj_type;            /* Object type */
+    int i;          /* counting variables */
+    herr_t ret;     /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing 1-D Dataset Region Reference Functions\n"));
@@ -863,7 +876,7 @@ test_reference_region_1D(void)
     CHECK(dset3, FAIL, "H5Dcreate2");
 
     for(tu8 = dwbuf, i = 0; i < SPACE3_DIM1; i++)
-        *tu8++ = i * 3;
+        *tu8++ = (uint8_t)(i * 3);
 
     /* Write selection to disk */
     ret = H5Dwrite(dset3, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dwbuf);
@@ -986,7 +999,7 @@ test_reference_region_1D(void)
     VERIFY(ret, 30, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_hyper_nblocks(sid3);
     VERIFY(ret, 15, "H5Sget_select_hyper_nblocks");
-    coords = (hsize_t *)HDmalloc(ret * SPACE3_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */
+    coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */
     ret = H5Sget_select_hyper_blocklist(sid3, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist");
     VERIFY(coords[0],   2, "Hyperslab Coordinates");
@@ -1038,7 +1051,7 @@ test_reference_region_1D(void)
     VERIFY(ret, 10, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_elem_npoints(sid3);
     VERIFY(ret, 10, "H5Sget_select_elem_npoints");
-    coords = (hsize_t *)HDmalloc(ret * SPACE3_RANK * sizeof(hsize_t)); /* allocate space for the element points */
+    coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t)); /* allocate space for the element points */
     ret = H5Sget_select_elem_pointlist(sid3, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_elem_pointlist");
     VERIFY(coords[0], coord1[0][0], "Element Coordinates");
@@ -1093,14 +1106,14 @@ test_reference_region_1D(void)
 static void
 test_reference_obj_deleted(void)
 {
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset,	/* Dataset ID			*/
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset,    /* Dataset ID            */
                 dset2;      /* Dereferenced dataset ID */
-    hid_t		sid1;       /* Dataspace ID			*/
+    hid_t        sid1;       /* Dataspace ID            */
     hobj_ref_t  oref;       /* Object Reference to test */
     H5O_type_t          obj_type;       /* Object type */
-    haddr_t addr = HADDR_UNDEF; /* test for undefined reference */                
-    herr_t		ret;		/* Generic return value		*/
+    haddr_t addr = HADDR_UNDEF; /* test for undefined reference */
+    herr_t        ret;        /* Generic return value        */
 
     /* Create file */
     fid1 = H5Fcreate(FILE3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -1243,6 +1256,7 @@ test_reference_group(void)
     char objname[NAME_SIZE];    /* Buffer to store name */
     H5O_info_t oinfo;           /* Object info struct */
     int count = 0;              /* Count within iterated group */
+    ssize_t size;               /* Name length */
     herr_t ret;
 
     /* Create file with a group and a dataset containing an object reference to the group */
@@ -1323,8 +1337,8 @@ test_reference_group(void)
     CHECK(ret, FAIL, "H5Gget_info");
     VERIFY(ginfo.nlinks, 3, "H5Gget_info");
 
-    ret = H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, objname, (size_t)NAME_SIZE, H5P_DEFAULT);
-    CHECK(ret, FAIL, "H5Lget_name_by_idx");
+    size = H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, objname, (size_t)NAME_SIZE, H5P_DEFAULT);
+    CHECK(size, FAIL, "H5Lget_name_by_idx");
     VERIFY_STR(objname, DSETNAME2, "H5Lget_name_by_idx");
 
     ret = H5Oget_info_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &oinfo, H5P_DEFAULT);
@@ -1358,25 +1372,25 @@ test_reference_group(void)
 static void
 test_reference_compat(void)
 {
-    hid_t	fid1;		/* HDF5 File IDs		*/
-    hid_t	dataset;	/* Dataset ID			*/
-    hid_t	group;          /* Group ID                     */
-    hid_t	sid1,           /* Dataspace IDs		*/
+    hid_t    fid1;        /* HDF5 File IDs        */
+    hid_t    dataset;    /* Dataset ID            */
+    hid_t    group;          /* Group ID                     */
+    hid_t    sid1,           /* Dataspace IDs        */
                 sid2;
-    hid_t	tid1;           /* Datatype ID			*/
-    hsize_t	dims1[] = {SPACE1_DIM1},
-            	dims2[] = {SPACE2_DIM1, SPACE2_DIM2};
-    hsize_t	start[SPACE2_RANK];     /* Starting location of hyperslab */
-    hsize_t	stride[SPACE2_RANK];    /* Stride of hyperslab */
-    hsize_t	count[SPACE2_RANK];     /* Element count of hyperslab */
-    hsize_t	block[SPACE2_RANK];     /* Block size of hyperslab */
-    hsize_t	coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
+    hid_t    tid1;           /* Datatype ID            */
+    hsize_t    dims1[] = {SPACE1_DIM1},
+                dims2[] = {SPACE2_DIM1, SPACE2_DIM2};
+    hsize_t    start[SPACE2_RANK];     /* Starting location of hyperslab */
+    hsize_t    stride[SPACE2_RANK];    /* Stride of hyperslab */
+    hsize_t    count[SPACE2_RANK];     /* Element count of hyperslab */
+    hsize_t    block[SPACE2_RANK];     /* Block size of hyperslab */
+    hsize_t    coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
     hobj_ref_t *wbuf_obj,       /* Buffer to write to disk */
                *rbuf_obj;       /* Buffer read from disk */
     hdset_reg_ref_t *wbuf_reg,  /* Buffer to write to disk */
                *rbuf_reg;       /* Buffer read from disk */
     H5G_obj_t   obj_type;       /* Object type */
-    herr_t	ret;		/* Generic return value		*/
+    herr_t    ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Deprecated Object Reference Functions\n"));
@@ -1625,15 +1639,15 @@ test_reference(void)
 
 }   /* test_reference() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_reference
+ * Function:    cleanup_reference
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              September 8, 1998
  *
  * Modifications:
diff --git a/test/trefstr.c b/test/trefstr.c
index 40ce344..83e2951 100644
--- a/test/trefstr.c
+++ b/test/trefstr.c
@@ -67,7 +67,7 @@ test_refstr_create(void)
 
     /* Try creating a ref-counted string */
     rs=H5RS_create("foo");
-    CHECK(rs, NULL, "H5RS_create");
+    CHECK_PTR(rs, "H5RS_create");
 
     /* Get the reference count on the string */
     count=H5RS_get_count(rs);
@@ -97,7 +97,7 @@ test_refstr_count(void)
 
     /* Try creating a ref-counted string */
     rs=H5RS_create("foo");
-    CHECK(rs, NULL, "H5RS_create");
+    CHECK_PTR(rs, "H5RS_create");
 
     /* Get the reference count on the string */
     count=H5RS_get_count(rs);
@@ -144,7 +144,7 @@ test_refstr_dup(void)
 
     /* Try creating a ref-counted string */
     rs1=H5RS_create("foo");
-    CHECK(rs1, NULL, "H5RS_create");
+    CHECK_PTR(rs1, "H5RS_create");
 
     /* Get the reference count on the string */
     count=H5RS_get_count(rs1);
@@ -152,7 +152,7 @@ test_refstr_dup(void)
 
     /* Duplicate r-string */
     rs2=H5RS_dup(rs1);
-    CHECK(rs2, NULL, "H5RS_dup");
+    CHECK_PTR(rs2, "H5RS_dup");
 
     /* Get the reference count on the strings */
     count=H5RS_get_count(rs1);
@@ -194,11 +194,11 @@ test_refstr_cmp(void)
 
     /* Create first reference counted string */
     rs1=H5RS_create("foo");
-    CHECK(rs1, NULL, "H5RS_create");
+    CHECK_PTR(rs1, "H5RS_create");
 
     /* Create second reference counted string */
     rs2=H5RS_create("foo2");
-    CHECK(rs2, NULL, "H5RS_create");
+    CHECK_PTR(rs2, "H5RS_create");
 
     /* Compare the strings in various ways */
     cmp=H5RS_cmp(rs1,rs1);
@@ -246,12 +246,12 @@ test_refstr_wrap(void)
 
     /* Wrap ref-counted string around existing buffer */
     rs=H5RS_wrap(buf);
-    CHECK(rs, NULL, "H5RS_wrap");
+    CHECK_PTR(rs, "H5RS_wrap");
 
     /* Get pointer to raw string in ref-counted string */
     s=H5RS_get_str(rs);
-    CHECK(s, NULL, "H5RS_get_str");
-    VERIFY(s, buf, "wrapping");
+    CHECK_PTR(s, "H5RS_get_str");
+    CHECK_PTR_EQ(s, buf, "wrapping");
     cmp=HDstrcmp(s,buf);
     VERIFY(cmp, 0, "HDstrcmp");
 
@@ -264,7 +264,7 @@ test_refstr_wrap(void)
 
     /* Get pointer to raw string in ref-counted string */
     s=H5RS_get_str(rs);
-    CHECK(s, NULL, "H5RS_get_str");
+    CHECK_PTR(s, "H5RS_get_str");
     CHECK(s, buf, "wrapping");
     cmp=HDstrcmp(s,buf);
     if(cmp<=0)
@@ -299,17 +299,17 @@ test_refstr_own(void)
 
     /* Initialize buffer */
     s = (char *)H5FL_BLK_MALLOC(str_buf,HDstrlen("foo") + 1);
-    CHECK(s, NULL, "H5FL_BLK_MALLOC");    
+    CHECK_PTR(s, "H5FL_BLK_MALLOC");    
     HDstrcpy(s, "foo");
 
     /* Transfer ownership of dynamically allocated string to ref-counted string */
     rs=H5RS_own(s);
-    CHECK(rs, NULL, "H5RS_own");
+    CHECK_PTR(rs, "H5RS_own");
 
     /* Get pointer to raw string in ref-counted string */
     t=H5RS_get_str(rs);
-    CHECK(t, NULL, "H5RS_get_str");
-    VERIFY(t, s, "transferring");
+    CHECK_PTR(t, "H5RS_get_str");
+    CHECK_PTR_EQ(t, s, "transferring");
     cmp=HDstrcmp(s,t);
     VERIFY(cmp, 0, "HDstrcmp");
 
@@ -322,8 +322,8 @@ test_refstr_own(void)
 
     /* Get pointer to raw string in ref-counted string */
     t=H5RS_get_str(rs);
-    CHECK(t, NULL, "H5RS_get_str");
-    VERIFY(t, s, "transferring");
+    CHECK_PTR(t, "H5RS_get_str");
+    CHECK_PTR_EQ(t, s, "transferring");
     cmp=HDstrcmp(t,s);
     VERIFY(cmp, 0, "HDstrcmp");
 
diff --git a/test/tselect.c b/test/tselect.c
index 7826bde..a4ff1b9 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -222,9 +222,9 @@ test_select_hyper(hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -426,9 +426,9 @@ test_select_point(hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -704,15 +704,15 @@ test_select_all(hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE4_DIM1; i++)
         for(j=0; j<SPACE4_DIM2; j++)
             for(k=0; k<SPACE4_DIM3; k++)
-                *tbuf++ = (uint8_t)(((i * SPACE4_DIM2) + j) * SPACE4_DIM3) + k;
+                *tbuf++ = (uint8_t)((((i * SPACE4_DIM2) + j) * SPACE4_DIM3) + k);
 
     /* Create file */
     fid1 = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -791,9 +791,9 @@ test_select_all_hyper(hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -933,9 +933,9 @@ test_select_combo(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -1100,9 +1100,9 @@ test_select_hyper_stride(hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -1173,8 +1173,8 @@ test_select_hyper_stride(hid_t xfer_plist)
         tbuf=wbuf+loc1[i];
         tbuf2=rbuf+loc2[i];
         if(*tbuf!=*tbuf2) {
-            printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n",__LINE__,i,(int)loc1[i],i,(int)loc2[i]);
-            printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n",(void *)wbuf,(void *)tbuf,(void *)rbuf,(void *)tbuf2);
+            HDprintf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n",__LINE__,i,(int)loc1[i],i,(int)loc2[i]);
+            HDprintf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n",(void *)wbuf,(void *)tbuf,(void *)rbuf,(void *)tbuf2);
             TestErrPrintf("*tbuf=%u, *tbuf2=%u\n",(unsigned)*tbuf,(unsigned)*tbuf2);
         } /* end if */
     } /* end for */
@@ -1228,9 +1228,9 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -1302,14 +1302,8 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Compare data read with data written out */
-    if(HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12)) {
+    if(HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12))
         TestErrPrintf("hyperslab values don't match! Line=%d\n",__LINE__);
-#ifdef QAK
-        for(i=0, tbuf=wbuf; i<12; i++)
-            for(j=0; j<30; j++)
-                printf("i=%d, j=%d, *wbuf=%u, *rbuf=%u\n",i,j,(unsigned)*(wbuf+i*30+j),(unsigned)*(rbuf+i*30+j));
-#endif /* QAK */
-    } /* end if */
 
     /* Close memory dataspace */
     ret = H5Sclose(sid2);
@@ -1358,9 +1352,9 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE8_DIM1; i++)
@@ -1426,14 +1420,8 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Compare data read with data written out */
-    if(HDmemcmp(rbuf,wbuf,sizeof(uint16_t)*2*SPACE8_DIM3*SPACE8_DIM2*SPACE8_DIM1)) {
+    if(HDmemcmp(rbuf,wbuf,sizeof(uint16_t)*2*SPACE8_DIM3*SPACE8_DIM2*SPACE8_DIM1))
         TestErrPrintf("Error: hyperslab values don't match!\n");
-#ifdef QAK
-        for(i=0, tbuf=wbuf; i<12; i++)
-            for(j=0; j<30; j++)
-                printf("i=%d, j=%d, *wbuf=%u, *rbuf=%u\n",i,j,(unsigned)*(wbuf+i*30+j),(unsigned)*(rbuf+i*30+j));
-#endif /* QAK */
-    } /* end if */
 
     /* Close memory dataspace */
     ret = H5Sclose(sid2);
@@ -1485,9 +1473,9 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist)
 
     /* Allocate write & read buffers */
     wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE8_DIM4; i++)
@@ -1562,13 +1550,13 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist)
                             (k>=start[2] && k<(start[2]+count[2])) &&
                             (l>=start[3] && l<(start[3]+count[3])) ) {
                         if(*tbuf!=*tbuf2) {
-                            printf("Error: hyperslab values don't match!\n");
+                            HDprintf("Error: hyperslab values don't match!\n");
                             TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n",__LINE__,i,j,k,l,(unsigned)*tbuf,(unsigned)*tbuf2);
                         } /* end if */
                     } /* end if */
                     else {
                         if(*tbuf2!=0) {
-                            printf("Error: invalid data in read buffer!\n");
+                            HDprintf("Error: invalid data in read buffer!\n");
                             TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n",__LINE__,i,j,k,l,(unsigned)*tbuf,(unsigned)*tbuf2);
                         } /* end if */
                     } /* end else */
@@ -1729,9 +1717,9 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf,
 
     /* Allocate buffers */
     small_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), small_cube_size);
-    CHECK(small_cube_buf_1, NULL, "HDcalloc");
+    CHECK_PTR(small_cube_buf_1, "HDcalloc");
     large_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), large_cube_size);
-    CHECK(large_cube_buf_1, NULL, "HDcalloc");
+    CHECK_PTR(large_cube_buf_1, "HDcalloc");
 
     /* Create a dataset transfer property list */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
@@ -2336,7 +2324,7 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist)
 
     /* Allocate cube buffer for writing values */
     cube_buf = (uint16_t *)HDmalloc(sizeof(uint16_t) * max_cube_size);
-    CHECK(cube_buf, NULL, "HDmalloc");
+    CHECK_PTR(cube_buf, "HDmalloc");
 
     /* Initialize the cube buffer */
     cube_ptr = cube_buf;
@@ -2345,7 +2333,7 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist)
 
     /* Allocate cube buffer for zeroing values on disk */
     zero_buf = (uint16_t *)HDcalloc(sizeof(uint16_t), max_cube_size);
-    CHECK(zero_buf, NULL, "HDcalloc");
+    CHECK_PTR(zero_buf, "HDcalloc");
 
     for(large_rank = 1; large_rank <= max_rank; large_rank++) {
         for(small_rank = 1; small_rank < large_rank; small_rank++) {
@@ -2805,9 +2793,9 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_
 
     /* Allocate & initialize buffers */
     small_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), small_cube_size);
-    CHECK(small_cube_buf_1, NULL, "HDcalloc");
+    CHECK_PTR(small_cube_buf_1, "HDcalloc");
     large_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), large_cube_size);
-    CHECK(large_cube_buf_1, NULL, "HDcalloc");
+    CHECK_PTR(large_cube_buf_1, "HDcalloc");
 
 
     /* Create a dataset transfer property list */
@@ -3531,13 +3519,13 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_
 
 /****************************************************************
 **
-**  test_select_hyper_checker_board_dr(): Test H5S (dataspace) 
-**	selection code with checkerboard source and target having 
+**  test_select_hyper_checker_board_dr(): Test H5S (dataspace)
+**	selection code with checkerboard source and target having
 **	different ranks but the same shape.  We have already
-**	tested H5S_shape_same in isolation, so now we try to do 
+**	tested H5S_shape_same in isolation, so now we try to do
 **	I/O.
 **
-**	This is just an initial smoke check, so we will work 
+**	This is just an initial smoke check, so we will work
 **	with a slice through a cube only.
 **
 ****************************************************************/
@@ -3568,7 +3556,7 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist)
 
     /* Allocate cube buffer for writing values */
     cube_buf = (uint16_t *)HDmalloc(sizeof(uint16_t) * max_cube_size);
-    CHECK(cube_buf, NULL, "HDmalloc");
+    CHECK_PTR(cube_buf, "HDmalloc");
 
     /* Initialize the cube buffer */
     cube_ptr = cube_buf;
@@ -3577,7 +3565,7 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist)
 
     /* Allocate cube buffer for zeroing values on disk */
     zero_buf = (uint16_t *)HDcalloc(sizeof(uint16_t), max_cube_size);
-    CHECK(zero_buf, NULL, "HDcalloc");
+    CHECK_PTR(zero_buf, "HDcalloc");
 
     for(large_rank = 1; large_rank <= max_rank; large_rank++) {
         for(small_rank = 1; small_rank < large_rank; small_rank++) {
@@ -3645,11 +3633,11 @@ test_select_hyper_copy(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
     rbuf2 = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf2, NULL, "HDcalloc");
+    CHECK_PTR(rbuf2, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -3737,15 +3725,8 @@ test_select_hyper_copy(void)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Compare data read with data written out */
-    if(HDmemcmp(rbuf,rbuf2,sizeof(uint16_t)*SPACE3_DIM1*SPACE3_DIM2)) {
+    if(HDmemcmp(rbuf,rbuf2,sizeof(uint16_t)*SPACE3_DIM1*SPACE3_DIM2))
         TestErrPrintf("hyperslab values don't match! Line=%d\n",__LINE__);
-#ifdef QAK
-        for(i=0; i<SPACE3_DIM1; i++)
-            for(j=0; j<SPACE3_DIM2; j++)
-                if((unsigned)*(rbuf+i*SPACE3_DIM2+j)!=(unsigned)*(rbuf2+i*SPACE3_DIM2+j))
-                    printf("i=%d, j=%d, *rbuf=%u, *rbuf2=%u\n",i,j,(unsigned)*(rbuf+i*SPACE3_DIM2+j),(unsigned)*(rbuf2+i*SPACE3_DIM2+j));
-#endif /* QAK */
-    } /* end if */
 
     /* Close memory dataspace */
     ret = H5Sclose(sid2);
@@ -3807,11 +3788,11 @@ test_select_point_copy(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
     rbuf2 = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf2, NULL, "HDcalloc");
+    CHECK_PTR(rbuf2, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -3985,9 +3966,9 @@ test_select_hyper_offset(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -4143,9 +4124,9 @@ test_select_hyper_offset2(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE7_DIM1 * SPACE7_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE7_DIM1; i++)
@@ -4266,9 +4247,9 @@ test_select_point_offset(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -4446,9 +4427,9 @@ test_select_hyper_union(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -5050,10 +5031,10 @@ test_select_hyper_union_stagger(void)
     /* Verify input data */
     for(i=0; i<8; i++) {
         if(data[input_loc[i][0]][input_loc[i][1]]!=data_out[output_loc[i][0]][output_loc[i][1]]) {
-            printf("input data #%d is wrong!\n",i);
-            printf("input_loc=[%d][%d]\n",input_loc[i][0],input_loc[i][1]);
-            printf("output_loc=[%d][%d]\n",output_loc[i][0],output_loc[i][1]);
-            printf("data=%d\n",data[input_loc[i][0]][input_loc[i][1]]);
+            HDprintf("input data #%d is wrong!\n",i);
+            HDprintf("input_loc=[%d][%d]\n",input_loc[i][0],input_loc[i][1]);
+            HDprintf("output_loc=[%d][%d]\n",output_loc[i][0],output_loc[i][1]);
+            HDprintf("data=%d\n",data[input_loc[i][0]][input_loc[i][1]]);
             TestErrPrintf("data_out=%d\n",data_out[output_loc[i][0]][output_loc[i][1]]);
         } /* end if */
     } /* end for */
@@ -5214,7 +5195,7 @@ test_select_hyper_union_3d(void)
     tmp2_space = H5Scombine_select(sid2,H5S_SELECT_OR,tmp_space);
     CHECK(tmp2_space, FAIL, "H5Scombin_select");
 
-    npoints = H5Sget_select_npoints(tmp2_space);
+    npoints = (hsize_t)H5Sget_select_npoints(tmp2_space);
     VERIFY(npoints, 15*26, "H5Sget_select_npoints");
 
     /* Create a dataset */
@@ -5313,9 +5294,9 @@ test_select_hyper_and_2d(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -5381,12 +5362,12 @@ test_select_hyper_and_2d(void)
         for(j=0; j<SPACE2_DIM2; j++, tbuf++) {
             if((i>=5 && i<=9) && (j>=5 && j<=9)) {
                 if(*tbuf!=*tbuf2)
-                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
+                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if(*tbuf!=0)
-                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n",__LINE__,i,j,(int)*tbuf);
+                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n",__LINE__,i,j,(int)*tbuf);
             } /* end else */
         } /* end for */
 
@@ -5442,9 +5423,9 @@ test_select_hyper_xor_2d(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -5512,12 +5493,12 @@ test_select_hyper_xor_2d(void)
                     ((i>=5 && i<=9) && ((j>=0 && j<=4) || (j>=10 && j<=14))) ||
                     ((i>=10 && i<=14) && (j>=5 && j<=14))) {
                 if(*tbuf!=*tbuf2)
-                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
+                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if(*tbuf!=0)
-                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n",__LINE__,i,j,(int)*tbuf);
+                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n",__LINE__,i,j,(int)*tbuf);
             } /* end else */
         } /* end for */
 
@@ -5573,9 +5554,9 @@ test_select_hyper_notb_2d(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -5642,12 +5623,12 @@ test_select_hyper_notb_2d(void)
             if(((i>=0 && i<=4) && (j>=0 && j<=9)) ||
                     ((i>=5 && i<=9) && (j>=0 && j<=4))) {
                 if(*tbuf!=*tbuf2)
-                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
+                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if(*tbuf!=0)
-                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n",__LINE__,i,j,(int)*tbuf);
+                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n",__LINE__,i,j,(int)*tbuf);
             } /* end else */
         } /* end for */
 
@@ -5703,9 +5684,9 @@ test_select_hyper_nota_2d(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE2_DIM1; i++)
@@ -5816,14 +5797,14 @@ test_select_hyper_iter2(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim
 
     if(*tbuf!=**tbuf2) {
         TestErrPrintf("Error in hyperslab iteration!\n");
-        printf("location: { ");
+        HDprintf("location: { ");
         for(u=0; u<ndim; u++) {
-            printf("%2d",(int)point[u]);
+            HDprintf("%2d",(int)point[u]);
             if(u<(ndim-1))
-                printf(", ");
+                HDprintf(", ");
         } /* end for */
-        printf("}\n");
-        printf("*tbuf=%d, **tbuf2=%d\n",*tbuf,**tbuf2);
+        HDprintf("}\n");
+        HDprintf("*tbuf=%d, **tbuf2=%d\n",*tbuf,**tbuf2);
         return(-1);
     } /* end if */
     else {
@@ -5863,9 +5844,9 @@ test_select_hyper_union_random_5d(hid_t read_plist)
 
     /* Allocate write & read buffers */
     wbuf = (int *)HDmalloc(sizeof(int) * SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (int *)HDcalloc(sizeof(int), (size_t)(SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5));
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE5_DIM1; i++)
@@ -5896,42 +5877,29 @@ test_select_hyper_union_random_5d(hid_t read_plist)
     CHECK(sid2, FAIL, "H5Screate_simple");
 
     /* Get initial random # seed */
-    seed=(unsigned)time(NULL)+(unsigned)clock();
+    seed = (unsigned)HDtime(NULL) + (unsigned)HDclock();
 
     /* Crunch through a bunch of random hyperslab reads from the file dataset */
     for(test_num=0; test_num<NRAND_HYPER; test_num++) {
         /* Save random # seed for later use */
         /* (Used in case of errors, to regenerate the hyperslab sequence) */
-#ifndef QAK
-        seed+=(unsigned)clock();
-#else /* QAK */
-        seed=987909620;
-#endif /* QAK */
+        seed += (unsigned)HDclock();
         HDsrandom(seed);
 
-#ifdef QAK
-printf("test_num=%d, seed=%u\n",test_num,seed);
-#endif /* QAK */
-#ifndef QAK
         for(i=0; i<NHYPERSLABS; i++) {
-#else /* QAK */
-        for(i=0; i<2; i++) {
-#endif /* QAK */
-#ifdef QAK
-printf("hyperslab=%d\n",i);
-#endif /* QAK */
             /* Select random hyperslab location & size for selection */
             for(j=0; j<SPACE5_RANK; j++) {
                 start[j] = ((hsize_t)HDrandom() % dims1[j]);
                 count[j] = (((hsize_t)HDrandom() % (dims1[j] - start[j])) + 1);
-#ifdef QAK
-printf("start[%d]=%d, count[%d]=%d (end[%d]=%d)\n",j,(int)start[j],j,(int)count[j],j,(int)(start[j]+count[j]-1));
-#endif /* QAK */
             } /* end for */
 
             /* Select hyperslab */
             ret = H5Sselect_hyperslab(sid1, (i == 0 ? H5S_SELECT_SET : H5S_SELECT_OR), start, NULL, count, NULL);
             CHECK(ret, FAIL, "H5Sselect_hyperslab");
+            if(ret < 0) {
+                TestErrPrintf("Random hyperslabs for seed %u failed!\n", seed);
+                break;
+            } /* end if */
         } /* end for */
 
         /* Get the number of elements selected */
@@ -5947,49 +5915,21 @@ printf("start[%d]=%d, count[%d]=%d (end[%d]=%d)\n",j,(int)start[j],j,(int)count[
         npoints2 = H5Sget_select_npoints(sid2);
         VERIFY(npoints, npoints2, "H5Sget_select_npoints");
 
-#ifdef QAK
-printf("random I/O, before H5Dread(), npoints=%lu\n",(unsigned long)npoints);
-{
-    hsize_t blocks[128][2][SPACE5_RANK];
-    hssize_t nblocks;
-    int k;
-
-    nblocks=H5Sget_select_hyper_nblocks(sid1);
-    printf("nblocks=%d\n",(int)nblocks);
-    H5Sget_select_hyper_blocklist(sid1,0,nblocks,blocks);
-    for(j=0; j<nblocks; j++) {
-        printf("Block #%d, start = {",j);
-        for(k=0; k<SPACE5_RANK; k++) {
-            printf("%d",blocks[j][0][k]);
-            if(k<(SPACE5_RANK-1))
-                printf(", ");
-            else
-                printf("}, end = {");
-        } /* end for */
-        for(k=0; k<SPACE5_RANK; k++) {
-            printf("%d",blocks[j][1][k]);
-            if(k<(SPACE5_RANK-1))
-                printf(", ");
-            else
-                printf("}\n");
-        } /* end for */
-    } /* end for */
-}
-#endif /* QAK */
         /* Read selection from disk */
         ret=H5Dread(dataset,H5T_NATIVE_INT,sid2,sid1,read_plist,rbuf);
         CHECK(ret, FAIL, "H5Dread");
-#ifdef QAK
-printf("random I/O, after H5Dread()\n");
-#endif /* QAK */
+        if(ret < 0) {
+            TestErrPrintf("Random hyperslabs for seed %u failed!\n", seed);
+            break;
+        } /* end if */
 
         /* Compare data read with data written out */
         tbuf=rbuf;
         ret = H5Diterate(wbuf,H5T_NATIVE_INT,sid1,test_select_hyper_iter2,&tbuf);
-        if(ret<0) {
-            TestErrPrintf("Random hyperslabs for seed %u failed!\n",seed);
+        if(ret < 0) {
+            TestErrPrintf("Random hyperslabs for seed %u failed!\n", seed);
             break;
-        }
+        } /* end if */
 
         /* Set the read buffer back to all zeroes */
         HDmemset(rbuf, 0, (size_t)SPACE6_DIM1);
@@ -6055,9 +5995,9 @@ test_select_hyper_chunk(hid_t fapl_plist, hid_t xfer_plist)
 
     /* Allocate the transfer buffers */
     data = (short *)HDmalloc(sizeof(short) * X * Y * Z);
-    CHECK(data, NULL, "HDmalloc");
+    CHECK_PTR(data, "HDmalloc");
     data_out = (short *)HDcalloc((size_t)(NX * NY * NZ), sizeof(short));
-    CHECK(data_out, NULL, "HDcalloc");
+    CHECK_PTR(data_out, "HDcalloc");
 
     /*
      * Data buffer initialization.
@@ -6276,9 +6216,6 @@ test_select_point_chunk(void)
     herr_t      ret;                            /* Generic return value */
 
     unsigned    *data_out;			/* output buffer */
-#ifdef LATER
-    unsigned    *tmpdata_out;			/* output buffer */
-#endif /* LATER */
 
     hsize_t     start[SPACE7_RANK];             /* hyperslab offset */
     hsize_t     count[SPACE7_RANK];             /* size of the hyperslab */
@@ -6290,9 +6227,9 @@ test_select_point_chunk(void)
 
     /* Allocate the transfer buffers */
     data = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(data, NULL, "HDmalloc");
+    CHECK_PTR(data, "HDmalloc");
     data_out = (unsigned *)HDcalloc((size_t)(SPACE7_DIM1 * SPACE7_DIM2), sizeof(unsigned));
-    CHECK(data_out, NULL, "HDcalloc");
+    CHECK_PTR(data_out, "HDcalloc");
 
     /*
      * Data buffer initialization.
@@ -7051,7 +6988,7 @@ test_select_fill_all(void)
 
     /* Allocate memory buffer */
     wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
 
     /* Initialize memory buffer */
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
@@ -7127,7 +7064,7 @@ test_select_fill_point(hssize_t *offset)
 
     /* Allocate memory buffer */
     wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
 
     /* Initialize memory buffer */
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
@@ -7180,8 +7117,8 @@ test_select_fill_point(hssize_t *offset)
 
     /* Add in the offset */
     for(u = 0; u < (unsigned)num_points; u++) {
-        points[u][0] = (hsize_t)(points[u][0] + real_offset[0]);
-        points[u][1] = (hsize_t)(points[u][1] + real_offset[1]);
+        points[u][0] = (hsize_t)((hssize_t)points[u][0] + real_offset[0]);
+        points[u][1] = (hsize_t)((hssize_t)points[u][1] + real_offset[1]);
     } /* end for */
 
     /* Iterate through selection, verifying correct data */
@@ -7224,7 +7161,7 @@ test_select_fill_hyper_simple(hssize_t *offset)
 
     /* Allocate memory buffer */
     wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
 
     /* Initialize memory buffer */
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
@@ -7261,8 +7198,8 @@ test_select_fill_hyper_simple(hssize_t *offset)
     /* Verify memory buffer the hard way... */
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
         for(v = 0; v < SPACE7_DIM2; v++, tbuf++) {
-            if((u >= (unsigned)(start[0] + real_offset[0]) && u < (unsigned)(start[0] + count[0] + real_offset[0]))
-                && (v >= (unsigned)(start[1] + real_offset[1]) && v < (unsigned)(start[1] + count[1] + real_offset[1]))) {
+            if((u >= (unsigned)((hssize_t)start[0] + real_offset[0]) && u < (unsigned)((hssize_t)(start[0] + count[0]) + real_offset[0]))
+                && (v >= (unsigned)((hssize_t)start[1] + real_offset[1]) && v < (unsigned)((hssize_t)(start[1] + count[1]) + real_offset[1]))) {
                     if(*tbuf != (unsigned)fill_value)
                         TestErrPrintf("Error! v=%u, u=%u, *tbuf=%u, fill_value=%u\n", v, u, *tbuf, (unsigned)fill_value);
                 } /* end if */
@@ -7280,8 +7217,8 @@ test_select_fill_hyper_simple(hssize_t *offset)
     /* Set the coordinates of the selection (with the offset) */
     for(u = 0, num_points = 0; u < (unsigned)count[0]; u++)
         for(v = 0; v < (unsigned)count[1]; v++, num_points++) {
-            points[num_points][0] = (hsize_t)(u + start[0] + real_offset[0]);
-            points[num_points][1] = (hsize_t)(v + start[1] + real_offset[1]);
+            points[num_points][0] = (hsize_t)((hssize_t)(u + start[0]) + real_offset[0]);
+            points[num_points][1] = (hsize_t)((hssize_t)(v + start[1]) + real_offset[1]);
         } /* end for */
 
     /* Iterate through selection, verifying correct data */
@@ -7331,7 +7268,7 @@ test_select_fill_hyper_regular(hssize_t *offset)
 
     /* Allocate memory buffer */
     wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
 
     /* Initialize memory buffer */
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
@@ -7371,7 +7308,7 @@ test_select_fill_hyper_regular(hssize_t *offset)
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
         for(v = 0; v < SPACE7_DIM2; v++, tbuf++) {
             for(w = 0; w < (unsigned)num_points; w++) {
-                if(u == (unsigned)(points[w][0] + real_offset[0]) && v == (unsigned)(points[w][1] + real_offset[1])) {
+                if(u == (unsigned)((hssize_t)points[w][0] + real_offset[0]) && v == (unsigned)((hssize_t)points[w][1] + real_offset[1])) {
                     if(*tbuf != (unsigned)fill_value)
                         TestErrPrintf("Error! v=%u, u=%u, *tbuf=%u, fill_value=%u\n", v, u, *tbuf, (unsigned)fill_value);
                     break;
@@ -7388,8 +7325,8 @@ test_select_fill_hyper_regular(hssize_t *offset)
 
     /* Add in the offset */
     for(u = 0; u < (unsigned)num_points; u++) {
-        points[u][0] = (hsize_t)(points[u][0] + real_offset[0]);
-        points[u][1] = (hsize_t)(points[u][1] + real_offset[1]);
+        points[u][0] = (hsize_t)((hssize_t)points[u][0] + real_offset[0]);
+        points[u][1] = (hsize_t)((hssize_t)points[u][1] + real_offset[1]);
     } /* end for */
 
     /* Iterate through selection, verifying correct data */
@@ -7450,7 +7387,7 @@ test_select_fill_hyper_irregular(hssize_t *offset)
 
     /* Allocate memory buffer */
     wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
 
     /* Initialize memory buffer */
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
@@ -7494,7 +7431,7 @@ test_select_fill_hyper_irregular(hssize_t *offset)
     for(u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++)
         for(v = 0; v < SPACE7_DIM2; v++, tbuf++) {
             for(w = 0; w < (unsigned)num_points; w++) {
-                if(u == (unsigned)(points[w][0] + real_offset[0]) && v == (unsigned)(points[w][1] + real_offset[1])) {
+                if(u == (unsigned)((hssize_t)points[w][0] + real_offset[0]) && v == (unsigned)((hssize_t)points[w][1] + real_offset[1])) {
                     if(*tbuf != (unsigned)fill_value)
                         TestErrPrintf("Error! v=%u, u=%u, *tbuf=%u, fill_value=%u\n", v, u, *tbuf, (unsigned)fill_value);
                     break;
@@ -7511,8 +7448,8 @@ test_select_fill_hyper_irregular(hssize_t *offset)
 
     /* Add in the offset */
     for(u = 0; u < (unsigned)num_iter_points; u++) {
-        iter_points[u][0] = (hsize_t)(iter_points[u][0] + real_offset[0]);
-        iter_points[u][1] = (hsize_t)(iter_points[u][1] + real_offset[1]);
+        iter_points[u][0] = (hsize_t)((hssize_t)iter_points[u][0] + real_offset[0]);
+        iter_points[u][1] = (hsize_t)((hssize_t)iter_points[u][1] + real_offset[1]);
     } /* end for */
 
     /* Iterate through selection, verifying correct data */
@@ -7552,9 +7489,9 @@ test_select_none(void)
 
     /* Allocate write & read buffers */
     wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize write buffer */
     for(i=0, tbuf=wbuf; i<SPACE7_DIM1; i++)
@@ -7655,9 +7592,9 @@ test_scalar_select(void)
 
     /* Allocate write & read buffers */
     wbuf_uint8 = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf_uint8, NULL, "HDmalloc");
+    CHECK_PTR(wbuf_uint8, "HDmalloc");
     wbuf_ushort = (unsigned short *)HDmalloc(sizeof(unsigned short) * SPACE7_DIM1 * SPACE7_DIM2);
-    CHECK(wbuf_ushort, NULL, "HDmalloc");
+    CHECK_PTR(wbuf_ushort, "HDmalloc");
 
     /* Initialize write buffers */
     for(i=0, tbuf_uint8=wbuf_uint8, tbuf_ushort=wbuf_ushort; i<SPACE7_DIM1; i++)
@@ -8149,53 +8086,53 @@ test_shape_same(void)
 
     /* Compare "all" selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(all_sid,all_sid);
+        check = H5S_select_shape_same_test(all_sid,all_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
         tmp_sid=H5Scopy(all_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(all_sid,tmp_sid);
+        check = H5S_select_shape_same_test(all_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(all_sid,none_sid);
+        check = H5S_select_shape_same_test(all_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(all_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(all_sid,single_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(all_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(all_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(all_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(all_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(all_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(all_sid,single_hyper_all_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(all_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(all_sid,single_hyper_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(all_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(all_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
-        check=H5S_select_shape_same_test(all_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(all_sid,irreg_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(all_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(all_sid,none_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against scalar "all" hyperslab selection */
@@ -8208,53 +8145,53 @@ test_shape_same(void)
 
     /* Compare "none" selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(none_sid,none_sid);
+        check = H5S_select_shape_same_test(none_sid,none_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(none_sid);
+        tmp_sid = H5Scopy(none_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(none_sid,tmp_sid);
+        check = H5S_select_shape_same_test(none_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(none_sid,all_sid);
+        check = H5S_select_shape_same_test(none_sid,all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(none_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(none_sid,single_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(none_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(none_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(none_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(none_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(none_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(none_sid,single_hyper_all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(none_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(none_sid,single_hyper_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(none_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(none_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
-        check=H5S_select_shape_same_test(none_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(none_sid,irreg_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(none_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(none_sid,none_hyper_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against scalar "all" hyperslab selection */
@@ -8267,49 +8204,49 @@ test_shape_same(void)
 
     /* Compare single point selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(single_pt_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,single_pt_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(single_pt_sid);
+        tmp_sid = H5Scopy(single_pt_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(single_pt_sid,tmp_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(single_pt_sid,all_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(single_pt_sid,none_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(single_pt_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_pt_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_pt_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,single_hyper_all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_pt_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,single_hyper_pt_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(single_pt_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
-        check=H5S_select_shape_same_test(single_pt_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(single_pt_sid,irreg_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
@@ -8326,53 +8263,53 @@ test_shape_same(void)
 
     /* Compare multiple point selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(mult_pt_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,mult_pt_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(mult_pt_sid);
+        tmp_sid = H5Scopy(mult_pt_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(mult_pt_sid,tmp_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,all_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,none_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,single_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,single_hyper_all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,single_hyper_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,irreg_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(mult_pt_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(mult_pt_sid,none_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against scalar "all" hyperslab selection */
@@ -8385,45 +8322,45 @@ test_shape_same(void)
 
     /* Compare single "normal" hyperslab selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(single_hyper_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,single_hyper_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(single_hyper_sid);
+        tmp_sid = H5Scopy(single_hyper_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(single_hyper_sid,tmp_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,all_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,none_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,single_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,single_hyper_all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,single_hyper_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
@@ -8431,7 +8368,7 @@ test_shape_same(void)
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_sid,none_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
 #ifdef NOT_YET
@@ -8449,14 +8386,15 @@ test_shape_same(void)
             /* Select sequence of points for point selection */
             for(u=1; u<(SPACE9_DIM1-1); u++) {
                 for(v=1; v<(SPACE9_DIM2-1); v++) {
-                    coord2[v-1][0]=u; coord2[v-1][1]=v;
+                    coord2[v - 1][0] = u;
+                    coord2[v - 1][1] = v;
                 } /* end for */
                 ret = H5Sselect_elements(tmp_sid,H5S_SELECT_APPEND,(SPACE9_DIM2-2),coord2);
                 CHECK(ret, FAIL, "H5Sselect_elements");
             } /* end for */
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(single_hyper_sid,tmp_sid);
+            check = H5S_select_shape_same_test(single_hyper_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -8483,7 +8421,7 @@ test_shape_same(void)
             } /* end for */
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(single_hyper_sid,tmp_sid);
+            check = H5S_select_shape_same_test(single_hyper_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -8499,53 +8437,53 @@ test_shape_same(void)
 
     /* Compare single "all" hyperslab selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,single_hyper_all_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(single_hyper_all_sid);
+        tmp_sid = H5Scopy(single_hyper_all_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(single_hyper_all_sid,tmp_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,all_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,all_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,none_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,single_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,single_hyper_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,irreg_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_all_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_all_sid,none_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
 #ifdef NOT_YET
@@ -8563,14 +8501,15 @@ test_shape_same(void)
             /* Select sequence of points for point selection */
             for(u=0; u<SPACE9_DIM1; u++) {
                 for(v=0; v<SPACE9_DIM2; v++) {
-                    coord2[v][0]=u; coord2[v][1]=v;
+                    coord2[v][0] = u;
+                    coord2[v][1] = v;
                 } /* end for */
                 ret = H5Sselect_elements(tmp_sid,H5S_SELECT_APPEND,SPACE9_DIM2,coord2);
                 CHECK(ret, FAIL, "H5Sselect_elements");
             } /* end for */
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(single_hyper_all_sid,tmp_sid);
+            check = H5S_select_shape_same_test(single_hyper_all_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -8597,7 +8536,7 @@ test_shape_same(void)
             } /* end for */
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(single_hyper_all_sid,tmp_sid);
+            check = H5S_select_shape_same_test(single_hyper_all_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -8613,53 +8552,53 @@ test_shape_same(void)
 
     /* Compare single "point" hyperslab selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,single_hyper_pt_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(single_hyper_pt_sid);
+        tmp_sid = H5Scopy(single_hyper_pt_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,tmp_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,all_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,none_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,single_pt_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,single_hyper_all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,irreg_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(single_hyper_pt_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(single_hyper_pt_sid,none_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against scalar "all" hyperslab selection */
@@ -8672,53 +8611,53 @@ test_shape_same(void)
 
     /* Compare regular, strided hyperslab selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(regular_hyper_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,regular_hyper_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(regular_hyper_sid);
+        tmp_sid = H5Scopy(regular_hyper_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,all_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,none_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,single_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,single_hyper_all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,single_hyper_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against irregular hyperslab selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,irreg_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(regular_hyper_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(regular_hyper_sid,none_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Construct point selection which matches regular, strided hyperslab selection */
@@ -8727,16 +8666,17 @@ test_shape_same(void)
             CHECK(tmp_sid, FAIL, "H5Screate_simple");
 
             /* Select sequence of points for point selection */
-            for(u=2; u<11; u+=2) {
-                for(v=0; v<2; v++) {
-                    coord2[v][0]=u; coord2[v][1]=(v*2)+2;
+            for(u = 2; u < 11; u += 2) {
+                for(v = 0; v < 2; v++) {
+                    coord2[v][0] = u;
+                    coord2[v][1] = (v * 2) + 2;
                 } /* end for */
                 ret = H5Sselect_elements(tmp_sid, H5S_SELECT_APPEND, (size_t)2, (const hsize_t *)coord2);
                 CHECK(ret, FAIL, "H5Sselect_elements");
             } /* end for */
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
+            check = H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -8752,17 +8692,17 @@ test_shape_same(void)
             CHECK(ret, FAIL, "H5Sselect_none");
 
             /* Select sequence of rows for hyperslab selection */
-            for(u=2; u<11; u+=2) {
-                start[0]=u; start[1]=3;
-                stride[0]=1; stride[1]=2;
-                count[0]=1; count[1]=2;
-                block[0]=1; block[1]=1;
+            for(u = 2; u < 11; u += 2) {
+                start[0] = u; start[1] = 3;
+                stride[0] = 1; stride[1] = 2;
+                count[0] = 1; count[1] = 2;
+                block[0] = 1; block[1] = 1;
                 ret = H5Sselect_hyperslab(tmp_sid,H5S_SELECT_OR,start,stride,count,block);
                 CHECK(ret, FAIL, "H5Sselect_hyperslab");
             } /* end for */
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
+            check = H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -8774,15 +8714,15 @@ test_shape_same(void)
             CHECK(tmp_sid, FAIL, "H5Screate_simple");
 
             /* Select regular, strided hyperslab selection at an offset */
-            start[0]=1; start[1]=1;
-            stride[0]=2; stride[1]=2;
-            count[0]=5; count[1]=2;
-            block[0]=1; block[1]=1;
+            start[0] = 1; start[1] = 1;
+            stride[0] = 2; stride[1] = 2;
+            count[0] = 5; count[1] = 2;
+            block[0] = 1; block[1] = 1;
             ret = H5Sselect_hyperslab(tmp_sid,H5S_SELECT_SET,start,stride,count,block);
             CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
+            check = H5S_select_shape_same_test(regular_hyper_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -8798,53 +8738,53 @@ test_shape_same(void)
 
     /* Compare irregular hyperslab selection to all the selections created */
         /* Compare against itself */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,irreg_hyper_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,irreg_hyper_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         /* Compare against copy of itself */
-        tmp_sid=H5Scopy(irreg_hyper_sid);
+        tmp_sid = H5Scopy(irreg_hyper_sid);
         CHECK(tmp_sid, FAIL, "H5Scopy");
 
-        check=H5S_select_shape_same_test(irreg_hyper_sid,tmp_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,tmp_sid);
         VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
         ret = H5Sclose(tmp_sid);
         CHECK(ret, FAIL, "H5Sclose");
 
         /* Compare against "all" selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,all_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "none" selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,none_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,none_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against single point selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,single_pt_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,single_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against multiple point selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,mult_pt_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,mult_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "plain" single hyperslab selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,single_hyper_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,single_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "all" single hyperslab selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,single_hyper_all_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,single_hyper_all_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "single point" single hyperslab selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,single_hyper_pt_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,single_hyper_pt_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against regular, strided hyperslab selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,regular_hyper_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,regular_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Compare against "no" hyperslab selection */
-        check=H5S_select_shape_same_test(irreg_hyper_sid,none_hyper_sid);
+        check = H5S_select_shape_same_test(irreg_hyper_sid,none_hyper_sid);
         VERIFY(check, FALSE, "H5S_select_shape_same_test");
 
         /* Construct hyperslab selection which matches irregular hyperslab selection */
@@ -8870,7 +8810,7 @@ test_shape_same(void)
             } /* end for */
 
             /* Compare against hyperslab selection */
-            check=H5S_select_shape_same_test(irreg_hyper_sid,tmp_sid);
+            check = H5S_select_shape_same_test(irreg_hyper_sid,tmp_sid);
             VERIFY(check, TRUE, "H5S_select_shape_same_test");
 
             ret = H5Sclose(tmp_sid);
@@ -9036,28 +8976,28 @@ test_shape_same(void)
 
 /****************************************************************
 **
-**  test_shape_same_dr__smoke_check_1(): 
+**  test_shape_same_dr__smoke_check_1():
 **
-**	Create a square, 2 D data space (10 X 10), and select 
+**    Create a square, 2-D dataspace (10 X 10), and select
 **	all of it.
 **
-**      Similarly, create nine, 3 D data spaces (10 X 10 X 10), 
-**	and select (10 X 10 X 1) hyper slabs in each, three with 
-**	the slab parallel to the xy plane, three parallel to the 
+**      Similarly, create nine, 3-D dataspaces (10 X 10 X 10),
+**	and select (10 X 10 X 1) hyper slabs in each, three with
+**	the slab parallel to the xy plane, three parallel to the
 **	xz plane, and three parallel to the yz plane.
 **
-**	Assuming that z is the fastest changing dimension, 
-**	H5S_select_shape_same() should return TRUE when comparing 
-**	the full 2 D space against any hyperslab parallel to the 
-**	yz plane in the 3 D space, and FALSE when comparing the 
-**	full 2 D space against the other two hyper slabs.
+**	Assuming that z is the fastest changing dimension,
+**    H5Sselect_shape_same() should return TRUE when comparing
+**    the full 2-D space against any hyperslab parallel to the
+**    yz plane in the 3-D space, and FALSE when comparing the
+**    full 2-D space against the other two hyperslabs.
 **
-**	Also create two additional 3 D data spaces (10 X 10 X 10), 
-**	and select a (10 X 10 X 2) hyper slab parallel to the yz 
-**	axis in one of them, and two parallel (10 X 10 X 1) hyper 
-**	slabs parallel to the yz axis in the other.  
-**	H5S_select_shape_same() should return FALSE when comparing 
-**	each to the 2 D selection.
+**    Also create two additional 3-D dataspaces (10 X 10 X 10),
+**	and select a (10 X 10 X 2) hyper slab parallel to the yz
+**	axis in one of them, and two parallel (10 X 10 X 1) hyper
+**	slabs parallel to the yz axis in the other.
+**    H5Sselect_shape_same() should return FALSE when comparing
+**    each to the 2-D selection.
 **
 ****************************************************************/
 static void
@@ -9327,9 +9267,9 @@ test_shape_same_dr__smoke_check_1(void)
 
 /****************************************************************
 **
-**  test_shape_same_dr__smoke_check_2(): 
+**  test_shape_same_dr__smoke_check_2():
 **
-**	Create a square, 2 D data space (10 X 10), and select 
+**    Create a square, 2-D dataspace (10 X 10), and select
 **	a "checker board" hyper slab as follows:
 **
 **		* * - - * * - - * *
@@ -9343,28 +9283,28 @@ test_shape_same_dr__smoke_check_1(void)
 **		* * - - * * - - * *
 **              * * - - * * - - * *
 **
-**	where asterisks indicate selected elements, and dashes 
+**	where asterisks indicate selected elements, and dashes
 **	indicate unselected elements.
 **
-**	Similarly, create nine, 3 D data spaces (10 X 10 X 10), 
-**	and select similar (10 X 10 X 1) checker board hyper 
-**	slabs in each, three with the slab parallel to  the xy 
-**	plane, three parallel to the xz plane, and three parallel 
+**    Similarly, create nine, 3-D dataspaces (10 X 10 X 10),
+**	and select similar (10 X 10 X 1) checker board hyper
+**	slabs in each, three with the slab parallel to  the xy
+**	plane, three parallel to the xz plane, and three parallel
 **	to the yz plane.
 **
-**	Assuming that z is the fastest changing dimension, 
-**	H5S_select_shape_same() should return TRUE when comparing 
-**	the 2 D space checker board selection against a checker 
-**	board hyperslab parallel to the yz plane in the 3 D 
-**	space, and FALSE when comparing the 2 D checkerboard 
-**	selection against two hyper slabs parallel to the xy 
+**	Assuming that z is the fastest changing dimension,
+**    H5Sselect_shape_same() should return TRUE when comparing
+**    the 2-D space checker board selection against a checker
+**    board hyperslab parallel to the yz plane in the 3-D
+**    space, and FALSE when comparing the 2-D checkerboard
+**	selection against two hyper slabs parallel to the xy
 **	or xz planes.
 **
-**	Also create an additional 3 D data spaces (10 X 10 X 10), 
-**	and select a checker board parallel with the yz axis, 
-**	save with some squares being on different planes.  
-**	H5S_select_shape_same() should return FALSE when 
-**	comparing this selection to the 2 D selection.
+**    Also create an additional 3-D dataspaces (10 X 10 X 10),
+**	and select a checker board parallel with the yz axis,
+**	save with some squares being on different planes.
+**    H5Sselect_shape_same() should return FALSE when
+**    comparing this selection to the 2-D selection.
 **
 ****************************************************************/
 static void
@@ -9646,7 +9586,7 @@ test_shape_same_dr__smoke_check_2(void)
 
     start[0] = 4;
     /* This test gets the right answer, but it fails the shape same
-     * test in an unexpected point.  Bring this up with Quincey, as 
+     * test in an unexpected point.  Bring this up with Quincey, as
      * the oddness looks like it is not related to my code.
      *                                      -- JRM
      */
@@ -9735,9 +9675,9 @@ test_shape_same_dr__smoke_check_2(void)
 
 /****************************************************************
 **
-**  test_shape_same_dr__smoke_check_3(): 
+**  test_shape_same_dr__smoke_check_3():
 **
-**	Create a square, 2 D data space (10 X 10), and select an 
+**    Create a square, 2-D dataspace (10 X 10), and select an
 **	irregular hyper slab as follows:
 **
 **		y
@@ -9753,22 +9693,22 @@ test_shape_same_dr__smoke_check_2(void)
 **	 	0 - - - - - - - - - -
 **                0 1 2 3 4 5 6 7 8 9 x
 **
-**	where asterisks indicate selected elements, and dashes 
+**	where asterisks indicate selected elements, and dashes
 **	indicate unselected elements.
 **
-**	Similarly, create nine, 3 D data spaces (10 X 10 X 10), 
-**	and select similar irregular hyper slabs in each, three 
-**	with the slab parallel to the xy plane, three parallel 
-**	to the xz plane, and three parallel to the yz plane.  
-**	Further, translate the irregular slab in 2/3rds of the 
+**    Similarly, create nine, 3-D dataspaces (10 X 10 X 10),
+**	and select similar irregular hyper slabs in each, three
+**	with the slab parallel to the xy plane, three parallel
+**	to the xz plane, and three parallel to the yz plane.
+**	Further, translate the irregular slab in 2/3rds of the
 **	cases.
 **
-**	Assuming that z is the fastest changing dimension, 
-**	H5S_select_shape_same() should return TRUE when 
-**	comparing the 2 D irregular hyperslab selection 
-**	against the irregular hyperslab selections parallel 
-**	to the yz plane in the 3 D space, and FALSE when 
-**	comparing it against the irregular hyper slabs 
+**	Assuming that z is the fastest changing dimension,
+**    H5Sselect_shape_same() should return TRUE when
+**    comparing the 2-D irregular hyperslab selection
+**	against the irregular hyperslab selections parallel
+**    to the yz plane in the 3-D space, and FALSE when
+**	comparing it against the irregular hyper slabs
 **	selections parallel to the xy or xz planes.
 **
 ****************************************************************/
@@ -10252,12 +10192,12 @@ test_shape_same_dr__smoke_check_3(void)
 
 /****************************************************************
 **
-**  test_shape_same_dr__smoke_check_4(): 
+**  test_shape_same_dr__smoke_check_4():
 **
-**	Create a square, 2 D data space (10 X 10), and select 
+**    Create a square, 2-D dataspace (10 X 10), and select
 **	the entire space.
 **
-**	Similarly, create 3 D and 4 D data spaces:
+**    Similarly, create 3-D and 4-D dataspaces:
 **
 **		(1 X 10 X 10)
 **		(10 X 1 X 10)
@@ -10274,8 +10214,8 @@ test_shape_same_dr__smoke_check_3(void)
 **
 **	And select these entire spaces as well.
 **
-**	Compare the 2 D space against all the other spaces
-**	with H5S_select_shape_same().  The (1 X 10 X 10) & 
+**    Compare the 2-D space against all the other spaces
+**    with H5Sselect_shape_same().  The (1 X 10 X 10) &
 **	(1 X 1 X 10 X 10) should return TRUE.  All others
 **	should return FALSE.
 **
@@ -10472,12 +10412,12 @@ test_shape_same_dr__smoke_check_4(void)
 /****************************************************************
 **
 **  test_shape_same_dr__full_space_vs_slice(): Tests selection
-**	of a full n-cube data space vs an n-dimensional slice of 
-**	of an m-cube (m > n) in a call to H5S_select_shape_same().  
-**	Note that this test does not require the n-cube and the 
+**	of a full n-cube data space vs an n-dimensional slice of
+**    of an m-cube (m > n) in a call to H5Sselect_shape_same().
+**	Note that this test does not require the n-cube and the
 **	n-dimensional slice to have the same rank (although
-**	H5S_select_shape_same() should always return FALSE if 
-**	they don't). 
+**    H5Sselect_shape_same() should always return FALSE if
+**	they don't).
 **
 **	Per Quincey's suggestion, only test up to 5 dimensional
 **	spaces.
@@ -10493,7 +10433,7 @@ test_shape_same_dr__full_space_vs_slice(int test_num,
                                         hbool_t expected_result)
 {
     char	test_desc_0[128];
-    char	test_desc_1[128];
+    char	test_desc_1[256];
     int         i;
     hid_t	n_cube_0_sid;  /* the fully selected hyper cube */
     hid_t	n_cube_1_sid;  /* the hyper cube in which a slice is selected */
@@ -10514,16 +10454,16 @@ test_shape_same_dr__full_space_vs_slice(int test_num,
     HDassert( large_rank <= SS_DR_MAX_RANK );
     HDassert( 0 <= offset );
     HDassert( offset < large_rank );
-    HDassert( edge_size > 0 ); 
-    HDassert( edge_size <= 1000 ); 
+    HDassert( edge_size > 0 );
+    HDassert( edge_size <= 1000 );
 
-    sprintf(test_desc_0, 
-              "\tn-cube slice through m-cube (n <= m) test %d.\n", 
+    HDsprintf(test_desc_0,
+              "\tn-cube slice through m-cube (n <= m) test %d.\n",
               test_num);
     MESSAGE(7, (test_desc_0));
 
     /* This statement must be updated if SS_DR_MAX_RANK is changed */
-    sprintf(test_desc_1, 
+    HDsprintf(test_desc_1,
               "\t\tranks: %d/%d offset: %d dim_selected: %d/%d/%d/%d/%d.\n",
               small_rank, large_rank, offset,
               (int)dim_selected[0],
@@ -10604,27 +10544,27 @@ test_shape_same_dr__full_space_vs_slice(int test_num,
 
 /****************************************************************
 **
-**  test_shape_same_dr__run_full_space_vs_slice_tests(): 
+**  test_shape_same_dr__run_full_space_vs_slice_tests():
 **
-**	Run the est_shape_same_dr__full_space_vs_slice() test
+**    Run the test_shape_same_dr__full_space_vs_slice() test
 **	over a variety of ranks and offsets.
 **
-**	At present, we test H5S_select_shape_same() with 
+**    At present, we test H5Sselect_shape_same() with
 **	fully selected 1, 2, 3, and 4 cubes as one parameter, and
 **	1, 2, 3, and 4 dimensional slices through a n-cube of rank
-**	no more than 5 (and at least the rank of the slice).  
-**	 We stop at rank 5, as Quincey suggested that it would be 
+**	no more than 5 (and at least the rank of the slice).
+**	 We stop at rank 5, as Quincey suggested that it would be
 **	sufficient.
 **
-**	All the n-cubes will have lengths of the same size, so 
-**	H5S_select_shape_same() should return true iff:
+**	All the n-cubes will have lengths of the same size, so
+**    H5Sselect_shape_same() should return true iff:
 **
-**	1) the rank for the fully selected n cube equals the 
+**	1) the rank for the fully selected n cube equals the
 **         number of dimensions selected in the slice through the
 **         m-cube (m >= n).
 **
 **	2) The dimensions selected in the slice through the m-cube
-**	   are the dimesnions with the most quickly changing 
+**	   are the dimesnions with the most quickly changing
 **	   indices.
 **
 ****************************************************************/
@@ -10730,7 +10670,7 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void)
                                     dim_selected,
                                     expected_result
                                 );
-                                    
+
                                 z++;
                             } while((z < 2) && (large_rank >= 1));
 
@@ -10753,15 +10693,15 @@ test_shape_same_dr__run_full_space_vs_slice_tests(void)
 
 /****************************************************************
 **
-**  test_shape_same_dr__checkerboard(): Tests selection of a 
-**	"checker board" subset of a full n-cube data space vs 
+**  test_shape_same_dr__checkerboard(): Tests selection of a
+**	"checker board" subset of a full n-cube data space vs
 ** 	a "checker board" n-dimensional slice of an m-cube (m > n).
-**	in a call to H5S_select_shape_same().  
+**	in a call to H5S_select_shape_same().
 **
-**	Note that this test does not require the n-cube and the 
+**	Note that this test does not require the n-cube and the
 **	n-dimensional slice to have the same rank (although
-**	H5S_select_shape_same() should always return FALSE if 
-**	they don't). 
+**	H5S_select_shape_same() should always return FALSE if
+**	they don't).
 **
 **	Per Quincey's suggestion, only test up to 5 dimensional
 **	spaces.
@@ -10778,14 +10718,14 @@ test_shape_same_dr__checkerboard(int test_num,
                                  hbool_t expected_result)
 {
     char	test_desc_0[128];
-    char	test_desc_1[128];
+    char	test_desc_1[256];
     int         i;
     int		dims_selected = 0;
-    hid_t	n_cube_0_sid;  /* the checker board selected 
-                                * hyper cube 
+    hid_t	n_cube_0_sid;  /* the checker board selected
+                                * hyper cube
                                 */
-    hid_t	n_cube_1_sid;  /* the hyper cube in which a 
-                                * checkerboard slice is selected 
+    hid_t	n_cube_1_sid;  /* the hyper cube in which a
+                                * checkerboard slice is selected
                                 */
     hsize_t	dims[SS_DR_MAX_RANK];
     hsize_t	base_start[2];
@@ -10807,8 +10747,8 @@ test_shape_same_dr__checkerboard(int test_num,
     HDassert( small_rank <= large_rank );
     HDassert( large_rank <= SS_DR_MAX_RANK );
     HDassert( 0 < checker_size );
-    HDassert( checker_size <= edge_size ); 
-    HDassert( edge_size <= 1000 ); 
+    HDassert( checker_size <= edge_size );
+    HDassert( edge_size <= 1000 );
     HDassert( 0 <= offset );
     HDassert( offset < (int)edge_size );
 
@@ -10819,13 +10759,13 @@ test_shape_same_dr__checkerboard(int test_num,
     HDassert( dims_selected >= 0 );
     HDassert( dims_selected <= large_rank );
 
-    sprintf(test_desc_0, 
-              "\tcheckerboard n-cube slice through m-cube (n <= m) test %d.\n", 
+    HDsprintf(test_desc_0,
+              "\tcheckerboard n-cube slice through m-cube (n <= m) test %d.\n",
               test_num);
     MESSAGE(7, (test_desc_0));
 
     /* This statement must be updated if SS_DR_MAX_RANK is changed */
-    sprintf(test_desc_1, 
+    HDsprintf(test_desc_1,
               "\tranks: %d/%d edge/chkr size: %d/%d offset: %d dim_selected: %d/%d/%d/%d/%d:%d.\n",
               small_rank, large_rank,
               (int)edge_size, (int)checker_size,
@@ -10865,17 +10805,17 @@ test_shape_same_dr__checkerboard(int test_num,
      *		* * - - * * - - * *
      *          * * - - * * - - * *
      *
-     * In both cases, asterisks indicate selected elements, 
+     * In both cases, asterisks indicate selected elements,
      * and dashes indicate unselected elements.
      *
      * 3-D and 4-D ascii art is somewhat painful, so I'll
      * leave those selections to your imagination. :-)
      *
      * Note, that since the edge_size and checker_size are
-     * parameters that are passed in, the selection need 
+     * parameters that are passed in, the selection need
      * not look exactly like the selection shown above.
-     * At present, the function allows checker sizes that 
-     * are not even divisors of the edge size -- thus 
+     * At present, the function allows checker sizes that
+     * are not even divisors of the edge size -- thus
      * something like the following is also possible:
      *
      *		* * * - - - * * * -
@@ -10889,14 +10829,14 @@ test_shape_same_dr__checkerboard(int test_num,
      *		* * * - - - * * * -
      *          - - - * * * - - - *
      *
-     * As the above pattern can't be selected in one 
+     * As the above pattern can't be selected in one
      * call to H5Sselect_hyperslab(), and since the
      * values in the start, stride, count, and block
-     * arrays will be repeated over all entries in 
+     * arrays will be repeated over all entries in
      * the selected space case, and over all selected
      * dimensions in the selected hyperslab case, we
-     * compute these values first and store them in 
-     * in the base_start, base_stride, base_count, 
+     * compute these values first and store them in
+     * in the base_start, base_stride, base_count,
      * and base_block arrays.
      */
 
@@ -10906,9 +10846,9 @@ test_shape_same_dr__checkerboard(int test_num,
     base_stride[0] = 2 * checker_size;
     base_stride[1] = 2 * checker_size;
 
-    /* Note that the following computation depends on the C99 
-     * requirement that integer division discard any fraction 
-     * (truncation towards zero) to function correctly. As we 
+    /* Note that the following computation depends on the C99
+     * requirement that integer division discard any fraction
+     * (truncation towards zero) to function correctly. As we
      * now require C99, this shouldn't be a problem, but noting
      * it may save us some pain if we are ever obliged to support
      * pre-C99 compilers again.
@@ -10925,7 +10865,7 @@ test_shape_same_dr__checkerboard(int test_num,
     base_block[0] = checker_size;
     base_block[1] = checker_size;
 
-    /* now setup start, stride, count, and block arrays for 
+    /* now setup start, stride, count, and block arrays for
      * the first call to H5Sselect_hyperslab().
      */
     for(i = 0; i < SS_DR_MAX_RANK; i++) {
@@ -10939,10 +10879,10 @@ test_shape_same_dr__checkerboard(int test_num,
                               start, stride, count, block);
     CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
-    /* if small_rank == 1, or if edge_size == checker_size, we 
+    /* if small_rank == 1, or if edge_size == checker_size, we
      * are done, as either there is no added dimension in which
      * to place offset selected "checkers".
-     * 
+     *
      * Otherwise, set up start, stride, count and block, and
      * make the additional selection.
      */
@@ -10962,7 +10902,7 @@ test_shape_same_dr__checkerboard(int test_num,
 
     /* Wierdness alert:
      *
-     * Some how, it seems that selections can extend beyond the 
+     * Some how, it seems that selections can extend beyond the
      * boundaries of the target data space -- hence the following
      * code to manually clip the selection back to the data space
      * proper.
@@ -10985,8 +10925,8 @@ test_shape_same_dr__checkerboard(int test_num,
 
 
     /* Now select the checkerboard selection in the (possibly larger) n-cube.
-     * 
-     * Since we have already calculated the base start, stride, count, 
+     *
+     * Since we have already calculated the base start, stride, count,
      * and block, re-use the values in setting up start, stride, count,
      * and block.
      */
@@ -11030,10 +10970,10 @@ test_shape_same_dr__checkerboard(int test_num,
                               start_ptr, stride_ptr, count_ptr, block_ptr);
     CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
-    /* As before, if the number of dimensions selected is less than or 
-     * equal to 1, or if edge_size == checker_size, we are done, as 
-     * either there is no added dimension in which to place offset selected 
-     * "checkers", or the hyperslab is completely occupied by one 
+    /* As before, if the number of dimensions selected is less than or
+     * equal to 1, or if edge_size == checker_size, we are done, as
+     * either there is no added dimension in which to place offset selected
+     * "checkers", or the hyperslab is completely occupied by one
      * "checker".
      *
      * Otherwise, set up start, stride, count and block, and
@@ -11096,23 +11036,23 @@ test_shape_same_dr__checkerboard(int test_num,
 
 /****************************************************************
 **
-**  test_shape_same_dr__run_checkerboard_tests(): 
+**  test_shape_same_dr__run_checkerboard_tests():
 **
-**	In this set of tests, we test H5S_select_shape_same() 
-**      with a "checkerboard" selection of 1, 2, 3, and 4 cubes as 
-**      one parameter, and 1, 2, 3, and 4 dimensional checkerboard 
-**      slices through a n-cube of rank no more than 5 (and at 
-**      least the rank of the slice).  
+**	In this set of tests, we test H5S_select_shape_same()
+**      with a "checkerboard" selection of 1, 2, 3, and 4 cubes as
+**      one parameter, and 1, 2, 3, and 4 dimensional checkerboard
+**      slices through a n-cube of rank no more than 5 (and at
+**      least the rank of the slice).
 **
-**      All the n-cubes will have lengths of the same size, so 
+**      All the n-cubes will have lengths of the same size, so
 **      H5S_select_shape_same() should return true iff:
 **
-**      1) the rank of the n cube equals the number of dimensions 
-**         selected in the checker board slice through the m-cube 
+**      1) the rank of the n cube equals the number of dimensions
+**         selected in the checker board slice through the m-cube
 **         (m >= n).
 **
-**      2) The dimensions selected in the checkerboard slice 
-**         through the m-cube are the dimensions with the most 
+**      2) The dimensions selected in the checkerboard slice
+**         through the m-cube are the dimensions with the most
 **         quickly changing indices.
 **
 ****************************************************************/
@@ -11163,7 +11103,7 @@ test_shape_same_dr__run_checkerboard_tests(void)
                                     dim_selected[4] = FALSE;
                                 else
                                     dim_selected[4] = TRUE;
-                                
+
 
                                 /* compute the expected result: */
                                 i = 0;
@@ -11367,17 +11307,17 @@ test_shape_same_dr__run_checkerboard_tests(void)
 
 /****************************************************************
 **
-**  test_shape_same_dr__irregular(): 
+**  test_shape_same_dr__irregular():
 **
-**	Tests selection of an "irregular" subset of a full 
+**	Tests selection of an "irregular" subset of a full
 **      n-cube data space vs an identical "irregular" subset
 **	of an n-dimensional slice of an m-cube (m > n).
-**	in a call to H5S_select_shape_same().  
+**	in a call to H5S_select_shape_same().
 **
-**	Note that this test does not require the n-cube and the 
+**	Note that this test does not require the n-cube and the
 **	n-dimensional slice to have the same rank (although
-**	H5S_select_shape_same() should always return FALSE if 
-**	they don't). 
+**	H5S_select_shape_same() should always return FALSE if
+**	they don't).
 **
 ****************************************************************/
 static void
@@ -11390,7 +11330,7 @@ test_shape_same_dr__irregular(int test_num,
                               hbool_t expected_result)
 {
     char	test_desc_0[128];
-    char	test_desc_1[128];
+    char	test_desc_1[256];
     int		edge_size = 10;
     int         i;
     int         j;
@@ -11399,7 +11339,7 @@ test_shape_same_dr__irregular(int test_num,
     hid_t	n_cube_0_sid;  /* the hyper cube containing
                                 * an irregular selection
                                 */
-    hid_t	n_cube_1_sid;  /* the hyper cube in which a 
+    hid_t	n_cube_1_sid;  /* the hyper cube in which a
                                 * slice contains an irregular
                                 * selection.
                                 */
@@ -11435,7 +11375,7 @@ test_shape_same_dr__irregular(int test_num,
     hsize_t     clip_block[SS_DR_MAX_RANK]  = {10, 10, 10, 10, 10};
 
 
-    hsize_t	*(starts[SS_DR_MAX_RANK]) = 
+    hsize_t	*(starts[SS_DR_MAX_RANK]) =
                 	{start_0, start_1, start_2, start_3, start_4};
     hsize_t     *(strides[SS_DR_MAX_RANK]) =
                 	{stride_0, stride_1, stride_2, stride_3, stride_4};
@@ -11458,8 +11398,8 @@ test_shape_same_dr__irregular(int test_num,
     HDassert( 0 < small_rank );
     HDassert( small_rank <= large_rank );
     HDassert( large_rank <= SS_DR_MAX_RANK );
-    HDassert( 9 <= edge_size ); 
-    HDassert( edge_size <= 1000 ); 
+    HDassert( 9 <= edge_size );
+    HDassert( edge_size <= 1000 );
     HDassert( 0 <= slice_offset );
     HDassert( slice_offset < edge_size );
     HDassert( -2 <= pattern_offset );
@@ -11472,16 +11412,16 @@ test_shape_same_dr__irregular(int test_num,
     HDassert( dims_selected >= 0 );
     HDassert( dims_selected <= large_rank );
 
-    sprintf(test_desc_0, 
-              "\tirregular sub set of n-cube slice through m-cube (n <= m) test %d.\n", 
+    HDsprintf(test_desc_0,
+              "\tirregular sub set of n-cube slice through m-cube (n <= m) test %d.\n",
               test_num);
     MESSAGE(7, (test_desc_0));
 
     /* This statement must be updated if SS_DR_MAX_RANK is changed */
-    sprintf(test_desc_1, 
+    HDsprintf(test_desc_1,
               "\tranks: %d/%d edge: %d s/p offset: %d/%d dim_selected: %d/%d/%d/%d/%d:%d.\n",
               small_rank, large_rank,
-              edge_size, 
+              edge_size,
               slice_offset, pattern_offset,
               (int)dim_selected[0],
               (int)dim_selected[1],
@@ -11500,11 +11440,11 @@ test_shape_same_dr__irregular(int test_num,
     CHECK(n_cube_0_sid, FAIL, "H5Screate_simple");
 
     /* Select an "irregular" pattern in the small n-cube.  This
-     * pattern can be though of a set of four 3 x 2 x 2 X 2 
-     * four dimensional prisims, each parallel to one of the 
-     * axies and none of them intersecting with the other. 
+     * pattern can be though of a set of four 3 x 2 x 2 X 2
+     * four dimensional prisims, each parallel to one of the
+     * axies and none of them intersecting with the other.
      *
-     * In the lesser dimensional cases, this 4D pattern is 
+     * In the lesser dimensional cases, this 4D pattern is
      * projected onto the lower dimensional space.
      *
      * In the 1-D case, the projection of the pattern looks
@@ -11529,12 +11469,12 @@ test_shape_same_dr__irregular(int test_num,
      *	 	0 - - - - - - - - - -
      *            0 1 2 3 4 5 6 7 8 9 x
      *
-     * In both cases, asterisks indicate selected elements, 
+     * In both cases, asterisks indicate selected elements,
      * and dashes indicate unselected elements.
      *
      * Note that is this case, since the edge size is fixed,
-     * the pattern does not change.  However, we do use the 
-     * displacement parameter to allow it to be moved around 
+     * the pattern does not change.  However, we do use the
+     * displacement parameter to allow it to be moved around
      * within the n-cube or hyper slab.
      */
 
@@ -11549,7 +11489,7 @@ test_shape_same_dr__irregular(int test_num,
         CHECK(ret, FAIL, "H5Sselect_hyperslab");
     } /* end for */
 
-    /* finally, clip the selection to ensure that it lies fully 
+    /* finally, clip the selection to ensure that it lies fully
      * within the n-cube.
      */
     ret = H5Sselect_hyperslab(n_cube_0_sid, H5S_SELECT_AND,
@@ -11588,8 +11528,8 @@ test_shape_same_dr__irregular(int test_num,
 
 
     /* Now select the irregular selection in the (possibly larger) n-cube.
-     * 
-     * Basic idea is to project the pattern used in the smaller n-cube 
+     *
+     * Basic idea is to project the pattern used in the smaller n-cube
      * onto the dimensions selected in the larger n-cube, with the displacement
      * specified.
      */
@@ -11642,7 +11582,7 @@ test_shape_same_dr__irregular(int test_num,
 
 /****************************************************************
 **
-**  test_shape_same_dr__run_irregular_tests(): 
+**  test_shape_same_dr__run_irregular_tests():
 **
 **	In this set of tests, we test H5S_select_shape_same() 
 **      with an "irregular" subselection of 1, 2, 3, and 4 cubes as 
@@ -11655,12 +11595,12 @@ test_shape_same_dr__irregular(int test_num,
 **      All the irregular selections will be identical (modulo rank)
 **      so H5S_select_shape_same() should return true iff:
 **
-**      1) the rank of the n cube equals the number of dimensions 
-**         selected in the irregular slice through the m-cube 
+**      1) the rank of the n cube equals the number of dimensions
+**         selected in the irregular slice through the m-cube
 **         (m >= n).
 **
-**      2) The dimensions selected in the irregular slice 
-**         through the m-cube are the dimensions with the most 
+**      2) The dimensions selected in the irregular slice
+**         through the m-cube are the dimensions with the most
 **         quickly changing indices.
 **
 ****************************************************************/
@@ -11711,7 +11651,7 @@ test_shape_same_dr__run_irregular_tests(void)
                                     dim_selected[4] = FALSE;
                                 else
                                     dim_selected[4] = TRUE;
-                                
+
 
                                 /* compute the expected result: */
                                 i = 0;
@@ -11857,8 +11797,8 @@ test_shape_same_dr__run_irregular_tests(void)
 
 /****************************************************************
 **
-**  test_shape_same_dr(): Tests selections on dataspace with 
-**      different ranks, to verify that "shape same" routine 
+**  test_shape_same_dr(): Tests selections on dataspace with
+**      different ranks, to verify that "shape same" routine
 **	is now handling this case correctly.
 **
 ****************************************************************/
@@ -12576,9 +12516,9 @@ test_select_hyper_chunk_offset(void)
 
     /* Allocate buffers */
     wbuf = (int *)HDmalloc(sizeof(int) * SPACE10_DIM1);
-    CHECK(wbuf, NULL, "HDmalloc");
+    CHECK_PTR(wbuf, "HDmalloc");
     rbuf = (int *)HDcalloc(sizeof(int), SPACE10_DIM1);
-    CHECK(rbuf, NULL, "HDcalloc");
+    CHECK_PTR(rbuf, "HDcalloc");
 
     /* Initialize the write buffer */
     for(i=0; i<SPACE10_DIM1; i++)
@@ -13066,6 +13006,7 @@ test_select_bounds(void)
     CHECK(ret, FAIL, "H5Sclose");
 }   /* test_select_bounds() */
 
+
 /****************************************************************
 **
 **  test_select(): Main H5S selection testing routine.
@@ -13240,13 +13181,11 @@ test_select(void)
  * Programmer:	Albert Cheng
  *              July 2, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
 cleanup_select(void)
 {
-    remove(FILENAME);
+    HDremove(FILENAME);
 }
 
diff --git a/test/tskiplist.c b/test/tskiplist.c
index 1adcd4b..2806afe 100644
--- a/test/tskiplist.c
+++ b/test/tskiplist.c
@@ -29,9 +29,6 @@
        11/15/04 - Started coding
  */
 
-#include <time.h>
-#include <stdlib.h>
-
 #include "testhdf5.h"
 #include "H5SLprivate.h"
 
@@ -39,9 +36,9 @@
 #define NUM_ELEMS       1000
 
 /* Random numbers */
-static int rand_num[NUM_ELEMS];
-static int sort_rand_num[NUM_ELEMS];
-static int rev_sort_rand_num[NUM_ELEMS];
+static int *rand_num;
+static int *sort_rand_num;
+static int *rev_sort_rand_num;
 
 static int tst_sort(const void *i1, const void *i2)
 {
@@ -67,23 +64,31 @@ test_skiplist_init(void)
     unsigned found;     /* Flag to indicate value was inserted already */
     size_t u,v;         /* Local index variables */
 
+    /* Allocate arrays */
+    rand_num = (int *)HDmalloc(sizeof(int) * NUM_ELEMS);
+    CHECK_PTR(rand_num, "HDmalloc");
+    sort_rand_num = (int *)HDmalloc(sizeof(int) * NUM_ELEMS);
+    CHECK_PTR(sort_rand_num, "HDmalloc");
+    rev_sort_rand_num = (int *)HDmalloc(sizeof(int) * NUM_ELEMS);
+    CHECK_PTR(rev_sort_rand_num, "HDmalloc");
+
     /* Initialize random number seed */
     curr_time = HDtime(NULL);
     HDsrandom((unsigned)curr_time);
 
     /* Create randomized set of numbers */
-    for(u=0; u<NUM_ELEMS; u++) {
+    for(u = 0; u < NUM_ELEMS; u++) {
         do {
             /* Reset flag */
-            found=0;
+            found = 0;
 
             /* Generate random numbers from -5000 to 5000 */
-            new_val=(int)(HDrandom()%10001)-5001;
+            new_val = (int)(HDrandom() % 10001) - 5001;
 
             /* Check if the value is already in the array */
-            for(v=0; v<u; v++)
-                if(rand_num[v]==new_val)
-                    found=1;
+            for(v = 0; v < u; v++)
+                if(rand_num[v] == new_val)
+                    found = 1;
         } while(found);
 
         /* Set unique value in array */
@@ -91,7 +96,7 @@ test_skiplist_init(void)
     } /* end for */
 
     /* Copy random values to sorted array */
-    HDmemcpy(sort_rand_num,rand_num,sizeof(int)*NUM_ELEMS);
+    HDmemcpy(sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS);
 
     /* Sort random numbers */
     HDqsort(sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_sort);
@@ -101,7 +106,7 @@ test_skiplist_init(void)
 
     /* Sort random numbers */
     HDqsort(rev_sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_rev_sort);
-} /* end test_tst_init() */
+} /* end test_skiplist_init() */
 
 /****************************************************************
 **
@@ -120,7 +125,7 @@ test_skiplist_create(void)
 
     /* Try creating a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Try closing the skip list */
     ret=H5SL_close(slist);
@@ -150,7 +155,7 @@ test_skiplist_insert(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -159,7 +164,7 @@ test_skiplist_insert(void)
     /* Try searching for item in empty skip list */
     key=37;
     found_item=(int *)H5SL_search(slist,&key);
-    VERIFY(found_item, NULL, "H5SL_search");
+    CHECK_PTR_NULL(found_item, "H5SL_search");
 
     /* Insert an object into the skip list */
     key=2; item=10;
@@ -172,13 +177,13 @@ test_skiplist_insert(void)
 
     /* Search for the item just inserted */
     found_item=(int *)H5SL_search(slist,&key);
-    CHECK(found_item, NULL, "H5SL_search");
-    VERIFY(*found_item,item,"H5SL_search");
+    CHECK_PTR(found_item, "H5SL_search");
+    VERIFY(*found_item, item, "H5SL_search");
 
     /* Search for an item not in list */
     search_key=37;
     found_item=(int *)H5SL_search(slist,&search_key);
-    VERIFY(found_item, NULL, "H5SL_search");
+    CHECK_PTR_NULL(found_item, "H5SL_search");
 
     /* Attempt to insert duplicate key (should fail) */
     search_key=2;
@@ -211,7 +216,7 @@ test_skiplist_insert_many(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -230,7 +235,7 @@ test_skiplist_insert_many(void)
     /* Search for all objects in the skip list */
     for(u=0; u<NUM_ELEMS; u++) {
         found_item=(int *)H5SL_search(slist,&rand_num[u]);
-        CHECK(found_item, NULL, "H5SL_search");
+        CHECK_PTR(found_item, "H5SL_search");
         VERIFY(*found_item,rand_num[u],"H5SL_search");
     } /* end for */
 
@@ -285,7 +290,7 @@ test_skiplist_remove(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -294,7 +299,7 @@ test_skiplist_remove(void)
     /* Try removing an item in empty skip list */
     search_key=37;
     found_item=(int *)H5SL_remove(slist,&search_key);
-    VERIFY(found_item, NULL, "H5SL_remove");
+    CHECK_PTR_NULL(found_item, "H5SL_remove");
 
     /* Insert three objects into the skip list */
     key1=15;
@@ -316,18 +321,18 @@ test_skiplist_remove(void)
     /* Try removing items from skip list */
     search_key=key1;
     found_item=(int *)H5SL_remove(slist,&search_key);
-    CHECK(found_item, NULL, "H5SL_remove");
-    VERIFY(found_item, &key1, "H5SL_remove");
+    CHECK_PTR(found_item, "H5SL_remove");
+    CHECK_PTR_EQ(found_item, &key1, "H5SL_remove");
 
     search_key=key2;
     found_item=(int *)H5SL_remove(slist,&search_key);
-    CHECK(found_item, NULL, "H5SL_remove");
-    VERIFY(found_item, &key2, "H5SL_remove");
+    CHECK_PTR(found_item, "H5SL_remove");
+    CHECK_PTR_EQ(found_item, &key2, "H5SL_remove");
 
     search_key=key3;
     found_item=(int *)H5SL_remove(slist,&search_key);
-    CHECK(found_item, NULL, "H5SL_remove");
-    VERIFY(found_item, &key3, "H5SL_remove");
+    CHECK_PTR(found_item, "H5SL_remove");
+    CHECK_PTR_EQ(found_item, &key3, "H5SL_remove");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -336,7 +341,7 @@ test_skiplist_remove(void)
     /* Try removing items from empty skip list (after its been worked on) */
     search_key=key1;
     found_item=(int *)H5SL_remove(slist,&search_key);
-    VERIFY(found_item, NULL, "H5SL_remove");
+    CHECK_PTR_NULL(found_item, "H5SL_remove");
 
     /* Close the skip list */
     ret=H5SL_close(slist);
@@ -364,7 +369,7 @@ test_skiplist_remove_many(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -383,7 +388,7 @@ test_skiplist_remove_many(void)
     /* Remove all objects from the skip list (in random order) */
     for(u=0; u<NUM_ELEMS; u++) {
         found_item=(int *)H5SL_remove(slist,&rand_num[u]);
-        CHECK(found_item, NULL, "H5SL_remove");
+        CHECK_PTR(found_item, "H5SL_remove");
         VERIFY(*found_item,rand_num[u],"H5SL_remove");
     } /* end for */
 
@@ -406,7 +411,7 @@ test_skiplist_remove_many(void)
     /* Remove all objects from the skip list */
     for(u=0; u<NUM_ELEMS; u++) {
         found_item=(int *)H5SL_remove(slist,&sort_rand_num[u]);
-        CHECK(found_item, NULL, "H5SL_remove");
+        CHECK_PTR(found_item, "H5SL_remove");
         VERIFY(*found_item,sort_rand_num[u],"H5SL_remove");
     } /* end for */
 
@@ -429,7 +434,7 @@ test_skiplist_remove_many(void)
     /* Remove all objects from the skip list */
     for(u=0; u<NUM_ELEMS; u++) {
         found_item=(int *)H5SL_remove(slist,&rev_sort_rand_num[u]);
-        CHECK(found_item, NULL, "H5SL_remove");
+        CHECK_PTR(found_item, "H5SL_remove");
         VERIFY(*found_item,rev_sort_rand_num[u],"H5SL_remove");
     } /* end for */
 
@@ -464,7 +469,7 @@ test_skiplist_firstnext(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -472,7 +477,7 @@ test_skiplist_firstnext(void)
     VERIFY(num, 0, "H5SL_count");
     /* Check that the list appears empty */
     node=H5SL_first(slist);
-    VERIFY(node, NULL, "H5SL_first");
+    CHECK_PTR_NULL(node, "H5SL_first");
 
     /* Insert many objects into the skip list */
     for(u=0; u<NUM_ELEMS; u++) {
@@ -486,7 +491,7 @@ test_skiplist_firstnext(void)
 
     /* Iterate over all the nodes in the skip list */
     node=H5SL_first(slist);
-    CHECK(node, NULL, "H5SL_first");
+    CHECK_PTR(node, "H5SL_first");
     u=0;
     while(node!=NULL) {
         found_item=(int *)H5SL_item(node);
@@ -501,7 +506,7 @@ test_skiplist_firstnext(void)
 
     /* Check that the list appears empty again */
     node=H5SL_first(slist);
-    VERIFY(node, NULL, "H5SL_first");
+    CHECK_PTR_NULL(node, "H5SL_first");
 
     /* Close the skip list */
     ret=H5SL_close(slist);
@@ -557,7 +562,7 @@ test_skiplist_string(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_STR, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -619,7 +624,7 @@ test_skiplist_iterate(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -669,7 +674,7 @@ test_skiplist_hsize(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_HSIZE, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -724,7 +729,7 @@ test_skiplist_unsigned(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -779,7 +784,7 @@ test_skiplist_obj(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_OBJ, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -857,7 +862,7 @@ test_skiplist_generic(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_GENERIC, test_skiplist_generic_cmp);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -911,7 +916,7 @@ test_skiplist_lastprev(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Check that the skip list has no elements */
     num=H5SL_count(slist);
@@ -919,7 +924,7 @@ test_skiplist_lastprev(void)
 
     /* Check that the list appears empty */
     node=H5SL_last(slist);
-    VERIFY(node, NULL, "H5SL_last");
+    CHECK_PTR_NULL(node, "H5SL_last");
 
     /* Insert many objects into the skip list */
     for(u=0; u<NUM_ELEMS; u++) {
@@ -933,7 +938,7 @@ test_skiplist_lastprev(void)
 
     /* Iterate over all the nodes in the skip list */
     node=H5SL_last(slist);
-    CHECK(node, NULL, "H5SL_last");
+    CHECK_PTR(node, "H5SL_last");
     u=NUM_ELEMS-1;
     while(node!=NULL) {
         found_item=(int *)H5SL_item(node);
@@ -948,7 +953,7 @@ test_skiplist_lastprev(void)
 
     /* Check that the list appears empty again */
     node=H5SL_last(slist);
-    VERIFY(node, NULL, "H5SL_last");
+    CHECK_PTR_NULL(node, "H5SL_last");
 
     /* Close the skip list */
     ret=H5SL_close(slist);
@@ -979,7 +984,7 @@ test_skiplist_find(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u=0; u<10; u++) {
@@ -990,7 +995,7 @@ test_skiplist_find(void)
     /* Find the element with key==30 in the skip list */
     find_item=30;
     node=H5SL_find(slist,&find_item);
-    CHECK(node, NULL, "H5SL_find");
+    CHECK_PTR(node, "H5SL_find");
 
     /* Iterate over the rest of the nodes in the skip list */
     u=4;
@@ -1004,7 +1009,7 @@ test_skiplist_find(void)
     /* Check for trying to locate non-existent item */
     find_item=81;
     node=H5SL_find(slist,&find_item);
-    VERIFY(node, NULL, "H5SL_find");
+    CHECK_PTR_NULL(node, "H5SL_find");
 
     /* Close the skip list */
     ret=H5SL_close(slist);
@@ -1035,7 +1040,7 @@ test_skiplist_add(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u=0; u<10; u++) {
@@ -1046,11 +1051,11 @@ test_skiplist_add(void)
     /* Add the element with key==12 in the skip list */
     new_item=12;
     node=H5SL_add(slist,&new_item,&new_item);
-    CHECK(node, NULL, "H5SL_add");
+    CHECK_PTR(node, "H5SL_add");
 
     /* Advance to next node in list */
     node=H5SL_next(node);
-    CHECK(node, NULL, "H5SL_next");
+    CHECK_PTR(node, "H5SL_next");
 
     /* Iterate over the rest of the nodes in the skip list */
     u=2;
@@ -1097,7 +1102,7 @@ test_skiplist_destroy(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u=0; u<NUM_ELEMS; u++) {
@@ -1133,7 +1138,7 @@ test_skiplist_free(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u=0; u<NUM_ELEMS; u++) {
@@ -1205,8 +1210,8 @@ static herr_t test_tfs_iter(void *_obj, void *key, void *_udata) {
     test_tfs_it_ud_t *udata = (test_tfs_it_ud_t *)_udata;
 
     /* Check consistency */
-    VERIFY((void *)&obj->idx, key, "obj->idx");
-    VERIFY(obj, &udata->obj_list->list[obj->idx], "obj_list->list[obj->idx]");
+    CHECK_PTR_EQ((void *)&obj->idx, key, "obj->idx");
+    CHECK_PTR_EQ(obj, &udata->obj_list->list[obj->idx], "obj_list->list[obj->idx]");
 
     /* Increment number of calls */
     udata->ncalls++;
@@ -1231,8 +1236,8 @@ static htri_t test_tfs_free(void *_obj, void *key, void *_obj_list) {
     htri_t ret_value;
 
     /* Check consistency */
-    VERIFY((void *)&obj->idx, key, "obj->idx");
-    VERIFY(obj, &obj_list->list[obj->idx], "obj_list->list[obj->idx]");
+    CHECK_PTR_EQ((void *)&obj->idx, key, "obj->idx");
+    CHECK_PTR_EQ(obj, &obj_list->list[obj->idx], "obj_list->list[obj->idx]");
 
     /* Mark this object as freed (to make sure it isn't recursively freed, that
      * is not something we support, we will undo this if we decide later not to
@@ -1264,7 +1269,7 @@ static htri_t test_tfs_free(void *_obj, void *key, void *_obj_list) {
             else {
                 /* Remove the object */
                 obj_ret = (test_tfs_obj_t *)H5SL_remove(obj_list->slist, &j);
-                CHECK(obj_ret, NULL, "H5SL_remove");
+                CHECK_PTR(obj_ret, "H5SL_remove");
                 obj_ret->nfrees++;
                 obj_list->nobjs_rem--;
             } /* end else */
@@ -1319,7 +1324,7 @@ test_skiplist_try_free_safe(void)
 
     /* Create a skip list */
     obj_list.slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(obj_list.slist, NULL, "H5SL_create");
+    CHECK_PTR(obj_list.slist, "H5SL_create");
 
     /* Init obj_list.list */
     obj_list.list = list;
@@ -1391,7 +1396,7 @@ test_skiplist_less(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u=0; u<10; u++) {
@@ -1425,7 +1430,7 @@ test_skiplist_less(void)
     VERIFY(*found_item,5,"H5SL_less");
     find_item=4;
     found_item=(unsigned *)H5SL_less(slist,&find_item);
-    VERIFY(found_item,NULL,"H5SL_less");
+    CHECK_PTR_NULL(found_item, "H5SL_less");
 
     /* Close the skip list */
     ret=H5SL_close(slist);
@@ -1455,7 +1460,7 @@ test_skiplist_greater(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u = 0; u < 10; u++) {
@@ -1483,7 +1488,7 @@ test_skiplist_greater(void)
     VERIFY(*found_item, 90, "H5SL_greater");
     find_item = 100;
     found_item = (unsigned *)H5SL_greater(slist, &find_item);
-    VERIFY(found_item, NULL, "H5SL_greater");
+    CHECK_PTR_NULL(found_item, "H5SL_greater");
     find_item = 6;
     found_item = (unsigned *)H5SL_greater(slist, &find_item);
     VERIFY(*found_item, 10, "H5SL_greater");
@@ -1520,7 +1525,7 @@ test_skiplist_below(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u = 0; u < 10; u++) {
@@ -1531,44 +1536,44 @@ test_skiplist_below(void)
     /* Check for exact match of items in various positions */
     find_item = 20;
     node = H5SL_below(slist, &find_item);
-    CHECK(node, NULL, "H5SL_below");
+    CHECK_PTR(node, "H5SL_below");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, find_item, "H5SL_below");
     find_item = 90;
     node = H5SL_below(slist, &find_item);
-    CHECK(node, NULL, "H5SL_below");
+    CHECK_PTR(node, "H5SL_below");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, find_item, "H5SL_below");
     find_item = 5;
     node = H5SL_below(slist, &find_item);
-    CHECK(node, NULL, "H5SL_below");
+    CHECK_PTR(node, "H5SL_below");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, find_item, "H5SL_below");
 
     /* Find item less than a missing key, in various positions */
     find_item = 19;
     node = H5SL_below(slist, &find_item);
-    CHECK(node, NULL, "H5SL_below");
+    CHECK_PTR(node, "H5SL_below");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 15, "H5SL_below");
     find_item = 89;
     node = H5SL_below(slist, &find_item);
-    CHECK(node, NULL, "H5SL_below");
+    CHECK_PTR(node, "H5SL_below");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 80, "H5SL_below");
     find_item = 100;
     node = H5SL_below(slist, &find_item);
-    CHECK(node, NULL, "H5SL_below");
+    CHECK_PTR(node, "H5SL_below");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 90, "H5SL_below");
     find_item = 9;
     node = H5SL_below(slist, &find_item);
-    CHECK(node, NULL, "H5SL_below");
+    CHECK_PTR(node, "H5SL_below");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 5, "H5SL_below");
     find_item = 4;
     node = (H5SL_node_t *)H5SL_less(slist, &find_item);
-    VERIFY(node, NULL, "H5SL_below");
+    CHECK_PTR_NULL(node, "H5SL_below");
 
     /* Close the skip list */
     ret = H5SL_close(slist);
@@ -1599,7 +1604,7 @@ test_skiplist_above(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u = 0; u < 10; u++) {
@@ -1610,42 +1615,42 @@ test_skiplist_above(void)
     /* Check for exact match of items in various positions */
     find_item = 20;
     node = H5SL_above(slist, &find_item);
-    CHECK(node, NULL, "H5SL_above");
+    CHECK_PTR(node, "H5SL_above");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, find_item, "H5SL_above");
     find_item = 90;
     node = H5SL_above(slist, &find_item);
-    CHECK(node, NULL, "H5SL_above");
+    CHECK_PTR(node, "H5SL_above");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, find_item, "H5SL_above");
     find_item = 5;
     node = H5SL_above(slist, &find_item);
-    CHECK(node, NULL, "H5SL_above");
+    CHECK_PTR(node, "H5SL_above");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, find_item, "H5SL_above");
 
     /* Find item greater than a missing key, in various positions */
     find_item = 19;
     node = H5SL_above(slist, &find_item);
-    CHECK(node, NULL, "H5SL_above");
+    CHECK_PTR(node, "H5SL_above");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 20, "H5SL_above");
     find_item = 89;
     node = H5SL_above(slist, &find_item);
-    CHECK(node, NULL, "H5SL_above");
+    CHECK_PTR(node, "H5SL_above");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 90, "H5SL_above");
     find_item = 100;
     node = H5SL_above(slist, &find_item);
-    VERIFY(node, NULL, "H5SL_above");
+    CHECK_PTR_NULL(node, "H5SL_above");
     find_item = 6;
     node = H5SL_above(slist, &find_item);
-    CHECK(node, NULL, "H5SL_above");
+    CHECK_PTR(node, "H5SL_above");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 10, "H5SL_above");
     find_item = 4;
     node = H5SL_above(slist, &find_item);
-    CHECK(node, NULL, "H5SL_above");
+    CHECK_PTR(node, "H5SL_above");
     found_item = (unsigned *)H5SL_item(node);
     VERIFY(*found_item, 5, "H5SL_above");
 
@@ -1676,7 +1681,7 @@ test_skiplist_remove_first(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_UNSIGNED, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u = 0; u < 10; u++) {
@@ -1692,7 +1697,7 @@ test_skiplist_remove_first(void)
 
     /* Check for removing object from empty list */
     found_item = (unsigned *)H5SL_remove_first(slist);
-    VERIFY(found_item, NULL, "H5SL_remove_first");
+    CHECK_PTR_NULL(found_item, "H5SL_remove_first");
 
     /* Close the skip list */
     ret = H5SL_close(slist);
@@ -1720,7 +1725,7 @@ test_skiplist_remove_first_many(void)
 
     /* Create a skip list */
     slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK(slist, NULL, "H5SL_create");
+    CHECK_PTR(slist, "H5SL_create");
 
     /* Insert objects into the skip list */
     for(u = 0; u < NUM_ELEMS; u++) {
@@ -1737,7 +1742,7 @@ test_skiplist_remove_first_many(void)
 
     /* Check for removing object from empty list */
     found_item = (int *)H5SL_remove_first(slist);
-    VERIFY(found_item, NULL, "H5SL_remove_first");
+    CHECK_PTR_NULL(found_item, "H5SL_remove_first");
 
     /* Close the skip list */
     ret = H5SL_close(slist);
@@ -1747,6 +1752,24 @@ test_skiplist_remove_first_many(void)
 
 /****************************************************************
 **
+**  test_skiplist_term(): Test H5SL (skiplist) code.
+**      Release data for skip list testing
+**
+****************************************************************/
+static void
+test_skiplist_term(void)
+{
+    /* Release arrays */
+    if(rand_num)
+        HDfree(rand_num);
+    if(sort_rand_num)
+        HDfree(sort_rand_num);
+    if(rev_sort_rand_num)
+        HDfree(rev_sort_rand_num);
+} /* end test_skiplist_term() */
+
+/****************************************************************
+**
 **  test_skiplist(): Main H5SL testing routine.
 **
 ****************************************************************/
@@ -1785,5 +1808,8 @@ test_skiplist(void)
     test_skiplist_remove_first();   /* Test 'remove first' operation */
     test_skiplist_remove_first_many();  /* Test 'remove first' operation on large skip lists */
 
+    /* Release skip list testing data */
+    test_skiplist_term();
+
 }   /* end test_skiplist() */
 
diff --git a/test/tsohm.c b/test/tsohm.c
index df464ffd..171b069 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -618,7 +618,7 @@ size1_helper(hid_t file, const char* filename, hid_t fapl_id, int test_file_clos
 
     if(rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str)) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
     if(H5Dclose(dset_id) < 0) FAIL_STACK_ERROR
@@ -662,13 +662,13 @@ size1_helper(hid_t file, const char* filename, hid_t fapl_id, int test_file_clos
     HDmemset(&rdata, 0, sizeof(rdata));
     if(H5Dread(dset_id, dtype1_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str)) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -695,13 +695,13 @@ size1_helper(hid_t file, const char* filename, hid_t fapl_id, int test_file_clos
     HDmemset(&rdata, 0, sizeof(rdata));
     if(H5Dread(dset_id, dtype1_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
-        printf("Can't read data\n");
+        HDprintf("Can't read data\n");
         goto error;
     } /* end if */
 
     if(rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str)) {
         H5_FAILED(); AT();
-        printf("incorrect read data\n");
+        HDprintf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -1374,14 +1374,14 @@ static void
 size2_dump_struct(const char *name, size2_helper_struct *sizes)
 {
   puts(name);
-  printf("    empty size: %llu\n", (unsigned long long)sizes->empty_size);
-  printf(" first dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->first_dset, (unsigned long long)(sizes->first_dset - sizes->empty_size));
-  printf("second dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->second_dset, (unsigned long long)(sizes->second_dset - sizes->first_dset));
-  printf("       dsets 1: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets1, (unsigned long long)(sizes->dsets1 - sizes->second_dset));
-  printf("       dsets 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets2, (unsigned long long)(sizes->dsets2 - sizes->dsets1));
-  printf("   interleaved: %llu \tdelta: %llu\n", (unsigned long long)sizes->interleaved, (unsigned long long)(sizes->interleaved - sizes->dsets2));
-  printf("    attributes: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs1, (unsigned long long)(sizes->attrs1 - sizes->interleaved));
-  printf("  attributes 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs2, (unsigned long long)(sizes->attrs2 - sizes->attrs1));
+  HDprintf("    empty size: %llu\n", (unsigned long long)sizes->empty_size);
+  HDprintf(" first dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->first_dset, (unsigned long long)(sizes->first_dset - sizes->empty_size));
+  HDprintf("second dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->second_dset, (unsigned long long)(sizes->second_dset - sizes->first_dset));
+  HDprintf("       dsets 1: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets1, (unsigned long long)(sizes->dsets1 - sizes->second_dset));
+  HDprintf("       dsets 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets2, (unsigned long long)(sizes->dsets2 - sizes->dsets1));
+  HDprintf("   interleaved: %llu \tdelta: %llu\n", (unsigned long long)sizes->interleaved, (unsigned long long)(sizes->interleaved - sizes->dsets2));
+  HDprintf("    attributes: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs1, (unsigned long long)(sizes->attrs1 - sizes->interleaved));
+  HDprintf("  attributes 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs2, (unsigned long long)(sizes->attrs2 - sizes->attrs1));
 }
 #endif /* NOT_NOW */
 
diff --git a/test/ttime.c b/test/ttime.c
index 2eb2117..5b3436d 100644
--- a/test/ttime.c
+++ b/test/ttime.c
@@ -13,7 +13,7 @@
 
 /***********************************************************
 *
-* Test program:	 ttime
+* Test program:     ttime
 *
 * Test the Time Datatype functionality
 *
@@ -21,8 +21,6 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
-
 #define DATAFILE   "ttime.h5"
 #ifdef NOT_YET
 #define DATASETNAME   "Dataset"
@@ -180,13 +178,13 @@ test_time_io(void)
 tid = H5Dget_type(dsid);
 CHECK(tid, FAIL, "H5Dget_type");
 if( H5Tget_class (tid) == H5T_TIME)
-    fprintf(stderr,"datatype class is H5T_TIME\n");
+    HDfprintf(stderr,"datatype class is H5T_TIME\n");
 status = H5Tclose (tid);
 CHECK(status, FAIL, "H5Tclose");
 
     status = H5Dread (dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timethen);
     CHECK(status, FAIL, "H5Dread");
-fprintf(stderr,"time written was: %s\n", HDctime(&timethen));
+HDfprintf(stderr,"time written was: %s\n", HDctime(&timethen));
 
     status = H5Dclose(dsid);
     CHECK(status, FAIL, "H5Dclose");
@@ -215,15 +213,15 @@ test_time(void)
 
 }   /* test_time() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_time
+ * Function:    cleanup_time
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              October 19, 2000
  *
  * Modifications:
@@ -233,6 +231,6 @@ test_time(void)
 void
 cleanup_time(void)
 {
-    remove(DATAFILE);
+    HDremove(DATAFILE);
 }
 
diff --git a/test/ttsafe.c b/test/ttsafe.c
index d348667..3febdd8 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -27,14 +27,8 @@
  * Each test module should include ttsafe.h and define a unique set of
  * names for test files they create.
  *
- * BUGS/LIMITATIONS
- *
- * EXPORTED ROUTINES/VARIABLES:
- *
  */
 
-#include "h5test.h"
-
 /* ANY new test needs to have a prototype in ttsafe.h */
 #include "ttsafe.h"
 
@@ -120,7 +114,7 @@ int main(int argc, char *argv[])
 
 #else /* H5_HAVE_THREADSAFE */
 
-    printf("Most thread-safety tests skipped because THREADSAFE not enabled\n");
+    HDprintf("Most thread-safety tests skipped because THREADSAFE not enabled\n");
 
 #endif /* H5_HAVE_THREADSAFE */
 
@@ -141,6 +135,9 @@ int main(int argc, char *argv[])
     if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP"))
         TestCleanup();
 
+    /* Release test infrastructure */
+    TestShutdown();
+
     return GetTestNumErrs();
 
 } /* end main() */
diff --git a/test/ttsafe.h b/test/ttsafe.h
index 6cf449f..c29fadc 100644
--- a/test/ttsafe.h
+++ b/test/ttsafe.h
@@ -22,9 +22,6 @@
  * Include required headers.  This file tests internal library functions,
  * so we include the private headers here.
  */
-#include "hdf5.h"
-#include "H5private.h"
-#include "H5Eprivate.h"
 #include "testhdf5.h"
 
 
diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c
index 754c72a..5c08d09 100644
--- a/test/ttsafe_acreate.c
+++ b/test/ttsafe_acreate.c
@@ -26,31 +26,15 @@
  *        dataset), there is a small chance that consecutive reads occur
  *        before a write to that shared variable.
  *
- * HDF5 APIs exercised in thread:
- * H5Acreate2, H5Awrite, H5Aclose.
- *
  * Created: Oct 5 1999
  * Programmer: Chee Wai LEE
  *
- * Modification History
- * --------------------
- *
- *	15 May 2000, Chee Wai LEE
- *	Incorporated into library tests.
- *
- *	19 May 2000, Bill Wendling
- *	Changed so that it creates its own HDF5 file and removes it at cleanup
- *	time.
- *
  ********************************************************************/
 
 #include "ttsafe.h"
 
 #ifdef H5_HAVE_THREADSAFE
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #define FILENAME	"ttsafe_acreate.h5"
 #define DATASETNAME	"IntData"
 #define NUM_THREADS	16
@@ -64,20 +48,24 @@ typedef struct acreate_data_struct {
 	int current_index;
 } ttsafe_name_data_t;
 
-void tts_acreate(void)
+void
+tts_acreate(void)
 {
     /* Thread declarations */
     H5TS_thread_t threads[NUM_THREADS];
 
     /* HDF5 data declarations */
-    hid_t   file, dataset;
-    hid_t   dataspace, datatype;
-    hid_t   attribute;
+    hid_t   file        = H5I_INVALID_HID;
+    hid_t   dataset     = H5I_INVALID_HID;
+    hid_t   dataspace   = H5I_INVALID_HID;
+    hid_t   datatype    = H5I_INVALID_HID;
+    hid_t   attribute   = H5I_INVALID_HID;
     hsize_t dimsf[1];		/* dataset dimensions */
 
     /* data declarations */
     int     data;			/* data to write */
-    int     buffer, ret, i;
+    int     buffer, i;
+    herr_t  status;
 
     ttsafe_name_data_t *attrib_data;
 
@@ -86,76 +74,79 @@ void tts_acreate(void)
      * creation plist and default file access plist
      */
     file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    assert(file>=0);
+    CHECK(file, H5I_INVALID_HID, "H5Fcreate");
 
     /* create a simple dataspace for the dataset */
     dimsf[0] = 1;
     dataspace = H5Screate_simple(1, dimsf, NULL);
-    assert(dataspace>=0);
+    CHECK(dataspace, H5I_INVALID_HID, "H5Screate_simple");
 
     /* define datatype for the data using native little endian integers */
     datatype = H5Tcopy(H5T_NATIVE_INT);
-    H5Tset_order(datatype, H5T_ORDER_LE);
+    CHECK(datatype, H5I_INVALID_HID, "H5Tcopy");
+    status = H5Tset_order(datatype, H5T_ORDER_LE);
+    CHECK(status, FAIL, "H5Tset_order");
 
     /* create a new dataset within the file */
     dataset = H5Dcreate2(file, DATASETNAME, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    assert(dataset >= 0);
+    CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2");
 
     /* initialize data for dataset and write value to dataset */
     data = NUM_THREADS;
-    ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &data);
-    assert(ret >= 0);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &data);
+    CHECK(status, FAIL, "H5Dwrite");
 
     /*
      * Simultaneously create a large number of attributes to be associated
      * with the dataset
      */
     for(i = 0; i < NUM_THREADS; i++) {
-        attrib_data = HDmalloc(sizeof(ttsafe_name_data_t));
+        attrib_data = (ttsafe_name_data_t *)HDmalloc(sizeof(ttsafe_name_data_t));
         attrib_data->dataset = dataset;
         attrib_data->datatype = datatype;
         attrib_data->dataspace = dataspace;
         attrib_data->current_index = i;
         threads[i] = H5TS_create_thread(tts_acreate_thread, NULL, attrib_data);
-    } /* end for */
+    }
 
-    for(i = 0; i < NUM_THREADS; i++) {
+    for(i = 0; i < NUM_THREADS; i++)
         H5TS_wait_for_thread(threads[i]);
-    } /* end for */
-
 
     /* verify the correctness of the test */
     for(i = 0; i < NUM_THREADS; i++) {
         attribute = H5Aopen(dataset, gen_name(i), H5P_DEFAULT);
+        CHECK(attribute, H5I_INVALID_HID, "H5Aopen");
 
         if(attribute < 0)
             TestErrPrintf("unable to open appropriate attribute.  Test failed!\n");
         else {
-            ret = H5Aread(attribute, H5T_NATIVE_INT, &buffer);
-
-            if(ret < 0 || buffer != i)
-                TestErrPrintf("wrong data values. Test failed!\n");
+            status = H5Aread(attribute, H5T_NATIVE_INT, &buffer);
+            CHECK(status, FAIL, "H5Aread");
+            VERIFY(buffer, i, "data values don't match");
 
-            H5Aclose(attribute);
-        } /* end else */
-    } /* end for */
+            status = H5Aclose(attribute);
+            CHECK(status, FAIL, "H5Aclose");
+        }
+    }
 
     /* close remaining resources */
-    ret = H5Sclose(dataspace);
-    assert(ret >= 0);
-    ret = H5Tclose(datatype);
-    assert(ret >= 0);
-    ret = H5Dclose(dataset);
-    assert(ret >= 0);
-    ret = H5Fclose(file);
-    assert(ret >= 0);
-}
-
-void *tts_acreate_thread(void *client_data)
+    status = H5Sclose(dataspace);
+    CHECK(status, FAIL, "H5Sclose");
+    status = H5Tclose(datatype);
+    CHECK(status, FAIL, "H5Sclose");
+    status = H5Dclose(dataset);
+    CHECK(status, FAIL, "H5Dclose");
+    status = H5Fclose(file);
+    CHECK(status, FAIL, "H5Fclose");
+} /* end tts_acreate() */
+
+void *
+tts_acreate_thread(void *client_data)
 {
-    hid_t   attribute;
+    hid_t   attribute   = H5I_INVALID_HID;
     char    *attribute_name;
     int     *attribute_data;	/* data for attributes */
+    herr_t  status;
 
     ttsafe_name_data_t *attrib_data;
 
@@ -166,18 +157,23 @@ void *tts_acreate_thread(void *client_data)
     attribute = H5Acreate2(attrib_data->dataset, attribute_name,
                           attrib_data->datatype, attrib_data->dataspace,
                           H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(attribute, H5I_INVALID_HID, "H5Acreate2");
 
     /* Write data to the attribute */
-    attribute_data = HDmalloc(sizeof(int));
+    attribute_data = (int *)HDmalloc(sizeof(int));
     *attribute_data = attrib_data->current_index;
-    H5Awrite(attribute, H5T_NATIVE_INT, attribute_data);
-    H5Aclose(attribute);
+    status = H5Awrite(attribute, H5T_NATIVE_INT, attribute_data);
+    CHECK(status, FAIL, "H5Awrite");
+    status = H5Aclose(attribute);
+    CHECK(status, FAIL, "H5Aclose");
     return NULL;
-}
+} /* end tts_acreate_thread() */
 
-void cleanup_acreate(void)
+void
+cleanup_acreate(void)
 {
     HDunlink(FILENAME);
 }
 
 #endif /*H5_HAVE_THREADSAFE*/
+
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c
index 623ef98..dd52232 100644
--- a/test/ttsafe_cancel.c
+++ b/test/ttsafe_cancel.c
@@ -27,20 +27,9 @@
  * Temporary files generated:
  *   ttsafe_cancel.h5
  *
- * HDF5 APIs exercised in thread:
- * H5Screate_simple, H5Tcopy, H5Tset_order, H5Dcreate2, H5Dclose,
- * H5Dwrite, H5Dread, H5Diterate, H5Tclose, H5Sclose.
- *
  * Created: May 15 2000
  * Programmer: Chee Wai LEE
  *
- * Modification History
- * --------------------
- *
- *	19 May 2000, Bill Wendling
- *	Changed so that it creates its own HDF5 file and removes it at cleanup
- *	time.
- *
  ********************************************************************/
 #include "ttsafe.h"
 
@@ -66,7 +55,8 @@ pthread_t childthread;
 pthread_mutex_t mutex;
 pthread_cond_t cond;
 
-void tts_cancel(void)
+void
+tts_cancel(void)
 {
     pthread_attr_t attribute;
     hid_t dataset;
@@ -116,31 +106,34 @@ void tts_cancel(void)
     /* Destroy the thread attribute */
     ret=pthread_attr_destroy(&attribute);
     assert(ret==0);
-}
+} /* end tts_cancel() */
 
-void *tts_cancel_thread(void H5_ATTR_UNUSED *arg)
+void *
+tts_cancel_thread(void H5_ATTR_UNUSED *arg)
 {
+    hid_t   dataspace   = H5I_INVALID_HID;
+    hid_t   datatype    = H5I_INVALID_HID;
+    hid_t   dataset     = H5I_INVALID_HID;
     int datavalue;
     int buffer;
-    hid_t dataspace, datatype, dataset;
     hsize_t dimsf[1];	/* dataset dimensions */
     cancel_cleanup_t *cleanup_structure;
-    int ret;
+    herr_t status;
 
     /* define dataspace for dataset */
     dimsf[0] = 1;
     dataspace = H5Screate_simple(1, dimsf, NULL);
-    assert(dataspace >= 0);
+    CHECK(dataspace, H5I_INVALID_HID, "H5Screate_simple");
 
     /* define datatype for the data using native little endian integers */
     datatype = H5Tcopy(H5T_NATIVE_INT);
-    assert(datatype >= 0);
-    ret = H5Tset_order(datatype, H5T_ORDER_LE);
-    assert(ret >= 0);
+    CHECK(datatype, H5I_INVALID_HID, "H5Tcopy");
+    status = H5Tset_order(datatype, H5T_ORDER_LE);
+    CHECK(status, FAIL, "H5Tset_order");
 
     /* create a new dataset within the file */
     dataset = H5Dcreate2(cancel_file, DATASETNAME, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    assert(dataset >= 0);
+    CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2");
 
     /* If thread is cancelled, make cleanup call */
     cleanup_structure = (cancel_cleanup_t*)HDmalloc(sizeof(cancel_cleanup_t));
@@ -151,25 +144,26 @@ void *tts_cancel_thread(void H5_ATTR_UNUSED *arg)
 
 
     datavalue = 1;
-    ret=H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue);
-    assert(ret>=0);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue);
+    CHECK(status, FAIL, "H5Dwrite");
 
-    ret=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &buffer);
-    assert(ret>=0);
-    ret=H5Diterate(&buffer, H5T_NATIVE_INT, dataspace, tts_cancel_callback, &dataset);
-    assert(ret>=0);
+    status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &buffer);
+    CHECK(status, FAIL, "H5Dread");
+    status = H5Diterate(&buffer, H5T_NATIVE_INT, dataspace, tts_cancel_callback, &dataset);
+    CHECK(status, FAIL, "H5Diterate");
 
-    sleep(3);
+    HDsleep(3);
 
     datavalue = 100;
-    ret=H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue);
-    assert(ret>=0);
-    ret=H5Dclose(dataset);
-    assert(ret>=0);
-    ret=H5Tclose(datatype);
-    assert(ret>=0);
-    ret=H5Sclose(dataspace);
-    assert(ret>=0);
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue);
+    CHECK(status, FAIL, "H5Dwrite");
+
+    status = H5Dclose(dataset);
+    CHECK(status, FAIL, "H5Dclose");
+    status = H5Tclose(datatype);
+    CHECK(status, FAIL, "H5Tclose");
+    status = H5Sclose(dataspace);
+    CHECK(status, FAIL, "H5Sclose");
 
     /*
      * Required by pthreads. The argument 0 pops the stack but does not
@@ -178,73 +172,78 @@ void *tts_cancel_thread(void H5_ATTR_UNUSED *arg)
     pthread_cleanup_pop(0);
 
     return NULL;
-}
+} /* end tts_cancel_thread() */
 
-herr_t tts_cancel_callback(void *elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim,
+herr_t
+tts_cancel_callback(void *elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim,
 			   const hsize_t H5_ATTR_UNUSED *point, void *operator_data)
 {
-    int value = *(int *)elem;
     hid_t dataset = *(hid_t *)operator_data;
-    int ret;
+    int value = *(int *)elem;
+    herr_t status;
 
     tts_cancel_barrier();
-    sleep(3);
+    HDsleep(3);
 
     if (value != 1) {
         TestErrPrintf("Error! Element value should be 1 and not %d\n", value);
-        return -1;
+        return FAIL;
     }
 
     value += 10;
-    ret=H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
-    assert(ret>=0);
-    return 0;
-}
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
+    CHECK(status, FAIL, "H5Dwrite");
+
+    return SUCCEED;
+} /* end tts_cancel_callback() */
 
 /*
  * Need to perform the dataset, datatype and dataspace close that was never
  * performed because of thread cancellation
  */
-void cancellation_cleanup(void *arg)
+void
+cancellation_cleanup(void *arg)
 {
     cancel_cleanup_t *cleanup_structure = (cancel_cleanup_t *)arg;
-    int ret;
+    herr_t status;
 
-    ret=H5Dclose(cleanup_structure->dataset);
-    assert(ret>=0);
-    ret=H5Tclose(cleanup_structure->datatype);
-    assert(ret>=0);
-    ret=H5Sclose(cleanup_structure->dataspace);
-    assert(ret>=0);
+    status = H5Dclose(cleanup_structure->dataset);
+    CHECK(status, FAIL, "H5Dclose");
+    status = H5Tclose(cleanup_structure->datatype);
+    CHECK(status, FAIL, "H5Tclose");
+    status = H5Sclose(cleanup_structure->dataspace);
+    CHECK(status, FAIL, "H5Sclose");
 
     /* retained for debugging */
     /*  print_func("cancellation noted, cleaning up ... \n"); */
-}
+} /* end cancellation_cleanup() */
 
 /*
  * Artificial (and specific to this test) barrier to keep track of whether
  * both the main and child threads have reached a point in the program.
  */
-void tts_cancel_barrier(void)
+void
+tts_cancel_barrier(void)
 {
     static int count = 2;
-    int ret;
+    int status;
 
-    ret=pthread_mutex_lock(&mutex);
-    assert(ret==0);
+    status = pthread_mutex_lock(&mutex);
+    VERIFY(status, 0, "pthread_mutex_lock");
 
     if (count != 1) {
         count--;
-        ret=pthread_cond_wait(&cond, &mutex);
-        assert(ret==0);
-    } else {
-        ret=pthread_cond_signal(&cond);
-        assert(ret==0);
+        status = pthread_cond_wait(&cond, &mutex);
+        VERIFY(status, 0, "pthread_cond_wait");
+    }
+    else {
+        status = pthread_cond_signal(&cond);
+        VERIFY(status, 0, "pthread_cond_signal");
     }
 
-    ret=pthread_mutex_unlock(&mutex);
-    assert(ret==0);
-}
+    status = pthread_mutex_unlock(&mutex);
+    VERIFY(status, 0, "pthread_mutex_unlock");
+} /* end tts_cancel_barrier() */
 
 void cleanup_cancel(void)
 {
@@ -253,3 +252,4 @@ void cleanup_cancel(void)
 
 #endif /*H5_HAVE_WIN_THREADS*/
 #endif /*H5_HAVE_THREADSAFE*/
+
diff --git a/test/ttsafe_dcreate.c b/test/ttsafe_dcreate.c
index 65051c7..36b5f1f 100644
--- a/test/ttsafe_dcreate.c
+++ b/test/ttsafe_dcreate.c
@@ -23,20 +23,9 @@
  * Temporary files generated:
  *   ttsafe_dcreate.h5
  *
- * HDF5 APIs exercised in thread:
- * H5Screate_simple, H5Tcopy, H5Tset_order, H5Dcreate2, H5Dwrite, H5Dclose,
- * H5Tclose, H5Sclose.
- *
  * Created: Apr 28 2000
  * Programmer: Chee Wai LEE
  *
- * Modification History
- * --------------------
- *
- *	19 May 2000, Bill Wendling
- *	Changed so that it creates its own HDF5 file and removes it at cleanup
- *	time.
- *
  ********************************************************************/
 #include "ttsafe.h"
 
@@ -83,16 +72,18 @@ thread_info thread_out[NUM_THREAD];
  * Thread safe test - multiple dataset creation
  **********************************************************************
  */
-void tts_dcreate(void)
+void
+tts_dcreate(void)
 {
     /* thread definitions */
     H5TS_thread_t threads[NUM_THREAD];
 
     /* HDF5 data definitions */
-    hid_t file, dataset;
+    hid_t   file        = H5I_INVALID_HID;
+    hid_t   dataset     = H5I_INVALID_HID;
     int datavalue, i;
     H5TS_attr_t attribute;
-    int ret;
+    herr_t status;
 
     /* set pthread attribute to perform global scheduling */
     H5TS_attr_init(&attribute);
@@ -107,7 +98,7 @@ void tts_dcreate(void)
      * creation plist and default file access plist
      */
     file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    assert(file >= 0);
+    CHECK(file, H5I_INVALID_HID, "H5Fcreate");
 
     /* simultaneously create a large number of datasets within the file */
     for(i = 0; i < NUM_THREAD; i++) {
@@ -115,11 +106,10 @@ void tts_dcreate(void)
         thread_out[i].file = file;
         thread_out[i].dsetname = dsetname[i];
         threads[i] = H5TS_create_thread(tts_dcreate_creator, NULL, &thread_out[i]);
-    } /* end for */
+    }
 
-    for(i = 0;i < NUM_THREAD; i++) {
+    for(i = 0;i < NUM_THREAD; i++)
         H5TS_wait_for_thread(threads[i]);
-    } /* end for */
 
     /* compare data to see if it is written correctly */
 
@@ -129,36 +119,38 @@ void tts_dcreate(void)
             H5Fclose(file);
             return;
         } else {
-            ret = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue);
-            assert(ret >= 0);
+            status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue);
+            CHECK(status, FAIL, "H5Dread");
 
             if(datavalue != i) {
                 TestErrPrintf("Wrong value read %d for dataset name %s - test failed\n",
                             datavalue, dsetname[i]);
-                ret = H5Dclose(dataset);
-                assert(ret >= 0);
-                ret = H5Fclose(file);
-                assert(ret >= 0);
+                status = H5Dclose(dataset);
+                CHECK(status, FAIL, "H5Dclose");
+                status = H5Fclose(file);
+                CHECK(status, FAIL, "H5Fclose");
                 return;
             }
 
-            ret = H5Dclose(dataset);
-            assert(ret >= 0);
+            status= H5Dclose(dataset);
+            CHECK(status, FAIL, "H5Dclose");
         }
     }
 
     /* close remaining resources */
-    ret = H5Fclose(file);
-    assert(ret >= 0);
+    status = H5Fclose(file);
+    CHECK(status, FAIL, "H5Fclose");
 
     /* Destroy the thread attribute */
     H5TS_attr_destroy(&attribute);
-}
+} /* end tts_dcreate() */
 
-void *tts_dcreate_creator(void *_thread_data)
+void *
+tts_dcreate_creator(void *_thread_data)
 {
-    hid_t   dataspace, dataset;
-    herr_t  ret;
+    hid_t   dataspace   = H5I_INVALID_HID;
+    hid_t   dataset     = H5I_INVALID_HID;
+    herr_t  status;
     hsize_t dimsf[1]; /* dataset dimensions */
     struct thread_info thread_data;
 
@@ -167,28 +159,29 @@ void *tts_dcreate_creator(void *_thread_data)
     /* define dataspace for dataset */
     dimsf[0] = 1;
     dataspace = H5Screate_simple(1, dimsf, NULL);
-    assert(dataspace >= 0);
+    CHECK(dataspace, H5I_INVALID_HID, "H5Screate_simple");
 
     /* create a new dataset within the file */
     dataset = H5Dcreate2(thread_data.file, thread_data.dsetname,
                         H5T_NATIVE_INT, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    assert(dataset >= 0);
+    CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2");
 
     /* initialize data for dataset and write value to dataset */
-    ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
+    status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
              H5P_DEFAULT, &thread_data.id);
-    assert(ret >= 0);
+    CHECK(status, FAIL, "H5Dwrite");
 
     /* close dataset and dataspace resources */
-    ret = H5Dclose(dataset);
-    assert(ret >= 0);
-    ret = H5Sclose(dataspace);
-    assert(ret >= 0);
+    status = H5Dclose(dataset);
+    CHECK(status, FAIL, "H5Dclose");
+    status = H5Sclose(dataspace);
+    CHECK(status, FAIL, "H5Sclose");
 
     return NULL;
-}
+} /* end tts_dcreate_creator() */
 
-void cleanup_dcreate(void)
+void
+cleanup_dcreate(void)
 {
     HDunlink(FILENAME);
 }
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index 889d64b..4160d3a 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -25,21 +25,9 @@
  *
  *     ttsafe_error.h5
  *
- * HDF5 APIs exercised in thread:
- *
- *     H5Screate_simple, H5Tcopy, H5Tset_order, H5Dcreate2, H5Dclose,
- *     H5Tclose, H5Sclose.
- *
  * Created: Apr 28 2000
  * Programmer: Chee Wai LEE
  *
- * Modification History
- * --------------------
- *
- * 	19 May 2000, Bill Wendling
- * 	Modified so that it creates a unique HDF5 file and removes it on
- * 	cleanup.
- *
  ********************************************************************/
 #include "ttsafe.h"
 
@@ -49,181 +37,191 @@
 #define FILENAME                "ttsafe_error.h5"
 
 /* Having a common dataset name is an error */
-#define DATASETNAME		"commonname"
-#define EXPECTED_ERROR_DEPTH	8
-#define WRITE_NUMBER		37
-
-static herr_t error_callback(hid_t , void *);
-static herr_t walk_error_callback(unsigned, const H5E_error2_t *, void *);
-static void *tts_error_thread(void *);
-
-/* Global variables */
-hid_t error_file;
+#define DATASETNAME             "commonname"
+#define EXPECTED_ERROR_DEPTH	7
+#define WRITE_NUMBER            37
 
+/* Typedefs */
 typedef struct err_num_struct {
     hid_t maj_num;
     hid_t min_num;
 } err_num_t;
 
-err_num_t expected[8];
+/* Global variables */
+hid_t               error_file_g    = H5I_INVALID_HID;
+int                 error_flag_g    = 0;
+int                 error_count_g   = 0;
+err_num_t           expected_g[EXPECTED_ERROR_DEPTH];
+H5TS_mutex_simple_t error_mutex_g;
+
+/* Prototypes */
+static herr_t error_callback(hid_t , void *);
+static herr_t walk_error_callback(unsigned, const H5E_error2_t *, void *);
+static void *tts_error_thread(void *);
 
-int error_flag = 0;
-int error_count = 0;
-H5TS_mutex_simple_t error_mutex;
 
-void tts_error(void)
+void
+tts_error(void)
 {
-    H5TS_thread_t threads[NUM_THREAD];
-    H5TS_attr_t attribute;
-    hid_t dataset;
-    int value, i;
-    int ret;
+    hid_t           dataset = H5I_INVALID_HID;
+    H5TS_thread_t   threads[NUM_THREAD];
+    H5TS_attr_t     attribute;
+    int             value, i;
+    herr_t          status;
 
     /* Must initialize these at runtime */
-    expected[0].maj_num = H5E_DATASET;
-    expected[0].min_num = H5E_CANTINIT;
+    expected_g[0].maj_num = H5E_DATASET;
+    expected_g[0].min_num = H5E_CANTINIT;
 
-    expected[1].maj_num = H5E_DATASET;
-    expected[1].min_num = H5E_CANTINIT;
+    expected_g[1].maj_num = H5E_DATASET;
+    expected_g[1].min_num = H5E_CANTINIT;
 
-    expected[2].maj_num = H5E_LINK;
-    expected[2].min_num = H5E_CANTINIT;
+    expected_g[2].maj_num = H5E_LINK;
+    expected_g[2].min_num = H5E_CANTINIT;
 
-    expected[3].maj_num = H5E_SYM;
-    expected[3].min_num = H5E_CANTINSERT;
+    expected_g[3].maj_num = H5E_LINK;
+    expected_g[3].min_num = H5E_CANTINSERT;
 
-    expected[4].maj_num = H5E_SYM;
-    expected[4].min_num = H5E_NOTFOUND;
+    expected_g[4].maj_num = H5E_SYM;
+    expected_g[4].min_num = H5E_NOTFOUND;
 
-    expected[5].maj_num = H5E_SYM;
-    expected[5].min_num = H5E_CALLBACK;
+    expected_g[5].maj_num = H5E_SYM;
+    expected_g[5].min_num = H5E_CALLBACK;
 
-    expected[6].maj_num = H5E_SYM;
-    expected[6].min_num = H5E_EXISTS;
+    expected_g[6].maj_num = H5E_LINK;
+    expected_g[6].min_num = H5E_EXISTS;
 
     /* set up mutex for global count of errors */
-    H5TS_mutex_init(&error_mutex);
+    H5TS_mutex_init(&error_mutex_g);
 
     /* make thread scheduling global */
     H5TS_attr_init(&attribute);
 
-    /* set thread scope to system */
-
 #ifdef H5_HAVE_SYSTEM_SCOPE_THREADS
+    /* set thread scope to system */
     H5TS_attr_setscope(&attribute, H5TS_SCOPE_SYSTEM);
 #endif /* H5_HAVE_SYSTEM_SCOPE_THREADS */
 
-    /*
-     * Create a hdf5 file using H5F_ACC_TRUNC access, default file
+    /* Create a hdf5 file using H5F_ACC_TRUNC access, default file
      * creation plist and default file access plist
      */
-    error_file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    assert(error_file>=0);
+    error_file_g = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(error_file_g, H5I_INVALID_HID, "H5Fcreate");
 
-    for (i = 0; i < NUM_THREAD; i++){
+    for (i = 0; i < NUM_THREAD; i++)
         threads[i] = H5TS_create_thread(tts_error_thread, &attribute, NULL);
-    }
 
-    for (i = 0; i < NUM_THREAD; i++){
+    for (i = 0; i < NUM_THREAD; i++)
         H5TS_wait_for_thread(threads[i]);
-    }
 
-    if (error_flag)
-        TestErrPrintf("Threads reporting different error values!\n");
+    if (error_flag_g) {
+        TestErrPrintf("At least one thread reported a value that was different from the exected value\n");
+        HDprintf("(Update this test if the error stack changed!)\n");
+    }
 
-    if (error_count != NUM_THREAD - 1)
-        TestErrPrintf("Error: %d threads failed instead of %d\n", error_count, NUM_THREAD-1);
+    if (error_count_g != NUM_THREAD - 1)
+        TestErrPrintf("Error: %d threads failed instead of %d\n", error_count_g, NUM_THREAD-1);
 
-    dataset = H5Dopen2(error_file, DATASETNAME, H5P_DEFAULT);
-    assert(dataset >= 0);
+    dataset = H5Dopen2(error_file_g, DATASETNAME, H5P_DEFAULT);
+    CHECK(dataset, H5I_INVALID_HID, "H5Dopen2");
 
-    ret=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
-    assert(ret>=0);
+    status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
+    CHECK(status, FAIL, "H5Dread");
 
     if (value != WRITE_NUMBER)
         TestErrPrintf("Error: Successful thread wrote value %d instead of %d\n", value, WRITE_NUMBER);
 
-    ret=H5Dclose(dataset);
-    assert(ret>=0);
-    ret=H5Fclose(error_file);
-    assert(ret>=0);
+    status = H5Dclose(dataset);
+    CHECK(status, FAIL, "H5Dclose");
+    status = H5Fclose(error_file_g);
+    CHECK(status, FAIL, "H5Fclose");
 
     H5TS_attr_destroy(&attribute);
-}
+} /* end tts_error() */
 
-static
-void *tts_error_thread(void H5_ATTR_UNUSED *arg)
+static void *
+tts_error_thread(void H5_ATTR_UNUSED *arg)
 {
-    hid_t dataspace, datatype, dataset;
+    hid_t   dataspace   = H5I_INVALID_HID;
+    hid_t   datatype    = H5I_INVALID_HID;
+    hid_t   dataset     = H5I_INVALID_HID;
     hsize_t dimsf[1]; /* dataset dimensions */
     H5E_auto2_t old_error_cb;
     void *old_error_client_data;
     int value;
-    int ret;
+    herr_t status;
 
     /* preserve previous error stack handler */
-    H5Eget_auto2(H5E_DEFAULT, &old_error_cb, &old_error_client_data);
+    status = H5Eget_auto2(H5E_DEFAULT, &old_error_cb, &old_error_client_data);
+    CHECK(status, FAIL, "H5Eget_auto2");
 
     /* set each thread's error stack handler */
-    H5Eset_auto2(H5E_DEFAULT, error_callback, NULL);
+    status = H5Eset_auto2(H5E_DEFAULT, error_callback, NULL);
+    CHECK(status, FAIL, "H5Eset_auto2");
 
     /* define dataspace for dataset */
     dimsf[0] = 1;
     dataspace = H5Screate_simple(1, dimsf, NULL);
-    assert(dataspace >= 0);
+    CHECK(dataspace, H5I_INVALID_HID, "H5Screate_simple");
 
     /* define datatype for the data using native little endian integers */
     datatype = H5Tcopy(H5T_NATIVE_INT);
-    assert(datatype >= 0);
-    H5Tset_order(datatype, H5T_ORDER_LE);
+    CHECK(datatype, H5I_INVALID_HID, "H5Tcopy");
+    status = H5Tset_order(datatype, H5T_ORDER_LE);
+    CHECK(status, FAIL, "H5Tset_order");
 
     /* create a new dataset within the file */
-    dataset = H5Dcreate2(error_file, DATASETNAME, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if(dataset >= 0) {   /* not an error */
+    dataset = H5Dcreate2(error_file_g, DATASETNAME, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* Most of these will fail, so don't check the error here */
+    if (dataset >= 0) {
         value = WRITE_NUMBER;
-        H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
-        H5Dclose(dataset);
-    } /* end if */
+        status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
+        CHECK(status, FAIL, "H5Dwrite");
+        status = H5Dclose(dataset);
+        CHECK(status, FAIL, "H5Dclose");
+    }
 
-    ret = H5Tclose(datatype);
-    assert(ret >= 0);
-    ret = H5Sclose(dataspace);
-    assert(ret >= 0);
+    status = H5Tclose(datatype);
+    CHECK(status, FAIL, "H5Tclose");
+    status = H5Sclose(dataspace);
+    CHECK(status, FAIL, "H5Sclose");
 
     /* turn our error stack handler off */
-    H5Eset_auto2(H5E_DEFAULT, old_error_cb, old_error_client_data);
+    status = H5Eset_auto2(H5E_DEFAULT, old_error_cb, old_error_client_data);
+    CHECK(status, FAIL, "H5Eset_auto2");
 
     return NULL;
-}
+} /* end tts_error_thread() */
 
-static
-herr_t error_callback(hid_t H5_ATTR_UNUSED estack_id, void *client_data)
+static herr_t
+error_callback(hid_t H5_ATTR_UNUSED estack_id, void *client_data)
 {
-    H5TS_mutex_lock_simple(&error_mutex);
-    error_count++;
-    H5TS_mutex_unlock_simple(&error_mutex);
+    H5TS_mutex_lock_simple(&error_mutex_g);
+    error_count_g++;
+    H5TS_mutex_unlock_simple(&error_mutex_g);
     return H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, client_data);
 }
 
-static
-herr_t walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void H5_ATTR_UNUSED *client_data)
+static herr_t
+walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void H5_ATTR_UNUSED *client_data)
 {
-    hid_t maj_num, min_num;
+    hid_t   maj_num = H5I_INVALID_HID;
+    hid_t   min_num = H5I_INVALID_HID;
 
     if (err_desc) {
         maj_num = err_desc->maj_num;
         min_num = err_desc->min_num;
 
-        if (n < EXPECTED_ERROR_DEPTH && maj_num == expected[n].maj_num &&
-                min_num == expected[n].min_num)
+        if (n <= EXPECTED_ERROR_DEPTH && maj_num == expected_g[n].maj_num && min_num == expected_g[n].min_num)
             return SUCCEED;
     }
 
-    error_flag = -1;
+    error_flag_g = -1;
     return SUCCEED;
 }
 
-void cleanup_error(void)
+void
+cleanup_error(void)
 {
     HDunlink(FILENAME);
 }
diff --git a/test/ttst.c b/test/ttst.c
index c424d76..c5912c5 100644
--- a/test/ttst.c
+++ b/test/ttst.c
@@ -31,9 +31,6 @@
        12/9/02 - Started coding
  */
 
-#include <time.h>
-#include <stdlib.h>
-
 #include "testhdf5.h"
 #include "H5STprivate.h"
 
@@ -93,13 +90,13 @@ test_tst_init(void)
     } /* end for */
 
     /* Allocate space for the array of unique words */
-    uniq_words=HDmalloc(sizeof(char *)*num_uniq_words);
+    uniq_words = (char **)HDmalloc(sizeof(char *)*num_uniq_words);
 
     /* Allocate space for the array of randomized order unique words also */
-    rand_uniq_words=HDmalloc(sizeof(char *)*num_uniq_words);
+    rand_uniq_words = (char **)HDmalloc(sizeof(char *)*num_uniq_words);
 
     /* Allocate space for the array of sorted order unique words also */
-    sort_uniq_words=HDmalloc(sizeof(char *)*num_uniq_words);
+    sort_uniq_words = (char **)HDmalloc(sizeof(char *)*num_uniq_words);
 
     /* Insert unique words from test set into unique word set */
     w=0;
@@ -124,7 +121,7 @@ test_tst_init(void)
     curr_time=HDtime(NULL);
     HDsrandom((unsigned)curr_time);
     for(u=0; u<num_uniq_words; u++) {
-        v=u+(HDrandom()%(num_uniq_words-u));
+        v = u + ((size_t)HDrandom() % (num_uniq_words - u));
         if(u!=v) {
             tmp_word=rand_uniq_words[u];
             rand_uniq_words[u]=rand_uniq_words[v];
@@ -160,7 +157,7 @@ test_tst_create(void)
 
     /* Try creating a TST */
     tree=H5ST_create();
-    CHECK(tree, NULL, "H5ST_create");
+    CHECK_PTR(tree, "H5ST_create");
 
     /* Try closing a real tree */
     ret=H5ST_close(tree);
@@ -189,7 +186,7 @@ test_tst_insert(void)
 
     /* Create the TST */
     tree=H5ST_create();
-    CHECK(tree, NULL, "H5ST_create");
+    CHECK_PTR(tree, "H5ST_create");
 
     /* Insert unique words into TST, in random order */
     for(u=0; u<num_uniq_words; u++) {
@@ -205,13 +202,13 @@ test_tst_insert(void)
 
         /* Check that the value "payloads" are correct */
         found=H5ST_find(tree,uniq_words[u]);
-        CHECK(found, NULL, "H5ST_find");
+        CHECK_PTR(found, "H5ST_find");
 
         if(HDstrcmp((const char *)found->eqkid,uniq_words[u]))
             TestErrPrintf("%d: TST node values don't match!, found->eqkid=%s, uniq_words[%u]=%s\n",__LINE__,(char *)found->eqkid,(unsigned)u,uniq_words[u]);
 
         obj=H5ST_locate(tree,uniq_words[u]);
-        CHECK(obj, NULL, "H5ST_locate");
+        CHECK_PTR(obj, "H5ST_locate");
 
         if(HDstrcmp((const char *)obj,uniq_words[u]))
             TestErrPrintf("%d: TST objects don't match!, obj=%s, uniq_words[%u]=%s\n",__LINE__,(char *)obj,(unsigned)u,uniq_words[u]);
@@ -249,7 +246,7 @@ test_tst_iterate(void)
 
     /* Create the TST */
     tree=H5ST_create();
-    CHECK(tree, NULL, "H5ST_create");
+    CHECK_PTR(tree, "H5ST_create");
 
     /* Insert unique words into TST, in random order */
     for(u=0; u<num_uniq_words; u++) {
@@ -259,7 +256,7 @@ test_tst_iterate(void)
 
     /* Use findfirst/findnext calls to iterate through TST */
     found=H5ST_findfirst(tree);
-    CHECK(found, NULL, "H5ST_findfirst");
+    CHECK_PTR(found, "H5ST_findfirst");
     u=0;
     do {
         /* Check that the strings in the TST are in the correct order */
@@ -297,7 +294,7 @@ test_tst_remove(void)
 
     /* Create the TST */
     tree=H5ST_create();
-    CHECK(tree, NULL, "H5ST_create");
+    CHECK_PTR(tree, "H5ST_create");
 
     /* Insert unique words into TST, in random order */
     for(u=0; u<num_uniq_words; u++) {
@@ -308,7 +305,7 @@ test_tst_remove(void)
     /* Remove strings from TST in random order */
     for(u=0; u<num_uniq_words; u++) {
         obj=H5ST_remove(tree,rand_uniq_words[u]);
-        CHECK(obj, NULL, "H5ST_remove");
+        CHECK_PTR(obj, "H5ST_remove");
 
         /* Check that the correct string was removed from TST */
         if(HDstrcmp((const char *)obj,rand_uniq_words[u]))
@@ -329,7 +326,7 @@ test_tst_remove(void)
     for(u=0; u<num_uniq_words; u++) {
         /* Get the pointer to the node to delete */
         found=H5ST_find(tree,rand_uniq_words[u]);
-        CHECK(found, NULL, "H5ST_find");
+        CHECK_PTR(found, "H5ST_find");
 
         /* Check that the correct object will be removed from TST */
         if(HDstrcmp((const char *)found->eqkid,rand_uniq_words[u]))
diff --git a/test/tunicode.c b/test/tunicode.c
index 566c21c..a089870 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -12,10 +12,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* Unicode test */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include "testhdf5.h"
 
 #define NUM_CHARS 16
@@ -167,8 +163,8 @@ void test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string)
 
     /* Fill the buffer with two copies of the UTF-8 string, each with a
      * terminating NULL.  It will look like "abcdefg\0abcdefg\0". */
-    strncpy(buf, new_string, big_len);
-    strncpy(&buf[big_len], new_string, big_len);
+    HDstrncpy(buf, new_string, big_len);
+    HDstrncpy(&buf[big_len], new_string, big_len);
 
     ret = H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Tconvert");
@@ -230,8 +226,8 @@ void test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string)
 
     /* Fill the buffer with two copies of the UTF-8 string.
      * It will look like "abcdefghabcdefgh". */
-    strncpy(buf, new_string, big_len);
-    strncpy(&buf[big_len], new_string, big_len);
+    HDstrncpy(buf, new_string, big_len);
+    HDstrncpy(&buf[big_len], new_string, big_len);
 
     ret = H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Tconvert");
@@ -386,6 +382,7 @@ void test_objnames(hid_t fid, const char* string)
   char path_buf[MAX_PATH_LENGTH];
   hsize_t dims=1;
   hobj_ref_t obj_ref;
+  ssize_t size;
   herr_t ret;
 
   /* Create a group with a UTF-8 name */
@@ -397,8 +394,8 @@ void test_objnames(hid_t fid, const char* string)
    */
   ret = H5Oset_comment_by_name(fid, string, string, H5P_DEFAULT);
   CHECK(ret, FAIL, "H5Oset_comment_by_name");
-  ret = H5Oget_comment_by_name(fid, string, read_buf, (size_t)MAX_STRING_LENGTH, H5P_DEFAULT);
-  CHECK(ret, FAIL, "H5Oget_comment_by_name");
+  size = H5Oget_comment_by_name(fid, string, read_buf, (size_t)MAX_STRING_LENGTH, H5P_DEFAULT);
+  CHECK(size, FAIL, "H5Oget_comment_by_name");
 
   ret = H5Gclose(grp_id);
   CHECK(ret, FAIL, "H5Gclose");
@@ -512,6 +509,7 @@ void test_attrname(hid_t fid, const char * string)
   hid_t dtype_id, space_id;
   hsize_t dims=1;
   char read_buf[MAX_STRING_LENGTH];
+  ssize_t size;
   herr_t ret;
 
  /* Create a new group and give it an attribute whose
@@ -530,8 +528,8 @@ void test_attrname(hid_t fid, const char * string)
   /* Create the attribute and check that its name is correct */
   attr_id = H5Acreate2(group_id, string, dtype_id, space_id, H5P_DEFAULT, H5P_DEFAULT);
   CHECK(attr_id, FAIL, "H5Acreate2");
-  ret = H5Aget_name(attr_id, (size_t)MAX_STRING_LENGTH, read_buf);
-  CHECK(ret, FAIL, "H5Aget_name");
+  size = H5Aget_name(attr_id, (size_t)MAX_STRING_LENGTH, read_buf);
+  CHECK(size, FAIL, "H5Aget_name");
   ret = strcmp(read_buf, string);
   VERIFY(ret, 0, "strcmp");
   read_buf[0] = '\0';
@@ -742,25 +740,25 @@ static hid_t mkstr(size_t len, H5T_str_t strpad)
 unsigned int write_char(unsigned int c, char * test_string, unsigned int cur_pos)
 {
   if (c < 0x80) {
-    test_string[cur_pos] = c;
+    test_string[cur_pos] = (char)c;
     cur_pos++;
   }
   else if (c < 0x800) {
-    test_string[cur_pos] = (0xC0 | c>>6);
-    test_string[cur_pos+1] = (0x80 | (c & 0x3F));
+    test_string[cur_pos] = (char)(0xC0 | c >> 6);
+    test_string[cur_pos + 1] = (char)(0x80 | (c & 0x3F));
     cur_pos += 2;
   }
   else if (c < 0x10000) {
-    test_string[cur_pos] = (0xE0 | c>>12);
-    test_string[cur_pos+1] = (0x80 | (c>>6 & 0x3F));
-    test_string[cur_pos+2] = (0x80 | (c & 0x3F));
+    test_string[cur_pos] = (char)(0xE0 | c >> 12);
+    test_string[cur_pos + 1] = (char)(0x80 | (c >> 6 & 0x3F));
+    test_string[cur_pos + 2] = (char)(0x80 | (c & 0x3F));
     cur_pos += 3;
   }
   else if (c < 0x200000) {
-    test_string[cur_pos] = (0xF0 | c>>18);
-    test_string[cur_pos+1] = (0x80 | (c>>12 & 0x3F));
-    test_string[cur_pos+2] = (0x80 | (c>>6 & 0x3F));
-    test_string[cur_pos+3] = (0x80 | (c & 0x3F));
+    test_string[cur_pos] = (char)(0xF0 | c >> 18);
+    test_string[cur_pos + 1] = (char)(0x80 | (c >> 12 & 0x3F));
+    test_string[cur_pos + 2] = (char)(0x80 | (c >> 6 & 0x3F));
+    test_string[cur_pos + 3] = (char)(0x80 | (c & 0x3F));
     cur_pos += 4;
   }
 
@@ -773,18 +771,18 @@ unsigned int write_char(unsigned int c, char * test_string, unsigned int cur_pos
  * could confuse printf (e.g., '\n'). */
 void dump_string(const char * string)
 {
-  unsigned int length;
-  unsigned int x;
+  size_t length;
+  size_t x;
 
-  printf("The string was:\n %s", string);
-  printf("Or in hex:\n");
+  HDprintf("The string was:\n %s", string);
+  HDprintf("Or in hex:\n");
 
-  length = strlen(string);
+  length = HDstrlen(string);
 
   for(x=0; x<length; x++)
-    printf("%x ", string[x] & (0x000000FF));
+    HDprintf("%x ", string[x] & (0x000000FF));
 
-  printf("\n");
+  HDprintf("\n");
 }
 
 /* Main test.
@@ -812,7 +810,7 @@ void test_unicode(void)
     /* We need to avoid unprintable characters (codes 0-31) and the
      * . and / characters, since they aren't allowed in path names.
      */
-    unicode_point = (HDrandom() % (MAX_CODE_POINT-32)) + 32;
+    unicode_point = (unsigned)(HDrandom() % (MAX_CODE_POINT-32)) + 32;
     if(unicode_point != 46 && unicode_point != 47)
       cur_pos = write_char(unicode_point, test_string, cur_pos);
   }
@@ -856,7 +854,7 @@ void test_unicode(void)
  */
 void cleanup_unicode(void)
 {
-    remove(FILENAME);
+    HDremove(FILENAME);
 }
 
 
diff --git a/test/tvlstr.c b/test/tvlstr.c
index e5b2a60..f401406 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -13,7 +13,7 @@
 
 /***********************************************************
 *
-* Test program:	 tvlstr
+* Test program:     tvlstr
 *
 * Test the Variable-Length String functionality
 *
@@ -21,16 +21,14 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
-
 #define DATAFILE   "tvlstr.h5"
 #define DATAFILE2  "tvlstr2.h5"
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_RANK	1
-#define SPACE1_DIM1	4
+#define SPACE1_RANK    1
+#define SPACE1_DIM1    4
 
-#define VLSTR_TYPE      "vl_string_type"
+#define VLSTR_TYPE  "vl_string_type"
 
 /* Definitions for the VL re-writing test */
 #define REWRITE_NDATASETS       32
@@ -92,7 +90,7 @@ void test_vlstr_free_custom(void *_mem, void *info)
 
     if(_mem!=NULL) {
         mem=((unsigned char *)_mem)-extra;
-        *mem_used-=*(size_t *)mem;
+        *mem_used-=*(size_t *)((void *)mem);
         HDfree(mem);
     } /* end if */
 }
@@ -115,17 +113,17 @@ test_vlstrings_basic(void)
     char *rdata[SPACE1_DIM1];   /* Information read in */
     char *wdata2;
     hid_t dataspace, dataset2;
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1;       /* Datatype ID			*/
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1;       /* Datatype ID            */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hsize_t        dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i;          /* counting variable */
     size_t         str_used;   /* String data in memory */
     size_t         mem_used=0; /* Memory used during allocation */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Basic VL String Functionality\n"));
@@ -181,7 +179,7 @@ test_vlstrings_basic(void)
 
     /* Count the actual number of bytes used by the strings */
     for(i=0,str_used=0; i<SPACE1_DIM1; i++)
-        str_used+=HDstrlen(wdata[i])+1;
+        str_used += HDstrlen(wdata[i])+1;
 
     /* Compare against the strings actually written */
     VERIFY(size,(hsize_t)str_used,"H5Dvlen_get_buf_size");
@@ -196,7 +194,7 @@ test_vlstrings_basic(void)
     /* Compare data read in */
     for(i = 0; i < SPACE1_DIM1; i++) {
         if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
-            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
+            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)HDstrlen(rdata[i]));
             continue;
         } /* end if */
         if(HDstrcmp(wdata[i], rdata[i]) != 0 ) {
@@ -247,14 +245,14 @@ test_vlstrings_special(void)
     const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL};
     char *rdata[SPACE1_DIM1];   /* Information read in */
     char *fill;                 /* Fill value */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1;       /* Datatype ID			*/
-    hid_t		dcpl;       /* Dataset creation property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1;       /* Datatype ID            */
+    hid_t        dcpl;       /* Dataset creation property list ID */
+    hsize_t        dims1[] = {SPACE1_DIM1};
     unsigned       i;          /* counting variable */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Special VL Strings\n"));
@@ -298,7 +296,7 @@ test_vlstrings_special(void)
     /* Compare data read in */
     for(i = 0; i < SPACE1_DIM1; i++) {
         if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
-            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
+            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)HDstrlen(rdata[i]));
             continue;
         } /* end if */
         if((wdata[i] == NULL && rdata[i] != NULL) || (rdata[i] == NULL && wdata[i] != NULL)) {
@@ -477,14 +475,14 @@ test_compact_vlstring(void)
 {
     const char *wdata[SPACE1_DIM1] = {"one", "two", "three", "four"};
     char *rdata[SPACE1_DIM1];   /* Information read in */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1;       /* Datatype ID			*/
-    hid_t		plist;      /* Dataset creation property list	*/
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1;       /* Datatype ID            */
+    hid_t        plist;      /* Dataset creation property list    */
+    hsize_t        dims1[] = {SPACE1_DIM1};
     unsigned       i;          /* counting variable */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing VL Strings in compact dataset\n"));
@@ -525,7 +523,7 @@ test_compact_vlstring(void)
     /* Compare data read in */
     for(i = 0; i < SPACE1_DIM1; i++) {
         if(HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
-            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)strlen(rdata[i]));
+            TestErrPrintf("VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n",(int)i,(int)strlen(wdata[i]),(int)i,(int)HDstrlen(rdata[i]));
             continue;
         } /* end if */
         if(HDstrcmp(wdata[i], rdata[i]) != 0) {
@@ -760,7 +758,8 @@ static void read_scalar_dset(hid_t file, hid_t type, hid_t space, char *name, ch
     if(HDstrcmp(data, data_read))
         TestErrPrintf("Expected %s for dataset %s but read %s\n", data, name, data_read);
 
-    HDfree(data_read);
+    ret = H5Dvlen_reclaim(type, space, H5P_DEFAULT, &data_read);
+    CHECK(ret, FAIL, "H5Dvlen_reclaim");
 }
 
 /****************************************************************
@@ -799,33 +798,33 @@ static void test_vl_rewrite(void)
 
     /* Create in file 1 */
     for(i=0; i<REWRITE_NDATASETS; i++) {
-        sprintf(name, "/set_%d", i);
+        HDsprintf(name, "/set_%d", i);
         write_scalar_dset(file1, type, space, name, name);
     }
 
     /* Effectively copy data from file 1 to 2 */
     for(i=0; i<REWRITE_NDATASETS; i++) {
-        sprintf(name, "/set_%d", i);
+        HDsprintf(name, "/set_%d", i);
         read_scalar_dset(file1, type, space, name, name);
         write_scalar_dset(file2, type, space, name, name);
     }
 
     /* Read back from file 2 */
     for(i = 0; i < REWRITE_NDATASETS; i++) {
-        sprintf(name, "/set_%d", i);
+        HDsprintf(name, "/set_%d", i);
         read_scalar_dset(file2, type, space, name, name);
     } /* end for */
 
     /* Remove from file 2. */
     for(i = 0; i < REWRITE_NDATASETS; i++) {
-        sprintf(name, "/set_%d", i);
+        HDsprintf(name, "/set_%d", i);
         ret = H5Ldelete(file2, name, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Ldelete");
     } /* end for */
 
     /* Effectively copy from file 1 to file 2 */
     for(i = 0; i < REWRITE_NDATASETS; i++) {
-        sprintf(name, "/set_%d", i);
+        HDsprintf(name, "/set_%d", i);
         read_scalar_dset(file1, type, space, name, name);
         write_scalar_dset(file2, type, space, name, name);
     } /* end for */
@@ -872,15 +871,14 @@ test_vlstrings(void)
     test_vl_rewrite();
 }   /* test_vlstrings() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	cleanup_vlstrings
+ * Function:    cleanup_vlstrings
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              September 10, 1999
  *
  * Modifications:
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 2147ac7..60720a0 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -13,7 +13,7 @@
 
 /***********************************************************
 *
-* Test program:	 tvltypes
+* Test program:     tvltypes
 *
 * Test the Variable-Length Datatype functionality
 *
@@ -21,24 +21,23 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
 #include "H5Dprivate.h"
 
 #define FILENAME   "tvltypes.h5"
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_RANK	1
+#define SPACE1_RANK    1
 #define SPACE1_DIM1     4
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE3_RANK	1
+#define SPACE3_RANK    1
 #define SPACE3_DIM1     128
 #define L1_INCM         16
 #define L2_INCM         8
 #define L3_INCM         3
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE4_RANK	1
+#define SPACE4_RANK    1
 #define SPACE4_DIM_SMALL     128
 #define SPACE4_DIM_LARGE     (H5D_TEMP_BUF_SIZE / 64)
 
@@ -89,7 +88,7 @@ void test_vltypes_free_custom(void *_mem, void *mem_used)
                                                                  */
         unsigned char *mem = ((unsigned char *)_mem) - extra;   /* Pointer to actual block allocated */
 
-        *(size_t *)mem_used -= *(size_t *)mem;
+        *(size_t *)mem_used -= *(size_t *)((void *)mem);
         HDfree(mem);
     } /* end if */
 }
@@ -104,7 +103,7 @@ static void
 test_vltypes_dataset_create(void)
 {
     hid_t               fid1;           /* HDF5 File IDs                */
-    hid_t		dcpl;		/* Dataset Property list	*/
+    hid_t        dcpl;        /* Dataset Property list    */
     hid_t               dataset;        /* Dataset ID                   */
     hsize_t             dims1[] = {SPACE1_DIM1};
     hid_t               sid1;       /* Dataspace ID                     */
@@ -136,7 +135,7 @@ test_vltypes_dataset_create(void)
 
     /* Create a dataset, supposed to fail */
     H5E_BEGIN_TRY {
-    	dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+        dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT);
     } H5E_END_TRY;
     VERIFY(dataset, FAIL, "H5Dcreate2");
 
@@ -167,7 +166,7 @@ static void
 test_vltypes_funcs(void)
 {
     hid_t               type;       /* Datatype ID          */
-    int                 size;
+    size_t              size;
     H5T_pad_t           inpad;
     H5T_norm_t          norm;
     H5T_cset_t          cset;
@@ -181,16 +180,16 @@ test_vltypes_funcs(void)
     type = H5Tvlen_create (H5T_IEEE_F32BE);
     CHECK(type, FAIL, "H5Tvlen_create");
 
-    size=H5Tget_precision(type);
-    CHECK(size, FAIL, "H5Tget_precision");
+    size = H5Tget_precision(type);
+    CHECK(size, 0, "H5Tget_precision");
 
-    size=H5Tget_size(type);
-    CHECK(size, FAIL, "H5Tget_size");
+    size = H5Tget_size(type);
+    CHECK(size, 0, "H5Tget_size");
 
-    size=H5Tget_ebias(type);
-    CHECK(size, FAIL, "H5Tget_ebias");
+    size = H5Tget_ebias(type);
+    CHECK(size, 0, "H5Tget_ebias");
 
-    ret=H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE);
+    ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE);
     CHECK(ret, FAIL, "H5Tset_pad");
 
     inpad = H5Tget_inpad(type);
@@ -230,18 +229,18 @@ test_vltypes_vlen_atomic(void)
     hvl_t wdata2[SPACE1_DIM1];  /* Information to write */
     hvl_t rdata[SPACE1_DIM1];   /* Information read in */
     hvl_t fill;                 /* Fill value */
-    hid_t fid1;		/* HDF5 File IDs		*/
-    hid_t dataset;	/* Dataset ID			*/
-    hid_t sid1;         /* Dataspace ID			*/
+    hid_t fid1;        /* HDF5 File IDs        */
+    hid_t dataset;    /* Dataset ID            */
+    hid_t sid1;         /* Dataspace ID            */
     hid_t sid2;         /* ID of bad dataspace (no extent set) */
-    hid_t tid1;         /* Datatype ID			*/
+    hid_t tid1;         /* Datatype ID            */
     hid_t dcpl_pid;     /* Dataset creation property list ID */
     hid_t xfer_pid;     /* Dataset transfer property list ID */
     hsize_t dims1[] = {SPACE1_DIM1};
     hsize_t size;       /* Number of bytes which will be used */
     unsigned i,j;       /* counting variables */
     size_t mem_used=0;  /* Memory used during allocation */
-    herr_t ret;		/* Generic return value		*/
+    herr_t ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Basic Atomic VL Datatype Functionality\n"));
@@ -468,7 +467,7 @@ test_vltypes_vlen_atomic(void)
 
     /* Try to call H5Dvlen_get_buf with bad dataspace */
     H5E_BEGIN_TRY {
-    ret = H5Dvlen_get_buf_size(dataset, tid1, sid2, &size);
+        ret = H5Dvlen_get_buf_size(dataset, tid1, sid2, &size);
     } H5E_END_TRY
     VERIFY(ret, FAIL, "H5Dvlen_get_buf_size");
 
@@ -500,7 +499,7 @@ test_vltypes_vlen_atomic(void)
     /* Try to reclaim read data using "bad" dataspace with no extent
      * Should fail */
     H5E_BEGIN_TRY {
-    ret=H5Dvlen_reclaim(tid1,sid2,xfer_pid,rdata);
+        ret=H5Dvlen_reclaim(tid1,sid2,xfer_pid,rdata);
     } H5E_END_TRY
     VERIFY(ret, FAIL, "H5Dvlen_reclaim");
 
@@ -556,7 +555,7 @@ rewrite_vltypes_vlen_atomic(void)
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    int			increment=4;
+    unsigned    increment=4;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -709,16 +708,16 @@ test_vltypes_vlen_compound(void)
     } s1;
     hvl_t wdata[SPACE1_DIM1];   /* Information to write */
     hvl_t rdata[SPACE1_DIM1];   /* Information read in */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1, tid2; /* Datatype IDs         */
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1, tid2; /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hsize_t        dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Basic Compound VL Datatype Functionality\n"));
@@ -728,8 +727,8 @@ test_vltypes_vlen_compound(void)
         wdata[i].p=HDmalloc((i+1)*sizeof(s1));
         wdata[i].len=i+1;
         for(j=0; j<(i+1); j++) {
-            ((s1 *)wdata[i].p)[j].i=i*10+j;
-            ((s1 *)wdata[i].p)[j].f=(float)((i*20+j)/3.0F);
+            ((s1 *)wdata[i].p)[j].i = (int)(i * 10 + j);
+            ((s1 *)wdata[i].p)[j].f = (float)(i * 20 + j) / 3.0F;
           } /* end for */
     } /* end for */
 
@@ -796,7 +795,7 @@ test_vltypes_vlen_compound(void)
                 TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].i=%d, rdata[%d].p[%d].i=%d\n",(int)i,(int)j, (int)((s1 *)wdata[i].p)[j].i, (int)i,(int)j, (int)((s1 *)rdata[i].p)[j].i);
                 continue;
             } /* end if */
-            if(!FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
+            if(!H5_FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
                 TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].f=%f, rdata[%d].p[%d].f=%f\n",(int)i,(int)j, (double)((s1 *)wdata[i].p)[j].f, (int)i,(int)j, (double)((s1 *)rdata[i].p)[j].f);
                 continue;
             } /* end if */
@@ -863,7 +862,7 @@ rewrite_vltypes_vlen_compound(void)
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    int 		increment=4;
+    unsigned     increment=4;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -874,8 +873,8 @@ rewrite_vltypes_vlen_compound(void)
         wdata[i].p = HDmalloc((i + increment) * sizeof(s1));
         wdata[i].len = i + increment;
         for(j = 0; j < (i + increment); j++) {
-            ((s1 *)wdata[i].p)[j].i = i * 40 + j;
-            ((s1 *)wdata[i].p)[j].f = (float)((i * 60 + j) / 3.0F);
+            ((s1 *)wdata[i].p)[j].i = (int)(i * 40 + j);
+            ((s1 *)wdata[i].p)[j].f = (float)(i * 60 + j) / 3.0F;
           } /* end for */
     } /* end for */
 
@@ -941,7 +940,7 @@ rewrite_vltypes_vlen_compound(void)
                 TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].i=%d, rdata[%d].p[%d].i=%d\n",(int)i,(int)j, (int)((s1 *)wdata[i].p)[j].i, (int)i,(int)j, (int)((s1 *)rdata[i].p)[j].i);
                 continue;
             } /* end if */
-            if(!FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
+            if(!H5_FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
                 TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].f=%f, rdata[%d].p[%d].f=%f\n",(int)i,(int)j, (double)((s1 *)wdata[i].p)[j].f, (int)i,(int)j, (double)((s1 *)rdata[i].p)[j].f);
                 continue;
             } /* end if */
@@ -999,32 +998,36 @@ test_vltypes_compound_vlen_vlen(void)
         float f;
         hvl_t v;
     } s1;
-    s1 wdata[SPACE3_DIM1];              /* data to write */
-    s1 rdata[SPACE3_DIM1];              /* data to read */
-    hid_t	fid1;		        /* HDF5 File IDs		*/
-    hid_t	dataset;	        /* Dataset ID			*/
-    hid_t	sid1;                   /* Dataspace ID			*/
-    hid_t	tid1, tid2, tid3;       /* Datatype IDs         */
-    hsize_t	dims1[] = {SPACE3_DIM1};
+    s1          *wdata;                 /* data to write */
+    s1          *rdata;                 /* data to read */
+    hid_t    fid1;                /* HDF5 File IDs        */
+    hid_t    dataset;            /* Dataset ID            */
+    hid_t    sid1;                   /* Dataspace ID            */
+    hid_t    tid1, tid2, tid3;       /* Datatype IDs         */
+    hsize_t    dims1[] = {SPACE3_DIM1};
     unsigned    i,j,k;                  /* counting variables */
     hvl_t       *t1, *t2;               /* Temporary pointer to VL information */
-    herr_t	ret;		        /* Generic return value		*/
+    herr_t    ret;                /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Compound Datatypes with VL Atomic Datatype Component Functionality\n"));
 
     /* Allocate and initialize VL data to write */
-    for(i=0; i<SPACE3_DIM1; i++) {
-        wdata[i].i=i*10;
-        wdata[i].f=(float)((i*20)/3.0F);
-        wdata[i].v.p=HDmalloc((i+L1_INCM)*sizeof(hvl_t));
-        wdata[i].v.len=i+L1_INCM;
-        for(t1=(wdata[i].v).p,j=0; j<(i+L1_INCM); j++, t1++) {
-            t1->p=HDmalloc((j+L2_INCM)*sizeof(unsigned int));
-            t1->len=j+L2_INCM;
-            for(k=0; k<j+L2_INCM; k++)
-                ((unsigned int*)t1->p)[k] = i*100 + j*10 + k;
-        }
+    wdata = (s1 *)HDmalloc(sizeof(s1) * SPACE3_DIM1);
+    CHECK_PTR(wdata, "HDmalloc");
+    rdata = (s1 *)HDmalloc(sizeof(s1) * SPACE3_DIM1);
+    CHECK_PTR(rdata, "HDmalloc");
+    for(i = 0; i < SPACE3_DIM1; i++) {
+        wdata[i].i = (int)(i * 10);
+        wdata[i].f = (float)(i * 20) / 3.0F;
+        wdata[i].v.p = HDmalloc((i + L1_INCM) * sizeof(hvl_t));
+        wdata[i].v.len = i + L1_INCM;
+        for(t1 = (hvl_t *)((wdata[i].v).p), j = 0; j < (i + L1_INCM); j++, t1++) {
+            t1->p = HDmalloc((j + L2_INCM) * sizeof(unsigned int));
+            t1->len = j + L2_INCM;
+            for(k = 0; k < j + L2_INCM; k++)
+                ((unsigned int*)t1->p)[k] = i * 100 + j * 10 + k;
+        } /* end for */
     } /* end for */
 
     /* Create file */
@@ -1090,7 +1093,7 @@ test_vltypes_compound_vlen_vlen(void)
             TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
             continue;
         } /* end if */
-        if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+        if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
             TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
             continue;
         } /* end if */
@@ -1100,7 +1103,7 @@ test_vltypes_compound_vlen_vlen(void)
             continue;
         } /* end if */
 
-        for(t1=wdata[i].v.p, t2=rdata[i].v.p, j=0; j<rdata[i].v.len; j++, t1++, t2++) {
+        for(t1=(hvl_t *)(wdata[i].v.p), t2=(hvl_t *)(rdata[i].v.p), j=0; j<rdata[i].v.len; j++, t1++, t2++) {
             if(t1->len != t2->len) {
                 TestErrPrintf("%d: VL data length don't match!, i=%d, j=%d, t1->len=%d, t2->len=%d\n",__LINE__,(int)i,(int)j,(int)t1->len,(int)t2->len);
                 continue;
@@ -1145,6 +1148,10 @@ test_vltypes_compound_vlen_vlen(void)
     /* Close file */
     ret = H5Fclose(fid1);
     CHECK(ret, FAIL, "H5Fclose");
+
+    /* Release buffers */
+    HDfree(wdata);
+    HDfree(rdata);
 } /* end test_vltypes_compound_vlen_vlen() */
 
 /****************************************************************
@@ -1159,13 +1166,13 @@ static void
 test_vltypes_compound_vlstr(void)
 {
     typedef enum {
-	red,
-	blue,
-	green
+        red,
+        blue,
+        green
     } e1;
     typedef struct {
         char *string;
-	e1   color;
+        e1   color;
     } s2;
     typedef struct {                    /* Struct that the compound type are composed of */
         hvl_t v;
@@ -1174,21 +1181,21 @@ test_vltypes_compound_vlstr(void)
     s1 wdata2[SPACE1_DIM1];             /* data to write */
     s1 rdata[SPACE1_DIM1];              /* data to read */
     s1 rdata2[SPACE1_DIM1];              /* data to read */
-    char	str[64] = "a\0";
-    hid_t	fid1;		        /* HDF5 File IDs		*/
-    hid_t	dataset, dset2;	        /* Dataset ID			*/
-    hid_t	sid1, sid2, filespace, filespace2;  /* Dataspace ID	*/
-    hid_t	tid1, tid2, tid3, tid4, tid5;       /* Datatype IDs     */
-    hid_t	cparms;
-    hsize_t	dims1[] = {SPACE1_DIM1};
-    hsize_t	chunk_dims[] = {SPACE1_DIM1/2};
-    hsize_t	maxdims[] = {H5S_UNLIMITED};
-    hsize_t	size[] = {SPACE1_DIM1};
-    hsize_t	offset[] = {0};
+    char    str[64] = "a\0";
+    hid_t    fid1;                /* HDF5 File IDs        */
+    hid_t    dataset, dset2;            /* Dataset ID            */
+    hid_t    sid1, sid2, filespace, filespace2;  /* Dataspace ID    */
+    hid_t    tid1, tid2, tid3, tid4, tid5;       /* Datatype IDs     */
+    hid_t    cparms;
+    hsize_t    dims1[] = {SPACE1_DIM1};
+    hsize_t    chunk_dims[] = {SPACE1_DIM1/2};
+    hsize_t    maxdims[] = {H5S_UNLIMITED};
+    hsize_t    size[] = {SPACE1_DIM1};
+    hsize_t    offset[] = {0};
     unsigned    i,j;                    /* counting variables */
     s2          *t1, *t2;               /* Temporary pointer to VL information */
-    int		val;
-    herr_t	ret;		        /* Generic return value		*/
+    int        val;
+    herr_t    ret;                /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing VL Datatype of Compound Datatype with VL String Functionality\n"));
@@ -1197,12 +1204,12 @@ test_vltypes_compound_vlstr(void)
     for(i=0; i<SPACE1_DIM1; i++) {
         wdata[i].v.p=(s2*)HDmalloc((i+L3_INCM)*sizeof(s2));
         wdata[i].v.len=i+L3_INCM;
-        for(t1=(wdata[i].v).p, j=0; j<(i+L3_INCM); j++, t1++) {
-	    strcat(str, "m");
-	    t1->string = (char*)HDmalloc(strlen(str)*sizeof(char)+1);
-            strcpy(t1->string, str);
-	    /*t1->color = red;*/
-	    t1->color = blue;
+        for(t1=(s2 *)((wdata[i].v).p), j=0; j<(i+L3_INCM); j++, t1++) {
+            HDstrcat(str, "m");
+            t1->string = (char*)HDmalloc(HDstrlen(str)*sizeof(char)+1);
+            HDstrcpy(t1->string, str);
+            /*t1->color = red;*/
+            t1->color = blue;
         }
     } /* end for */
 
@@ -1340,8 +1347,8 @@ test_vltypes_compound_vlstr(void)
             continue;
         } /* end if */
 
-        for(t1=wdata[i].v.p, t2=rdata[i].v.p, j=0; j<rdata[i].v.len; j++, t1++, t2++) {
-                if( strcmp(t1->string, t2->string) ) {
+        for(t1=(s2 *)(wdata[i].v.p), t2=(s2 *)(rdata[i].v.p), j=0; j<rdata[i].v.len; j++, t1++, t2++) {
+                if(HDstrcmp(t1->string, t2->string)) {
                     TestErrPrintf("VL data values don't match!, t1->string=%s, t2->string=%s\n",t1->string, t2->string);
                     continue;
                 } /* end if */
@@ -1361,15 +1368,15 @@ test_vltypes_compound_vlstr(void)
     CHECK(ret, FAIL, "H5Dvlen_reclaim");
 
     /* Use this part for new data */
-    strcpy(str, "bbbbbbbb\0");
+    HDstrcpy(str, "bbbbbbbb\0");
     for(i=0; i<SPACE1_DIM1; i++) {
         wdata2[i].v.p=(s2*)HDmalloc((i+1)*sizeof(s2));
         wdata2[i].v.len=i+1;
         for(t1=(s2*)(wdata2[i].v).p, j=0; j<i+1; j++, t1++) {
-	    strcat(str, "pp");
-	    t1->string = (char*)HDmalloc(strlen(str)*sizeof(char)+1);
-            strcpy(t1->string, str);
-	    t1->color = green;
+        HDstrcat(str, "pp");
+        t1->string = (char*)HDmalloc(HDstrlen(str)*sizeof(char)+1);
+            HDstrcpy(t1->string, str);
+        t1->color = green;
         }
     } /* end for */
 
@@ -1398,8 +1405,8 @@ test_vltypes_compound_vlstr(void)
             continue;
         } /* end if */
 
-        for(t1=wdata2[i].v.p, t2=rdata2[i].v.p, j=0; j<rdata2[i].v.len; j++, t1++, t2++) {
-                if( strcmp(t1->string, t2->string) ) {
+        for(t1=(s2 *)(wdata2[i].v.p), t2=(s2 *)(rdata2[i].v.p), j=0; j<rdata2[i].v.len; j++, t1++, t2++) {
+                if(HDstrcmp(t1->string, t2->string)) {
                     TestErrPrintf("VL data values don't match!, t1->string=%s, t2->string=%s\n",t1->string, t2->string);
                     continue;
                 } /* end if */
@@ -1459,29 +1466,29 @@ test_vltypes_compound_vlen_atomic(void)
     s1 wdata[SPACE1_DIM1];   /* Information to write */
     s1 rdata[SPACE1_DIM1];   /* Information read in */
     s1 fill;                    /* Fill value */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1, tid2; /* Datatype IDs         */
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1, tid2; /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hid_t       dcpl_pid;   /* Dataset creation property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hsize_t        dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Compound Datatypes with VL Atomic Datatype Component Functionality\n"));
 
     /* Allocate and initialize VL data to write */
-    for(i=0; i<SPACE1_DIM1; i++) {
-        wdata[i].i=i*10;
-        wdata[i].f=(float)((i*20)/3.0F);
-        wdata[i].v.p=HDmalloc((i+1)*sizeof(unsigned int));
-        wdata[i].v.len=i+1;
-        for(j=0; j<(i+1); j++)
-            ((unsigned int *)wdata[i].v.p)[j]=i*10+j;
+    for(i = 0; i < SPACE1_DIM1; i++) {
+        wdata[i].i = (int)(i * 10);
+        wdata[i].f = (float)(i * 20) / 3.0F;
+        wdata[i].v.p = HDmalloc((i + 1)*sizeof(unsigned int));
+        wdata[i].v.len = i + 1;
+        for(j = 0; j < (i + 1); j++)
+            ((unsigned int *)wdata[i].v.p)[j] = i * 10 + j;
     } /* end for */
 
     /* Create file */
@@ -1544,7 +1551,7 @@ test_vltypes_compound_vlen_atomic(void)
             TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
             continue;
         } /* end if */
-        if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+        if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
             TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
             continue;
         } /* end if */
@@ -1593,8 +1600,8 @@ test_vltypes_compound_vlen_atomic(void)
 
     /* Check data read in */
     for(i = 0; i < SPACE1_DIM1; i++)
-        if(rdata[i].i != 0 || !FLT_ABS_EQUAL(rdata[i].f, 0.0F) || rdata[i].v.len != 0 || rdata[i].v.p != NULL)
-            TestErrPrintf("VL doesn't match!, rdata[%d].i=%d, rdata[%d].f=%f, rdata[%d].v.len=%u, rdata[%d].v.p=%p\n",(int)i,rdata[i].i,(int)i,rdata[i].f,(int)i,(unsigned)rdata[i].v.len,(int)i,rdata[i].v.p);
+        if(rdata[i].i != 0 || !H5_FLT_ABS_EQUAL(rdata[i].f, 0.0F) || rdata[i].v.len != 0 || rdata[i].v.p != NULL)
+            TestErrPrintf("VL doesn't match!, rdata[%d].i=%d, rdata[%d].f=%f, rdata[%d].v.len=%u, rdata[%d].v.p=%p\n",(int)i,rdata[i].i,(int)i,(double)rdata[i].f,(int)i,(unsigned)rdata[i].v.len,(int)i,rdata[i].v.p);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
@@ -1610,7 +1617,7 @@ test_vltypes_compound_vlen_atomic(void)
             TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
             continue;
         } /* end if */
-        if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+        if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
             TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
             continue;
         } /* end if */
@@ -1663,9 +1670,9 @@ test_vltypes_compound_vlen_atomic(void)
 /****************************************************************
 **
 **  rewrite_vltypes_compound_vlen_atomic(): Check memory leak for
-**	basic VL datatype code.
+**    basic VL datatype code.
 **      Check memory leak for compound datatypes with VL datatypes
-**	of atomic datatypes.
+**    of atomic datatypes.
 **
 ****************************************************************/
 static void
@@ -1686,7 +1693,7 @@ rewrite_vltypes_compound_vlen_atomic(void)
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    int			increment=4;
+    unsigned        increment=4;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -1694,8 +1701,8 @@ rewrite_vltypes_compound_vlen_atomic(void)
 
     /* Allocate and initialize VL data to write */
     for(i = 0; i < SPACE1_DIM1; i++) {
-        wdata[i].i = i * 40;
-        wdata[i].f = (float)((i * 50) / 3.0F);
+        wdata[i].i = (int)(i * 40);
+        wdata[i].f = (float)(i * 50) / 3.0F;
         wdata[i].v.p = HDmalloc((i + increment) * sizeof(unsigned int));
         wdata[i].v.len = i + increment;
         for(j = 0; j < (i + increment); j++)
@@ -1762,7 +1769,7 @@ rewrite_vltypes_compound_vlen_atomic(void)
             TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
             continue;
         } /* end if */
-        if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+        if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
             TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
             continue;
         } /* end if */
@@ -1847,16 +1854,16 @@ test_vltypes_vlen_vlen_atomic(void)
     hvl_t wdata[SPACE1_DIM1];   /* Information to write */
     hvl_t rdata[SPACE1_DIM1];   /* Information read in */
     hvl_t *t1, *t2;             /* Temporary pointer to VL information */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1, tid2; /* Datatype IDs         */
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1, tid2; /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hsize_t        dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j,k;      /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing VL Datatypes with VL Atomic Datatype Component Functionality\n"));
@@ -1869,7 +1876,7 @@ test_vltypes_vlen_vlen_atomic(void)
             return;
         } /* end if */
         wdata[i].len=i+1;
-        for(t1=wdata[i].p,j=0; j<(i+1); j++, t1++) {
+        for(t1=(hvl_t *)(wdata[i].p),j=0; j<(i+1); j++, t1++) {
             t1->p=HDmalloc((j+1)*sizeof(unsigned int));
             if(t1->p==NULL) {
                 TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j);
@@ -1958,7 +1965,7 @@ test_vltypes_vlen_vlen_atomic(void)
 
     /* 10 hvl_t elements allocated = 1 + 2 + 3 + 4 elements for each array position */
     /* 20 unsigned int elements allocated = 1 + 3 + 6 + 10 elements */
-    VERIFY(size, ((SPACE1_DIM1 * (SPACE1_DIM1 + 1)) / 2) * sizeof(hvl_t) + vlen_size_func((unsigned long)SPACE1_DIM1) * sizeof(unsigned int), "H5Dvlen_get_buf_size");
+    VERIFY(size, (hsize_t)(((SPACE1_DIM1 * (SPACE1_DIM1 + 1)) / 2) * sizeof(hvl_t) + vlen_size_func((unsigned long)SPACE1_DIM1) * sizeof(unsigned int)), "H5Dvlen_get_buf_size");
 
     /* Read dataset from disk */
     ret = H5Dread(dataset, tid2, H5S_ALL, H5S_ALL, xfer_pid, rdata);
@@ -1967,7 +1974,7 @@ test_vltypes_vlen_vlen_atomic(void)
     /* Make certain the correct amount of memory has been used */
     /* 10 hvl_t elements allocated = 1 + 2 + 3 + 4 elements for each array position */
     /* 20 unsigned int elements allocated = 1 + 3 + 6 + 10 elements */
-    VERIFY(mem_used, ((SPACE1_DIM1 * (SPACE1_DIM1 + 1)) / 2) * sizeof(hvl_t) + vlen_size_func((unsigned long)SPACE1_DIM1) * sizeof(unsigned int), "H5Dread");
+    VERIFY(mem_used, (size_t)(((SPACE1_DIM1 * (SPACE1_DIM1 + 1)) / 2) * sizeof(hvl_t) + vlen_size_func((unsigned long)SPACE1_DIM1) * sizeof(unsigned int)), "H5Dread");
 
     /* Compare data read in */
     for(i=0; i<SPACE1_DIM1; i++) {
@@ -1975,7 +1982,7 @@ test_vltypes_vlen_vlen_atomic(void)
             TestErrPrintf("%d: VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",__LINE__,(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
             continue;
         } /* end if */
-        for(t1=wdata[i].p, t2=rdata[i].p, j=0; j<rdata[i].len; j++, t1++, t2++) {
+        for(t1=(hvl_t *)wdata[i].p, t2=(hvl_t *)(rdata[i].p), j=0; j<rdata[i].len; j++, t1++, t2++) {
             if(t1->len!=t2->len) {
                 TestErrPrintf("%d: VL data length don't match!, i=%d, j=%d, t1->len=%d, t2->len=%d\n",__LINE__,(int)i,(int)j,(int)t1->len,(int)t2->len);
                 continue;
@@ -2041,12 +2048,12 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void)
     hid_t               fid1;           /* HDF5 File IDs                */
     hid_t               dataset;        /* Dataset ID                   */
     hid_t               sid1;       /* Dataspace ID                     */
-    hid_t               tid2; 	/* Datatype IDs         */
+    hid_t               tid2;     /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j,k;      /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    int			increment=1;
+    unsigned        increment=1;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -2060,7 +2067,7 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void)
             return;
         } /* end if */
         wdata[i].len = i + increment;
-        for(t1 = wdata[i].p, j = 0; j < (i + increment); j++, t1++) {
+        for(t1 = (hvl_t *)(wdata[i].p), j = 0; j < (i + increment); j++, t1++) {
             t1->p = HDmalloc((j + 1) * sizeof(unsigned int));
             if(t1->p == NULL) {
                 TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j);
@@ -2155,7 +2162,7 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void)
             TestErrPrintf("%d: VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",__LINE__,(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
             continue;
         } /* end if */
-        for(t1=wdata[i].p, t2=rdata[i].p, j=0; j<rdata[i].len; j++, t1++, t2++) {
+        for(t1=(hvl_t *)(wdata[i].p), t2=(hvl_t *)(rdata[i].p), j=0; j<rdata[i].len; j++, t1++, t2++) {
             if(t1->len!=t2->len) {
                 TestErrPrintf("%d: VL data length don't match!, i=%d, j=%d, t1->len=%d, t2->len=%d\n",__LINE__,(int)i,(int)j,(int)t1->len,(int)t2->len);
                 continue;
@@ -2222,7 +2229,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j,k;      /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    int                 increment=1;
+    unsigned         increment=1;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -2236,7 +2243,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
             return;
         } /* end if */
         wdata[i].len=i+increment;
-        for(t1=wdata[i].p,j=0; j<(i+increment); j++, t1++) {
+        for(t1=(hvl_t *)(wdata[i].p),j=0; j<(i+increment); j++, t1++) {
             t1->p=HDmalloc((j+1)*sizeof(unsigned int));
             if(t1->p==NULL) {
                 TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j);
@@ -2314,7 +2321,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
 
     /* 10 hvl_t elements allocated = 1 + 2 + 3 + 4 elements for each array position */
     /* 20 unsigned int elements allocated = 1 + 3 + 6 + 10 elements */
-    VERIFY(size, ((SPACE1_DIM1*(SPACE1_DIM1 + 1)) / 2) * sizeof(hvl_t) + vlen_size_func((unsigned long)SPACE1_DIM1) * sizeof(unsigned int), "H5Dvlen_get_buf_size");
+    VERIFY(size, (hsize_t)(((SPACE1_DIM1*(SPACE1_DIM1 + 1)) / 2) * sizeof(hvl_t) + vlen_size_func((unsigned long)SPACE1_DIM1) * sizeof(unsigned int)), "H5Dvlen_get_buf_size");
 
     /* Read dataset from disk */
     ret=H5Dread(dataset,tid2,H5S_ALL,H5S_ALL,xfer_pid,rdata);
@@ -2323,7 +2330,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
     /* Make certain the correct amount of memory has been used */
     /* 10 hvl_t elements allocated = 1 + 2 + 3 + 4 elements for each array position */
     /* 20 unsigned int elements allocated = 1 + 3 + 6 + 10 elements */
-    VERIFY(mem_used,((SPACE1_DIM1*(SPACE1_DIM1+1))/2)*sizeof(hvl_t)+vlen_size_func((unsigned long)SPACE1_DIM1)*sizeof(unsigned int),"H5Dread");
+    VERIFY(mem_used, (size_t)(((SPACE1_DIM1*(SPACE1_DIM1+1))/2)*sizeof(hvl_t)+vlen_size_func((unsigned long)SPACE1_DIM1)*sizeof(unsigned int)),"H5Dread");
 
     /* Compare data read in */
     for(i=0; i<SPACE1_DIM1; i++) {
@@ -2331,7 +2338,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
             TestErrPrintf("%d: VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n",__LINE__,(int)i,(int)wdata[i].len,(int)i,(int)rdata[i].len);
             continue;
         } /* end if */
-        for(t1=wdata[i].p, t2=rdata[i].p, j=0; j<rdata[i].len; j++, t1++, t2++) {
+        for(t1=(hvl_t *)(wdata[i].p), t2=(hvl_t *)(rdata[i].p), j=0; j<rdata[i].len; j++, t1++, t2++) {
             if(t1->len!=t2->len) {
                 TestErrPrintf("%d: VL data length don't match!, i=%d, j=%d, t1->len=%d, t2->len=%d\n",__LINE__,(int)i,(int)j,(int)t1->len,(int)t2->len);
                 continue;
@@ -2494,8 +2501,8 @@ test_vltypes_fill_value(void)
 
 
     /* Allocate space for the buffer to read data */
-    rbuf = HDmalloc(SPACE4_DIM_LARGE * sizeof(dtype1_struct));
-    CHECK(rbuf, NULL, "HDmalloc");
+    rbuf = (dtype1_struct *)HDmalloc(SPACE4_DIM_LARGE * sizeof(dtype1_struct));
+    CHECK_PTR(rbuf, "HDmalloc");
 
 
     /* Create the small & large dataspaces to use */
@@ -2536,7 +2543,7 @@ test_vltypes_fill_value(void)
     CHECK(file_id, FAIL, "H5Fcreate");
 
     /* Create datasets with different storage layouts */
-    for(layout = H5D_COMPACT; layout <= H5D_CHUNKED; layout++) {
+    for(layout = H5D_COMPACT; layout <= H5D_CHUNKED; H5_INC_ENUM(H5D_layout_t, layout)) {
         unsigned compress_loop;         /* # of times to run loop, for testing compressed chunked dataset */
         unsigned test_loop;             /* Loop over datasets */
 
@@ -2646,7 +2653,7 @@ test_vltypes_fill_value(void)
     CHECK(file_id, FAIL, "H5Fopen");
 
     /* Read empty datasets with different storage layouts */
-    for(layout = H5D_COMPACT; layout <= H5D_CHUNKED; layout++) {
+    for(layout = H5D_COMPACT; layout <= H5D_CHUNKED; H5_INC_ENUM(H5D_layout_t, layout)) {
         unsigned compress_loop;         /* # of times to run loop, for testing compressed chunked dataset */
         unsigned test_loop;             /* Loop over datasets */
 
@@ -2841,7 +2848,7 @@ test_vltypes_fill_value(void)
     CHECK(file_id, FAIL, "H5Fopen");
 
     /* Write one element & fill values to  datasets with different storage layouts */
-    for(layout = H5D_COMPACT; layout <= H5D_CHUNKED; layout++) {
+    for(layout = H5D_COMPACT; layout <= H5D_CHUNKED; H5_INC_ENUM(H5D_layout_t, layout)) {
         unsigned compress_loop;         /* # of times to run loop, for testing compressed chunked dataset */
         unsigned test_loop;             /* Loop over datasets */
 
@@ -3145,15 +3152,15 @@ test_vltypes(void)
 
     /* These next tests use the same file */
     test_vltypes_dataset_create();    /* Check dataset of VL when fill value
-				       * won't be rewritten to it.*/
+                    * won't be rewritten to it.*/
     test_vltypes_funcs();             /* Test functions with VL types */
     test_vltypes_vlen_atomic();       /* Test VL atomic datatypes */
-    rewrite_vltypes_vlen_atomic();    /* Check VL memory leak	  */
+    rewrite_vltypes_vlen_atomic();    /* Check VL memory leak      */
     test_vltypes_vlen_compound();     /* Test VL compound datatypes */
-    rewrite_vltypes_vlen_compound();  /* Check VL memory leak	  */
+    rewrite_vltypes_vlen_compound();  /* Check VL memory leak      */
     test_vltypes_compound_vlen_atomic(); /* Test compound datatypes with VL atomic components */
-    rewrite_vltypes_compound_vlen_atomic();/* Check VL memory leak	*/
-    test_vltypes_vlen_vlen_atomic();  	   /* Test VL datatype with VL atomic components */
+    rewrite_vltypes_compound_vlen_atomic();/* Check VL memory leak    */
+    test_vltypes_vlen_vlen_atomic();         /* Test VL datatype with VL atomic components */
     rewrite_longer_vltypes_vlen_vlen_atomic();  /*overwrite with VL data of longer sequence*/
     rewrite_shorter_vltypes_vlen_vlen_atomic();  /*overwrite with VL data of shorted sequence*/
     test_vltypes_compound_vlen_vlen();/* Test compound datatypes with VL atomic components */
@@ -3161,15 +3168,15 @@ test_vltypes(void)
     test_vltypes_fill_value();        /* Test fill value for VL data */
 }   /* test_vltypes() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_vltypes
+ * Function:    cleanup_vltypes
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              June 8, 1999
  *
  * Modifications:
diff --git a/test/unlink.c b/test/unlink.c
index 1275c3e..6b99443 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -15,17 +15,16 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Friday, September 25, 1998
  *
- * Purpose:	Test unlinking operations.
+ * Purpose:    Test unlinking operations.
  */
 
-#define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
+#define H5G_PACKAGE  /*suppress error about including H5Gpkg	  */
 
 /* Define this macro to indicate that the testing APIs should be available */
 #define H5G_TESTING
 
-#include <time.h>
 #include "h5test.h"
-#include "H5Gpkg.h"		/* Groups				*/
+#include "H5Gpkg.h"        /* Groups                */
 
 const char *FILENAME[] = {
     "unlink",
@@ -78,18 +77,18 @@ const char *FILENAME[] = {
 #define FULL_GROUP_EST_NUM_ENTRIES      8
 #define FULL_GROUP_EST_ENTRY_LEN        9
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_one
+ * Function:    test_one
  *
- * Purpose:	Creates a group that has just one entry and then unlinks that
- *		entry.
+ * Purpose:    Creates a group that has just one entry and then unlinks that
+ *        entry.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, September 25, 1998
  *
  * Modifications:
@@ -99,8 +98,8 @@ const char *FILENAME[] = {
 static int
 test_one(hid_t file)
 {
-    hid_t	work = -1, grp = -1;
-    herr_t	status;
+    hid_t    work = -1, grp = -1;
+    herr_t    status;
 
     /* Create a test group */
     if((work = H5Gcreate2(file, "/test_one", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
@@ -123,10 +122,10 @@ test_one(hid_t file)
     TESTING("unlink without a name");
     if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
     H5E_BEGIN_TRY {
-	status = H5Ldelete(grp, ".", H5P_DEFAULT);
+    status = H5Ldelete(grp, ".", H5P_DEFAULT);
     } H5E_END_TRY;
     if(status>=0)
-	FAIL_PUTS_ERROR("    Unlinking object w/o a name should have failed.")
+    FAIL_PUTS_ERROR("    Unlinking object w/o a name should have failed.")
     if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
 
     /* Cleanup */
@@ -137,23 +136,23 @@ test_one(hid_t file)
 
  error:
     H5E_BEGIN_TRY {
-	H5Gclose(work);
-	H5Gclose(grp);
+    H5Gclose(work);
+    H5Gclose(grp);
     } H5E_END_TRY;
     return 1;
 } /* end test_one() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_many
+ * Function:    test_many
  *
- * Purpose:	Tests many unlinks in a single directory.
+ * Purpose:    Tests many unlinks in a single directory.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, September 25, 1998
  *
  * Modifications:
@@ -163,10 +162,10 @@ test_one(hid_t file)
 static int
 test_many(hid_t file)
 {
-    hid_t	work=-1, grp=-1;
-    int		i;
-    const int	how_many=500;
-    char	name[32];
+    hid_t    work=-1, grp=-1;
+    int        i;
+    const int    how_many=500;
+    char    name[32];
 
     /* Create a test group */
     if((work = H5Gcreate2(file, "/test_many", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
@@ -176,54 +175,54 @@ test_many(hid_t file)
     /* Create a bunch of names and unlink them in order */
     TESTING("forward unlink");
     for(i = 0; i < how_many; i++) {
-	sprintf(name, "obj_%05d", i);
-	if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    HDsprintf(name, "obj_%05d", i);
+    if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     for(i = 0; i < how_many; i++) {
-	sprintf(name, "obj_%05d", i);
-	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    HDsprintf(name, "obj_%05d", i);
+    if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
     /* Create a bunch of names and unlink them in reverse order */
     TESTING("backward unlink");
     for(i = 0; i < how_many; i++) {
-	sprintf(name, "obj_%05d", i);
-	if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    HDsprintf(name, "obj_%05d", i);
+    if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     for(i = (how_many - 1); i >= 0; --i) {
-	sprintf(name, "obj_%05d", i);
-	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    HDsprintf(name, "obj_%05d", i);
+    if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
     /* Create a bunch of names and unlink them from both directions */
     TESTING("inward unlink");
     for(i = 0; i < how_many; i++) {
-	sprintf(name, "obj_%05d", i);
-	if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    HDsprintf(name, "obj_%05d", i);
+    if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     for(i = 0; i < how_many; i++) {
-	if(i % 2)
-	    sprintf(name, "obj_%05d", how_many - (1 + i / 2));
-	else
-	    sprintf(name, "obj_%05d", i / 2);
-	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(i % 2)
+        HDsprintf(name, "obj_%05d", how_many - (1 + i / 2));
+    else
+        HDsprintf(name, "obj_%05d", i / 2);
+    if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
     /* Create a bunch of names and unlink them from the midle */
     TESTING("outward unlink");
     for(i = 0; i < how_many; i++) {
-	sprintf(name, "obj_%05d", i);
-	if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    HDsprintf(name, "obj_%05d", i);
+    if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     for(i = (how_many - 1); i >= 0; --i) {
-	if(i % 2)
-	    sprintf(name, "obj_%05d", how_many - (1 + i / 2));
-	else
-	    sprintf(name, "obj_%05d", i / 2);
-	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(i % 2)
+        HDsprintf(name, "obj_%05d", how_many - (1 + i / 2));
+    else
+        HDsprintf(name, "obj_%05d", i / 2);
+    if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
@@ -234,23 +233,23 @@ test_many(hid_t file)
 
  error:
     H5E_BEGIN_TRY {
-	H5Gclose(work);
-	H5Gclose(grp);
+    H5Gclose(work);
+    H5Gclose(grp);
     } H5E_END_TRY;
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_symlink
+ * Function:    test_symlink
  *
- * Purpose:	Tests removal of symbolic links.
+ * Purpose:    Tests removal of symbolic links.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, September 25, 1998
  *
  *-------------------------------------------------------------------------
@@ -258,7 +257,7 @@ test_many(hid_t file)
 static int
 test_symlink(hid_t file)
 {
-    hid_t	work=-1;
+    hid_t    work=-1;
 
     TESTING("symlink removal");
 
@@ -275,22 +274,22 @@ test_symlink(hid_t file)
 
 error:
     H5E_BEGIN_TRY {
-	H5Gclose(work);
+    H5Gclose(work);
     } H5E_END_TRY;
     return 1;
 } /* end test_symlink() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_rename
+ * Function:    test_rename
  *
- * Purpose:	Tests H5Lmove()
+ * Purpose:    Tests H5Lmove()
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, September 25, 1998
  *
  * Modifications:
@@ -300,7 +299,7 @@ error:
 static int
 test_rename(hid_t file)
 {
-    hid_t	work=-1, foo=-1, inner=-1;
+    hid_t    work=-1, foo=-1, inner=-1;
 
     /* Create a test group and rename something */
     TESTING("object renaming");
@@ -327,14 +326,14 @@ test_rename(hid_t file)
 
 error:
     H5E_BEGIN_TRY {
-	H5Gclose(work);
-	H5Gclose(foo);
-	H5Gclose(inner);
+    H5Gclose(work);
+    H5Gclose(foo);
+    H5Gclose(inner);
     } H5E_END_TRY;
     return 1;
 } /* end test_rename() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_new_move
  *
@@ -354,9 +353,9 @@ error:
 static int
 test_new_move(hid_t fapl)
 {
-    hid_t 	file_a, file_b=(-1);
-    hid_t	grp_1=(-1), grp_2=(-1), grp_move=(-1), moved_grp=(-1);
-    char 	filename[1024];
+    hid_t     file_a, file_b=(-1);
+    hid_t    grp_1=(-1), grp_2=(-1), grp_move=(-1), moved_grp=(-1);
+    char     filename[1024];
 
     TESTING("new move");
 
@@ -404,17 +403,17 @@ test_new_move(hid_t fapl)
 
   error:
     H5E_BEGIN_TRY {
- 	H5Gclose(grp_1);
-	H5Gclose(grp_2);
-	H5Gclose(grp_move);
+    H5Gclose(grp_1);
+    H5Gclose(grp_2);
+    H5Gclose(grp_move);
         H5Gclose(moved_grp);
-	H5Fclose(file_a);
-	H5Fclose(file_b);
+    H5Fclose(file_a);
+    H5Fclose(file_b);
     } H5E_END_TRY;
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_new_move
  *
@@ -434,10 +433,10 @@ test_new_move(hid_t fapl)
 static int
 check_new_move(hid_t fapl)
 {
-    hid_t 	file;
-    H5O_info_t	oi_hard1, oi_hard2;
-    char 	filename[1024];
-    char 	linkval[1024];
+    hid_t     file;
+    H5O_info_t    oi_hard1, oi_hard2;
+    char     filename[1024];
+    char     linkval[1024];
 
     TESTING("check new move function");
 
@@ -474,7 +473,7 @@ error:
     return 1;
 } /* end check_new_move() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_filespace
  *
@@ -493,21 +492,21 @@ error:
 static int
 test_filespace(hid_t fapl)
 {
-    hid_t 	fapl_nocache;   /* File access property list with raw data cache turned off */
-    hid_t 	contig_dcpl;    /* Dataset creation property list for contiguous dataset */
-    hid_t 	early_chunk_dcpl; /* Dataset creation property list for chunked dataset & early allocation */
-    hid_t 	late_chunk_dcpl; /* Dataset creation property list for chunked dataset & late allocation */
-    hid_t 	comp_dcpl;      /* Dataset creation property list for compressed, chunked dataset */
-    hid_t 	compact_dcpl;   /* Dataset creation property list for compact dataset */
-    hid_t 	file;           /* File ID */
-    hid_t 	group, group2;  /* Group IDs */
-    hid_t 	dataset, dataset2;      /* Dataset IDs */
-    hid_t 	space;          /* Dataspace ID */
-    hid_t 	type;           /* Datatype ID */
-    hid_t 	attr_space;     /* Dataspace ID for attributes */
-    hid_t 	attr;           /* Attribute ID */
-    char 	filename[1024]; /* Name of file to create */
-    char 	objname[128];   /* Name of object to create */
+    hid_t     fapl_nocache;   /* File access property list with raw data cache turned off */
+    hid_t     contig_dcpl;    /* Dataset creation property list for contiguous dataset */
+    hid_t     early_chunk_dcpl; /* Dataset creation property list for chunked dataset & early allocation */
+    hid_t     late_chunk_dcpl; /* Dataset creation property list for chunked dataset & late allocation */
+    hid_t     comp_dcpl;      /* Dataset creation property list for compressed, chunked dataset */
+    hid_t     compact_dcpl;   /* Dataset creation property list for compact dataset */
+    hid_t     file;           /* File ID */
+    hid_t     group, group2;  /* Group IDs */
+    hid_t     dataset, dataset2;      /* Dataset IDs */
+    hid_t     space;          /* Dataspace ID */
+    hid_t     type;           /* Datatype ID */
+    hid_t     attr_space;     /* Dataspace ID for attributes */
+    hid_t     attr;           /* Attribute ID */
+    char     filename[1024]; /* Name of file to create */
+    char     objname[128];   /* Name of object to create */
     hsize_t     dims[FILESPACE_NDIMS]= {FILESPACE_DIM0, FILESPACE_DIM1, FILESPACE_DIM2};        /* Dataset dimensions */
     hsize_t     chunk_dims[FILESPACE_NDIMS]= {FILESPACE_CHUNK0, FILESPACE_CHUNK1, FILESPACE_CHUNK2};        /* Chunk dimensions */
     hsize_t     attr_dims[FILESPACE_ATTR_NDIMS]= {FILESPACE_ATTR_DIM0, FILESPACE_ATTR_DIM1};        /* Attribute dimensions */
@@ -515,7 +514,7 @@ test_filespace(hid_t fapl)
     int        *tmp_data;       /* Temporary pointer to dataset buffer */
     h5_stat_size_t       empty_size;     /* Size of an empty file */
     h5_stat_size_t       file_size;      /* Size of each file created */
-    herr_t	status;         /* Function status return value */
+    herr_t    status;         /* Function status return value */
     unsigned u,v,w;             /* Local index variables */
 
     /* Metadata cache parameters */
@@ -807,7 +806,7 @@ test_filespace(hid_t fapl)
     /* Alternate adding attributes to each one */
     for(u = 0; u < FILESPACE_NATTR; u++) {
         /* Set the name of the attribute to create */
-        sprintf(objname,"%s %u",ATTRNAME,u);
+        HDsprintf(objname,"%s %u",ATTRNAME,u);
 
         /* Create an attribute on the first dataset */
         if((attr = H5Acreate2(dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
@@ -913,7 +912,7 @@ test_filespace(hid_t fapl)
 
     /* Create a many groups to remove */
     for(u = 0; u < UNLINK_NGROUPS; u++) {
-        sprintf(objname, "%s %u", GROUPNAME, u);
+        HDsprintf(objname, "%s %u", GROUPNAME, u);
         if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
         if(H5Gclose(group) < 0) FAIL_STACK_ERROR
     } /* end for */
@@ -921,7 +920,7 @@ test_filespace(hid_t fapl)
     /* Remove the all the groups */
     /* (Remove them in reverse order just to make file size calculation easier -QAK) */
     for(u = UNLINK_NGROUPS; u > 0; u--) {
-        sprintf(objname, "%s %u", GROUPNAME, (u - 1));
+        HDsprintf(objname, "%s %u", GROUPNAME, (u - 1));
         if(H5Ldelete(file, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
 
@@ -976,19 +975,19 @@ test_filespace(hid_t fapl)
     /* Create a complex group hierarchy to remove */
     for(u = 0; u < FILESPACE_TOP_GROUPS; u++) {
         /* Create group */
-        sprintf(objname,"%s %u",GROUPNAME,u);
+        HDsprintf(objname,"%s %u",GROUPNAME,u);
         if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
         /* Create nested groups inside top groups */
         for(v = 0; v < FILESPACE_NESTED_GROUPS; v++) {
             /* Create group */
-            sprintf(objname, "%s %u", GROUP2NAME, v);
+            HDsprintf(objname, "%s %u", GROUP2NAME, v);
             if((group2 = H5Gcreate2(group, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
             /* Create datasets inside nested groups */
             for(w = 0; w < FILESPACE_NDATASETS; w++) {
                 /* Create & close a dataset */
-                sprintf(objname, "%s %u", DATASETNAME, w);
+                HDsprintf(objname, "%s %u", DATASETNAME, w);
                 if((dataset = H5Dcreate2(group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
                 if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
             } /* end for */
@@ -1005,19 +1004,19 @@ test_filespace(hid_t fapl)
     /* (Remove them in reverse order just to make file size calculation easier -QAK) */
     for(u = FILESPACE_TOP_GROUPS; u > 0; u--) {
         /* Open group */
-        sprintf(objname, "%s %u", GROUPNAME, (u - 1));
+        HDsprintf(objname, "%s %u", GROUPNAME, (u - 1));
         if((group = H5Gopen2(file, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
         /* Open nested groups inside top groups */
         for(v = 0; v < FILESPACE_NESTED_GROUPS; v++) {
             /* Create group */
-            sprintf(objname, "%s %u", GROUP2NAME, v);
+            HDsprintf(objname, "%s %u", GROUP2NAME, v);
             if((group2 = H5Gopen2(group, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
             /* Remove datasets inside nested groups */
             for(w = 0; w < FILESPACE_NDATASETS; w++) {
                 /* Remove dataset */
-                sprintf(objname, "%s %u", DATASETNAME, w);
+                HDsprintf(objname, "%s %u", DATASETNAME, w);
                 if(H5Ldelete(group2, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
             } /* end for */
 
@@ -1025,7 +1024,7 @@ test_filespace(hid_t fapl)
             if(H5Gclose(group2) < 0) FAIL_STACK_ERROR
 
             /* Remove nested group */
-            sprintf(objname, "%s %u",GROUP2NAME, v);
+            HDsprintf(objname, "%s %u",GROUP2NAME, v);
             if(H5Ldelete(group, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         } /* end for */
 
@@ -1033,7 +1032,7 @@ test_filespace(hid_t fapl)
         if(H5Gclose(group) < 0) FAIL_STACK_ERROR
 
         /* Remove top group */
-        sprintf(objname, "%s %u", GROUPNAME, (u - 1));
+        HDsprintf(objname, "%s %u", GROUPNAME, (u - 1));
         if(H5Ldelete(file, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
 
@@ -1233,7 +1232,7 @@ error:
     return 1;
 } /* end test_filespace() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_create_unlink
  *
@@ -1252,10 +1251,10 @@ error:
 static int
 test_create_unlink(const char *msg, hid_t fapl)
 {
-    hid_t 	file, group;
+    hid_t     file, group;
     unsigned u;
-    char 	groupname[1024];
-    char	filename[1024];
+    char     groupname[1024];
+    char    filename[1024];
 
     TESTING(msg);
 
@@ -1266,25 +1265,25 @@ test_create_unlink(const char *msg, hid_t fapl)
 
     /* Create a many groups to remove */
     for(u = 0; u < UNLINK_NGROUPS; u++) {
-        sprintf(groupname, "%s %u", GROUPNAME, u);
+        HDsprintf(groupname, "%s %u", GROUPNAME, u);
         if((group = H5Gcreate2(file, groupname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            printf("group %s creation failed\n", groupname);
+            HDprintf("group %s creation failed\n", groupname);
             goto error;
         } /* end if */
         if(H5Gclose (group) < 0) {
             H5_FAILED();
-            printf("closing group %s failed\n", groupname);
+            HDprintf("closing group %s failed\n", groupname);
             goto error;
         } /* end if */
     } /* end for */
 
     /* Remove the all the groups */
     for(u = 0; u < UNLINK_NGROUPS; u++) {
-        sprintf(groupname, "%s %u", GROUPNAME, u);
+        HDsprintf(groupname, "%s %u", GROUPNAME, u);
         if(H5Ldelete(file, groupname, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            printf("Unlinking group %s failed\n", groupname);
+            HDprintf("Unlinking group %s failed\n", groupname);
             goto error;
         } /* end if */
     } /* end for */
@@ -1300,7 +1299,7 @@ error:
     return 1;
 } /* end test_create_unlink() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_link_slashes
  *
@@ -1321,7 +1320,7 @@ test_link_slashes(hid_t fapl)
 {
     hid_t fid;          /* File ID */
     hid_t gid, gid2;     /* Group ID */
-    char	filename[1024];
+    char    filename[1024];
 
     TESTING("creating links with multiple slashes");
 
@@ -1368,7 +1367,7 @@ error:
     return 1;
 } /* end test_link_slashes() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_slashes
  *
@@ -1389,7 +1388,7 @@ test_unlink_slashes(hid_t fapl)
 {
     hid_t fid;          /* File ID */
     hid_t gid;          /* Group ID */
-    char	filename[1024];
+    char    filename[1024];
 
     TESTING("deleting links with multiple slashes");
 
@@ -1465,7 +1464,7 @@ delete_node(hid_t pid, hid_t id)
     return(0);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_rightleaf
  *
@@ -1500,14 +1499,14 @@ test_unlink_rightleaf(hid_t fid)
 
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
-        sprintf(name, "Zone%d", n + 1);
+        HDsprintf(name, "Zone%d", n + 1);
         if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
     } /* end for */
 
     /* Unlink & re-create each group */
     for (n = 0; n < ngroups; n++) {
         if(delete_node (rootid, gids[n]) < 0) TEST_ERROR
-        sprintf(name, "Zone%d", n + 1);
+        HDsprintf(name, "Zone%d", n + 1);
         if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
     } /* end for */
 
@@ -1544,7 +1543,7 @@ error:
     return 1;
 } /* end test_unlink_rightleaf() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_rightnode
  *
@@ -1579,7 +1578,7 @@ test_unlink_rightnode(hid_t fid)
 
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
-        sprintf(name, "ZoneB%d", n + 1);
+        HDsprintf(name, "ZoneB%d", n + 1);
         if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
     } /* end for */
 
@@ -1623,7 +1622,7 @@ error:
     return 1;
 } /* end test_unlink_rightnode() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_middlenode
  *
@@ -1658,7 +1657,7 @@ test_unlink_middlenode(hid_t fid)
 
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
-        sprintf(name, "ZoneC%d", n + 1);
+        HDsprintf(name, "ZoneC%d", n + 1);
         if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
     } /* end for */
 
@@ -1845,7 +1844,7 @@ error:
     return 1;
 } /* end test_unlink_middlenode() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_resurrect_dataset
  *
@@ -1866,7 +1865,7 @@ static int
 test_resurrect_dataset(hid_t fapl)
 {
     hid_t       f = -1, s = -1, d = -1;
-    char	filename[1024];
+    char    filename[1024];
 
     TESTING("resurrecting dataset after deletion");
 
@@ -1909,14 +1908,14 @@ test_resurrect_dataset(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Sclose(s);
-	H5Dclose(d);
-	H5Fclose(f);
+    H5Sclose(s);
+    H5Dclose(d);
+    H5Fclose(f);
     } H5E_END_TRY;
     return 1;
 } /* end test_resurrect_dataset() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_resurrect_datatype
  *
@@ -1979,13 +1978,13 @@ test_resurrect_datatype(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(type);
-	H5Fclose(file);
+    H5Tclose(type);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* end test_resurrect_datatype() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_resurrect_group
  *
@@ -2047,13 +2046,13 @@ test_resurrect_group(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Gclose(group);
-	H5Fclose(file);
+    H5Gclose(group);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* end test_resurrect_group() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_chunked_dataset
  *
@@ -2130,15 +2129,15 @@ test_unlink_chunked_dataset(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Pclose(dcpl_id);
-	H5Sclose(space_id);
-	H5Dclose(dset_id);
-	H5Fclose(file_id);
+    H5Pclose(dcpl_id);
+    H5Sclose(space_id);
+    H5Dclose(dset_id);
+    H5Fclose(file_id);
     } H5E_END_TRY;
     return 1;
 } /* end test_unlink_chunked_dataset() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_full_group_compact
  *
@@ -2157,7 +2156,7 @@ test_full_group_compact(hid_t fapl)
 {
     hid_t file_id = -1;
     hid_t gid = -1, gid2 = -1;  /* Group IDs */
-    H5O_info_t	oi;             /* Stat buffer for object */
+    H5O_info_t    oi;             /* Stat buffer for object */
     char objname[128];          /* Buffer for name of objects to create */
     char objname2[128];         /* Buffer for name of objects to create */
     char filename[1024];        /* Buffer for filename */
@@ -2178,7 +2177,7 @@ test_full_group_compact(hid_t fapl)
 
     /* Create several objects to link to */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "keep %u\n", u);
+        HDsprintf(objname, "keep %u\n", u);
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
         if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR
     } /* end for */
@@ -2206,14 +2205,14 @@ test_full_group_compact(hid_t fapl)
 
     /* Create hard links to objects in group to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "/keep/keep %u\n", u);
-        sprintf(objname2, "keep %u\n", u);
+        HDsprintf(objname, "/keep/keep %u\n", u);
+        HDsprintf(objname2, "keep %u\n", u);
         if(H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Create several objects to delete */
     for(u = 0; u < FULL_GROUP_NUM_DELETE_COMPACT; u++) {
-        sprintf(objname, "delete %u\n", u);
+        HDsprintf(objname, "delete %u\n", u);
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
         if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR
     } /* end for */
@@ -2228,7 +2227,7 @@ test_full_group_compact(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "/keep/keep %u\n", u);
+        HDsprintf(objname, "/keep/keep %u\n", u);
         if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 2) TEST_ERROR
     } /* end for */
@@ -2245,7 +2244,7 @@ test_full_group_compact(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "/keep/keep %u\n", u);
+        HDsprintf(objname, "/keep/keep %u\n", u);
         if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 1) TEST_ERROR
     } /* end for */
@@ -2264,14 +2263,14 @@ test_full_group_compact(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Gclose(gid2);
-	H5Gclose(gid);
-	H5Fclose(file_id);
+    H5Gclose(gid2);
+    H5Gclose(gid);
+    H5Fclose(file_id);
     } H5E_END_TRY;
     return 1;
 } /* end test_full_group_compact() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_full_group_dense
  *
@@ -2291,7 +2290,7 @@ test_full_group_dense(hid_t fapl)
     hid_t file_id = -1;
     hid_t gcpl = (-1);          /* Group creation property list ID */
     hid_t gid = -1, gid2 = -1;  /* Group IDs */
-    H5O_info_t	oi;             /* Stat buffer for object */
+    H5O_info_t    oi;             /* Stat buffer for object */
     char objname[128];          /* Buffer for name of objects to create */
     char objname2[128];         /* Buffer for name of objects to create */
     char filename[1024];        /* Buffer for filename */
@@ -2312,7 +2311,7 @@ test_full_group_dense(hid_t fapl)
 
     /* Create several objects to link to */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "keep %u\n", u);
+        HDsprintf(objname, "keep %u\n", u);
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
         if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR
     } /* end for */
@@ -2352,14 +2351,14 @@ test_full_group_dense(hid_t fapl)
 
     /* Create hard links to objects in group to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "/keep/keep %u\n", u);
-        sprintf(objname2, "keep %u\n", u);
+        HDsprintf(objname, "/keep/keep %u\n", u);
+        HDsprintf(objname2, "keep %u\n", u);
         if(H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Create several objects to delete */
     for(u = 0; u < FULL_GROUP_NUM_DELETE_DENSE; u++) {
-        sprintf(objname, "delete %u\n", u);
+        HDsprintf(objname, "delete %u\n", u);
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
         if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR
     } /* end for */
@@ -2374,7 +2373,7 @@ test_full_group_dense(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "/keep/keep %u\n", u);
+        HDsprintf(objname, "/keep/keep %u\n", u);
         if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 2) TEST_ERROR
     } /* end for */
@@ -2391,7 +2390,7 @@ test_full_group_dense(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        sprintf(objname, "/keep/keep %u\n", u);
+        HDsprintf(objname, "/keep/keep %u\n", u);
         if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 1) TEST_ERROR
     } /* end for */
@@ -2410,25 +2409,25 @@ test_full_group_dense(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Gclose(gid2);
-	H5Gclose(gid);
-    	H5Pclose(gcpl);
-	H5Fclose(file_id);
+    H5Gclose(gid2);
+    H5Gclose(gid);
+        H5Pclose(gcpl);
+    H5Fclose(file_id);
     } H5E_END_TRY;
     return 1;
 } /* end test_full_group_dense() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test unlinking operations
+ * Purpose:    Test unlinking operations
  *
- * Return:	Success:	zero
+ * Return:    Success:    zero
  *
- *		Failure:	non-zero
+ *        Failure:    non-zero
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, September 25, 1998
  *
  * Modifications:
@@ -2438,10 +2437,10 @@ error:
 int
 main(void)
 {
-    hid_t	fapl, fapl2, file;
-    int	nerrors = 0;
-    char	filename[1024];
-    hbool_t new_format;
+    hid_t    fapl, fapl2, file;
+    int        nerrors = 0;
+    char    filename[1024];
+    unsigned    new_format;
 
     /* Metadata cache parameters */
     int mdc_nelmts;
@@ -2468,11 +2467,11 @@ main(void)
 
         /* Set the FAPL for the type of format */
         if(new_format) {
-            puts("\nTesting with new group format:");
+            HDputs("\nTesting with new group format:");
             my_fapl = fapl2;
         } /* end if */
         else {
-            puts("Testing with old group format:");
+            HDputs("Testing with old group format:");
             my_fapl = fapl;
         } /* end else */
 
@@ -2501,12 +2500,12 @@ main(void)
 
             /* Get FAPL cache settings */
             if(H5Pget_cache(fapl_small_mdc, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0)
-                printf("H5Pget_cache failed\n");
+                HDprintf("H5Pget_cache failed\n");
 
             /* Change FAPL cache settings */
             mdc_nelmts=1;
             if(H5Pset_cache(fapl_small_mdc, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0)
-                printf("H5Pset_cache failed\n");
+                HDprintf("H5Pset_cache failed\n");
 
             /* Test creating & unlinking lots of objects with a 1-element metadata cache FAPL */
             nerrors += test_create_unlink("create and unlink large number of objects with small cache", fapl_small_mdc);
@@ -2551,11 +2550,11 @@ main(void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     if (nerrors) {
-        printf("***** %d FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S");
-        exit(1);
+        HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S");
+        exit(EXIT_FAILURE);
     }
 
-    puts("All unlink tests passed.");
+    HDputs("All unlink tests passed.");
 
     h5_cleanup(FILENAME, fapl);
 
diff --git a/test/unregister.c b/test/unregister.c
index f241a61..a5432fc 100644
--- a/test/unregister.c
+++ b/test/unregister.c
@@ -23,8 +23,8 @@ const char *FILENAME[] = {
     NULL
 };
 
-#define GROUP_NAME              "group"
-#define DSET_NAME               "dataset"
+#define GROUP_NAME              "test_group"
+#define DSET_NAME               "test_dataset"
 #define FILENAME_BUF_SIZE       1024
 #define DSET_DIM1               100
 #define DSET_DIM2               200
@@ -34,39 +34,34 @@ const char *FILENAME[] = {
 
 #define H5Z_FILTER_DUMMY        312
 
-static size_t filter_dummy(unsigned int flags, size_t cd_nelmts,
+static size_t do_nothing(unsigned int flags, size_t cd_nelmts,
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
 
 /* Dummy filter for test_unregister_filters only */
 const H5Z_class2_t H5Z_DUMMY[1] = {{
-    H5Z_CLASS_T_VERS,           /* H5Z_class_t version */
-    H5Z_FILTER_DUMMY,		/* Filter id number		*/
-    1, 1,                       /* Encoding and decoding enabled */
-    "dummy",			/* Filter name for debugging	*/
-    NULL,                       /* The "can apply" callback     */
-    NULL,                       /* The "set local" callback     */
-    filter_dummy,		/* The actual filter function	*/
+    H5Z_CLASS_T_VERS,           /* H5Z_class_t version              */
+    H5Z_FILTER_DUMMY,           /* Filter ID number                 */
+    1, 1,                       /* Encoding and decoding enabled    */
+    "dummy",                    /* Filter name for debugging        */
+    NULL,                       /* The "can apply" callback         */
+    NULL,                       /* The "set local" callback         */
+    do_nothing,                 /* The actual filter function       */
 }};
 
 
 /*-------------------------------------------------------------------------
- * Function:	filter_dummy
+ * Function:    do_nothing
  *
- * Purpose:	A dummy compression method that doesn't do anything.  This
- *              filter is only for test_unregister_filters.  Please don't 
+ * Purpose:     A dummy compression method that doesn't do anything. This
+ *              filter is only for test_unregister_filters. Please don't 
  *              use it for other tests because it may mess up this test.
  *
- * Return:	Success:	Data chunk size
- *
- *		Failure:	0
- *
- * Programmer:	Raymond Lu
- *              April 24, 2013
+ * Return:      Data chunk size
  *
  *-------------------------------------------------------------------------
  */
 static size_t
-filter_dummy(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+do_nothing(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
       const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes,
       size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf)
 {
@@ -74,181 +69,221 @@ filter_dummy(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_unregister_filters
+ * Function:    test_unregister_filters
  *
- * Purpose:	Tests unregistering filter before closing the file
+ * Purpose:     Tests unregistering filter before closing the file
  *
- * Return:	Success:	0
- *		Failure:	-1
- *
- * Programmer:	Raymond Lu
- *              11 April 2013
+ * Return:      SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_unregister_filters(hid_t my_fapl)
+test_unregister_filters(hid_t fapl_id)
 {
-    hid_t	file1, file2;
-    hid_t	dc;
-    hid_t	gcpl, gid, group;
-    hid_t       dataset, space;
-    int		i, j, n;
-    char        gname[256];
+    hid_t       fid1        = H5I_INVALID_HID;
+    hid_t       fid2        = H5I_INVALID_HID;
+    hid_t       dcpl_id     = H5I_INVALID_HID;
+    hid_t       gcpl_id     = H5I_INVALID_HID;
+    hid_t       gid         = H5I_INVALID_HID;
+    hid_t       gid_loop    = H5I_INVALID_HID;
+    hid_t       did         = H5I_INVALID_HID;
+    hid_t       sid         = H5I_INVALID_HID;
+    int         i, j, n;
+    char        group_name[32];
     char        filename[FILENAME_BUF_SIZE];
-    const hsize_t chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2};  /* Chunk dimensions */
-    hsize_t	dims[2];
-    int	        points[DSET_DIM1][DSET_DIM2];
+    const hsize_t chunk_dims[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2};  /* Chunk dimensions */
+    hsize_t     dims[2];
+    int	        data[DSET_DIM1][DSET_DIM2];
     herr_t      ret;
 
     TESTING("Unregistering filter");
 
     /* Create first file */
-    h5_fixname(FILENAME[0], my_fapl, filename, sizeof filename);
-    if((file1 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0) goto error;
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof(filename));
+    if((fid1 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
+        goto error;
 
     /* Create second file */
-    h5_fixname(FILENAME[1], my_fapl, filename, sizeof filename);
-    if((file2 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0) goto error;
+    h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename));
+    if((fid2 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
+        goto error;
 
     /* Register DUMMY filter */
-    if(H5Zregister(H5Z_DUMMY) < 0) goto error;
-
-    if(H5Zfilter_avail(H5Z_FILTER_DUMMY)!=TRUE) goto error;
+    if (H5Zregister(H5Z_DUMMY) < 0)
+        goto error;
+    if (H5Zfilter_avail(H5Z_FILTER_DUMMY) != TRUE)
+        goto error;
+ 
+    /*******************
+     * PART 1 - GROUPS *
+     *******************/
 
-    if((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0) goto error;
-  
     /* Use DUMMY filter for creating groups */ 
-    if(H5Pset_filter (gcpl, H5Z_FILTER_DUMMY, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0) goto error;
+    if((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
+        goto error;
+    if(H5Pset_filter(gcpl_id, H5Z_FILTER_DUMMY, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0)
+        goto error;
 
     /* Create a group using this filter */
-    if((gid = H5Gcreate2(file1, GROUP_NAME, H5P_DEFAULT, gcpl, H5P_DEFAULT)) < 0) goto error;
+    if((gid = H5Gcreate2(fid1, GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
+        goto error;
 
     /* Create multiple groups under the main group */
-    for (i=0; i < GROUP_ITERATION; i++) {
-        sprintf(gname, "group_%d", i);
-        if((group = H5Gcreate2(gid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
-        if(H5Gclose(group) < 0) goto error; 
+    for(i = 0; i < GROUP_ITERATION; i++) {
+        HDsprintf(group_name, "group_%d", i);
+        if((gid_loop = H5Gcreate2(gid, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto error;
+        if(H5Gclose(gid_loop) < 0)
+            goto error; 
     }
 
-    if(H5Fflush(file1, H5F_SCOPE_GLOBAL) < 0) goto error;
+    /* Flush the file containing the groups */
+    if(H5Fflush(fid1, H5F_SCOPE_GLOBAL) < 0)
+        goto error;
 
     /* Unregister the filter before closing the group.  It should fail */
     H5E_BEGIN_TRY {
         ret = H5Zunregister(H5Z_FILTER_DUMMY);
     } H5E_END_TRY;
-    if(ret>=0) {
+    if(ret >= 0) {
         H5_FAILED();
-        printf("    Line %d: Should not be able to unregister filter\n", __LINE__);
+        HDprintf("    Line %d: Should not be able to unregister filter\n", __LINE__);
         goto error;
-    } /* end if */
+    }
 
     /* Close the group */
-    if(H5Gclose(gid) < 0) goto error;
+    if(H5Gclose(gid) < 0)
+        goto error;
 
     /* Clean up objects used for this test */
-    if(H5Pclose (gcpl) < 0) goto error;
+    if(H5Pclose (gcpl_id) < 0)
+        goto error;
 
-    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
-    if(H5Pset_chunk (dc, 2, chunk_size) < 0) goto error;
+    /*********************
+     * PART 2 - DATASETS *
+     *********************/
 
-    if(H5Pset_filter(dc, H5Z_FILTER_DUMMY, 0, (size_t)0, NULL) < 0) goto error;
+    /* Use DUMMY filter for creating datasets */ 
+    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto error;
+    if(H5Pset_chunk(dcpl_id, 2, chunk_dims) < 0)
+        goto error;
+    if(H5Pset_filter(dcpl_id, H5Z_FILTER_DUMMY, 0, (size_t)0, NULL) < 0)
+        goto error;
 
-    /* Initialize the dataset */
+    /* Initialize the data for writing */
     for(i = n = 0; i < DSET_DIM1; i++)
         for(j = 0; j < DSET_DIM2; j++)
-            points[i][j] = n++;
+            data[i][j] = n++;
 
-    /* Create the data space */
+    /* Create the dataspace */
     dims[0] = DSET_DIM1;
     dims[1] = DSET_DIM2;
-    if((space = H5Screate_simple(2, dims, NULL)) < 0) goto error;
+    if((sid = H5Screate_simple(2, dims, NULL)) < 0)
+        goto error;
 
     /* Create a dataset in the first file */
-    if((dataset = H5Dcreate2(file1, DSET_NAME, H5T_NATIVE_INT, space,
-                             H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(fid1, DSET_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
+        goto error;
 
     /* Write the data to the dataset */
-    if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0)
+    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
         goto error;
 
     /* Unregister the filter before closing the dataset.  It should fail */
     H5E_BEGIN_TRY {
         ret = H5Zunregister(H5Z_FILTER_DUMMY);
     } H5E_END_TRY;
-    if(ret>=0) {
+    if(ret >= 0) {
         H5_FAILED();
-        printf("    Line %d: Should not be able to unregister filter\n", __LINE__);
+        HDprintf("    Line %d: Should not be able to unregister filter\n", __LINE__);
         goto error;
-    } /* end if */
+    }
 
-    if(H5Dclose(dataset) < 0) goto error;
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+        goto error;
 
     /* Create a dataset in the second file */
-    if((dataset = H5Dcreate2(file2, DSET_NAME, H5T_NATIVE_INT, space,
-                             H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(fid2, DSET_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
+        goto error;
 
     /* Write the data to the dataset */
-    if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points) < 0)
+    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
         goto error;
 
-    if(H5Dclose(dataset) < 0) goto error;
+    /* Close the dataset in the second file */
+    if(H5Dclose(did) < 0)
+        goto error;
 
     /* Unregister the filter after closing all objects but before closing files. 
-     * It should flush all files. */
-    if(H5Zunregister(H5Z_FILTER_DUMMY) < 0) goto error;
+     * It should flush all files.
+     */
+    if(H5Zunregister(H5Z_FILTER_DUMMY) < 0)
+        goto error;
 
     /* Clean up objects used for this test */
-    if(H5Pclose (dc) < 0) goto error;
-    if(H5Fclose(file1) < 0) goto error;
-    if(H5Fclose(file2) < 0) goto error;
+    if(H5Pclose(dcpl_id) < 0)
+        goto error;
+    if(H5Fclose(fid1) < 0)
+        goto error;
+    if(H5Fclose(fid2) < 0)
+        goto error;
 
     PASSED();
-    return 0;
+    return SUCCEED;
 
 error:
-    return -1;
+    H5E_BEGIN_TRY {
+        H5Fclose(fid1);
+        H5Fclose(fid2);
+        H5Pclose(dcpl_id);
+        H5Pclose(gcpl_id);
+        H5Gclose(gid);
+        H5Gclose(gid_loop);
+        H5Dclose(did);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+
+    return FAIL;
 }
 
 
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Tests unregistering filter with H5Zunregister
+ * Purpose:     Tests unregistering filter with H5Zunregister
  *
- * Return:	Success:	exit(0)
- *
- *		Failure:	exit(1)
- *
- * Programmer:	Raymond Lu
- *              11 April 2013
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
-    hid_t		fapl;
-    int	nerrors = 0;
+    hid_t       fapl_id = H5I_INVALID_HID;
+    int         nerrors = 0;
 
     /* Testing setup */
     h5_reset();
-    fapl = h5_fileaccess();
+    fapl_id = h5_fileaccess();
 
     /* Test unregistering filter in its own file */
-    nerrors += (test_unregister_filters(fapl) < 0           ? 1 : 0);
+    nerrors += (test_unregister_filters(fapl_id) < 0           ? 1 : 0);
+
+    h5_cleanup(FILENAME, fapl_id);
 
-    if(nerrors)
+    if (nerrors)
         goto error;
-    printf("All filter unregistration tests passed.\n");
-    h5_cleanup(FILENAME, fapl);
+    HDprintf("All filter unregistration tests passed.\n");
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 
 error:
     nerrors = MAX(1, nerrors);
-    printf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n",
+    HDprintf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n",
             nerrors, 1 == nerrors ? "" : "S");
-    return 1;
-}
+
+    HDexit(EXIT_FAILURE);
+} /* end main() */
 
diff --git a/test/vfd.c b/test/vfd.c
index 305afe5..ee177c4 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -205,7 +205,7 @@ test_direct(void)
     if(file<0) {
         H5Pclose (fapl);
         SKIPPED();
-        printf("  Probably the file system doesn't support Direct I/O\n");
+        HDprintf("  Probably the file system doesn't support Direct I/O\n");
         return 0;
     }
 
@@ -282,8 +282,8 @@ test_direct(void)
         for(j = 0; j < DSET1_DIM2; j++)
             if(*p1++ != *p2++) {
                 H5_FAILED();
-                printf("    Read different values than written in data set 1.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written in data set 1.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 TEST_ERROR;
               } /* end if */
 
@@ -314,8 +314,8 @@ test_direct(void)
     for(i = 0; i < DSET2_DIM; i++)
         if(wdata2[i] != rdata2[i]) {
             H5_FAILED();
-            printf("    Read different values than written in data set 2.\n");
-            printf("    At index %d\n", i);
+            HDprintf("    Read different values than written in data set 2.\n");
+            HDprintf("    At index %d\n", i);
             TEST_ERROR;
         } /* end if */
 
@@ -428,7 +428,7 @@ test_core(void)
         TEST_ERROR;
     if(fhandle==NULL)
     {
-        printf("fhandle==NULL\n");
+        HDprintf("fhandle==NULL\n");
                TEST_ERROR;
     }
 
@@ -497,8 +497,8 @@ test_core(void)
         for(j = 0; j < DSET1_DIM2; j++)
             if(*p1++ != *p2++) {
                 H5_FAILED();
-                printf("    Read different values than written in data set 1.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written in data set 1.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 TEST_ERROR;
             } /* end if */
 
@@ -547,8 +547,8 @@ test_core(void)
         for(j = 0; j < DSET1_DIM2; j++)
             if(*p1++ != *p2++) {
                 H5_FAILED();
-                printf("    Read different values than written in data set 1.\n");
-                printf("    At index %d,%d\n", i, j);
+                HDprintf("    Read different values than written in data set 1.\n");
+                HDprintf("    At index %d,%d\n", i, j);
                 TEST_ERROR;
             } /* end if */
 
@@ -1023,19 +1023,19 @@ test_multi(void)
     memb_map[H5FD_MEM_BTREE] = H5FD_MEM_BTREE;
     memb_map[H5FD_MEM_GHEAP] = H5FD_MEM_GHEAP;
 
-    sprintf(sv[H5FD_MEM_SUPER], "%%s-%c.h5", 's');
+    HDsprintf(sv[H5FD_MEM_SUPER], "%%s-%c.h5", 's');
     memb_name[H5FD_MEM_SUPER] = sv[H5FD_MEM_SUPER];
     memb_addr[H5FD_MEM_SUPER] = 0;
 
-    sprintf(sv[H5FD_MEM_BTREE],  "%%s-%c.h5", 'b');
+    HDsprintf(sv[H5FD_MEM_BTREE],  "%%s-%c.h5", 'b');
     memb_name[H5FD_MEM_BTREE] = sv[H5FD_MEM_BTREE];
     memb_addr[H5FD_MEM_BTREE] = HADDR_MAX/4;
 
-    sprintf(sv[H5FD_MEM_DRAW], "%%s-%c.h5", 'r');
+    HDsprintf(sv[H5FD_MEM_DRAW], "%%s-%c.h5", 'r');
     memb_name[H5FD_MEM_DRAW] = sv[H5FD_MEM_DRAW];
     memb_addr[H5FD_MEM_DRAW] = HADDR_MAX/2;
 
-    sprintf(sv[H5FD_MEM_GHEAP], "%%s-%c.h5", 'g');
+    HDsprintf(sv[H5FD_MEM_GHEAP], "%%s-%c.h5", 'g');
     memb_name[H5FD_MEM_GHEAP] = sv[H5FD_MEM_GHEAP];
     memb_addr[H5FD_MEM_GHEAP] = (HADDR_MAX/4)*3;
 
@@ -1238,12 +1238,12 @@ test_multi_compat(void)
     memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW;
 
     memb_fapl[H5FD_MEM_SUPER] = H5P_DEFAULT;
-    sprintf(sv[H5FD_MEM_SUPER], "%%s-%c.h5", 's');
+    HDsprintf(sv[H5FD_MEM_SUPER], "%%s-%c.h5", 's');
     memb_name[H5FD_MEM_SUPER] = sv[H5FD_MEM_SUPER];
     memb_addr[H5FD_MEM_SUPER] = 0;
 
     memb_fapl[H5FD_MEM_DRAW] = H5P_DEFAULT;
-    sprintf(sv[H5FD_MEM_DRAW], "%%s-%c.h5", 'r');
+    HDsprintf(sv[H5FD_MEM_DRAW], "%%s-%c.h5", 'r');
     memb_name[H5FD_MEM_DRAW] = sv[H5FD_MEM_DRAW];
     memb_addr[H5FD_MEM_DRAW] = HADDR_MAX/2;
 
@@ -1254,12 +1254,12 @@ test_multi_compat(void)
 
     /* Make copy for the data file in the build directory, to protect the 
      * original file in the source directory */
-    sprintf(filename_s, "%s-%c.h5", MULTI_COMPAT_BASENAME, 's');
-    sprintf(newname_s, "%s-%c.h5", FILENAME[9], 's');
+    HDsprintf(filename_s, "%s-%c.h5", MULTI_COMPAT_BASENAME, 's');
+    HDsprintf(newname_s, "%s-%c.h5", FILENAME[9], 's');
     h5_make_local_copy(filename_s, newname_s);
 
-    sprintf(filename_r, "%s-%c.h5", MULTI_COMPAT_BASENAME, 'r');
-    sprintf(newname_r, "%s-%c.h5", FILENAME[9], 'r');
+    HDsprintf(filename_r, "%s-%c.h5", MULTI_COMPAT_BASENAME, 'r');
+    HDsprintf(newname_r, "%s-%c.h5", FILENAME[9], 'r');
     h5_make_local_copy(filename_r, newname_r);
 
     /* Reopen the file for read only.  Verify 1.8 library can open file
@@ -1647,7 +1647,7 @@ main(void)
 
     h5_reset();
 
-    printf("Testing basic Virtual File Driver functionality.\n");
+    HDprintf("Testing basic Virtual File Driver functionality.\n");
 
     nerrors += test_sec2() < 0           ? 1 : 0;
     nerrors += test_core() < 0           ? 1 : 0;
@@ -1661,12 +1661,12 @@ main(void)
     nerrors += test_windows() < 0        ? 1 : 0;
 
     if(nerrors) {
-  printf("***** %d Virtual File Driver TEST%s FAILED! *****\n",
+  HDprintf("***** %d Virtual File Driver TEST%s FAILED! *****\n",
     nerrors, nerrors > 1 ? "S" : "");
   return 1;
     }
 
-    printf("All Virtual File Driver tests passed.\n");
+    HDprintf("All Virtual File Driver tests passed.\n");
     return 0;
 }
 
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 10ee0f6..f290551 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -573,7 +573,7 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
         if ( verbose ) {
-                fprintf(stdout,
+                HDfprintf(stdout,
                         "%d:%s: MPI_Comm_group() failed with error %d.\n",
                         world_mpi_rank, fcn_name, mpi_result);
             }
@@ -592,7 +592,7 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if ( verbose ) {
-                fprintf(stdout,
+                HDfprintf(stdout,
                         "%d:%s: MPI_Group_excl() failed with error %d.\n",
                         world_mpi_rank, fcn_name, mpi_result);
             }
@@ -609,7 +609,7 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if ( verbose ) {
-                fprintf(stdout,
+                HDfprintf(stdout,
                         "%d:%s: MPI_Comm_create() failed with error %d.\n",
                         world_mpi_rank, fcn_name, mpi_result);
             }
@@ -623,7 +623,7 @@ set_up_file_communicator(void)
                     nerrors++;
                     success = FALSE;
                     if ( verbose ) {
-                        fprintf(stdout,
+                        HDfprintf(stdout,
                                 "%d:%s: file_mpi_comm == MPI_COMM_NULL.\n",
                                 world_mpi_rank, fcn_name);
                     }
@@ -637,7 +637,7 @@ set_up_file_communicator(void)
                     nerrors++;
                     success = FALSE;
                     if ( verbose ) {
-                        fprintf(stdout,
+                        HDfprintf(stdout,
                                 "%d:%s: file_mpi_comm != MPI_COMM_NULL.\n",
                                 world_mpi_rank, fcn_name);
                     }
@@ -655,7 +655,7 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if ( verbose ) {
-                fprintf(stdout,
+                HDfprintf(stdout,
                         "%d:%s: MPI_Comm_size() failed with error %d.\n",
                         world_mpi_rank, fcn_name, mpi_result);
             }
@@ -671,7 +671,7 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if ( verbose ) {
-                fprintf(stdout,
+                HDfprintf(stdout,
                         "%d:%s: MPI_Comm_rank() failed with error %d.\n",
                         world_mpi_rank, fcn_name, mpi_result);
             }
@@ -6982,7 +6982,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0){
-    printf("%d:Failed to turn off atexit processing. Continue.\n",
+    HDprintf("%d:Failed to turn off atexit processing. Continue.\n",
                mpi_rank);
     };
     H5open();
@@ -7001,24 +7001,24 @@ main(int argc, char **argv)
     }
 
 #ifdef H5_HAVE_MPE
-    if ( MAINPROCESS ) { printf("    Tests compiled for MPE.\n"); }
+    if ( MAINPROCESS ) { HDprintf("    Tests compiled for MPE.\n"); }
     virt_num_data_entries = MPE_VIRT_NUM_DATA_ENTIES;
 #endif /* H5_HAVE_MPE */
 
 
     if (MAINPROCESS){
-    printf("===================================\n");
-    printf("Parallel metadata cache tests\n");
-    printf("    mpi_size     = %d\n", mpi_size);
-    printf("    express_test = %d\n", express_test);
-    printf("===================================\n");
+    HDprintf("===================================\n");
+    HDprintf("Parallel metadata cache tests\n");
+    HDprintf("    mpi_size     = %d\n", mpi_size);
+    HDprintf("    express_test = %d\n", express_test);
+    HDprintf("===================================\n");
     }
 
     if ( mpi_size < 3 ) {
 
         if ( MAINPROCESS ) {
 
-            printf("    Need at least 3 processes.  Exiting.\n");
+            HDprintf("    Need at least 3 processes.  Exiting.\n");
         }
         goto finish;
     }
@@ -7148,15 +7148,15 @@ finish:
      */
     MPI_Barrier(MPI_COMM_WORLD);
     if (MAINPROCESS){        /* only process 0 reports */
-    printf("===================================\n");
+    HDprintf("===================================\n");
     if (failures){
-        printf("***metadata cache tests detected %d failures***\n",
+        HDprintf("***metadata cache tests detected %d failures***\n",
                    failures);
     }
     else{
-        printf("metadata cache tests finished with no failures\n");
+        HDprintf("metadata cache tests finished with no failures\n");
     }
-    printf("===================================\n");
+    HDprintf("===================================\n");
     }
 
     takedown_derived_types();
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index 1fa952d..df0e446 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -151,13 +151,13 @@ filter_read_internal(const char *filename, hid_t dcpl,
         for (j=0; j<hs_size[1]; j++) {
             if(points[i*size[1]+(size_t)hs_offset[1]+j] !=
                       check[i*hs_size[1]+j]) {
-		  fprintf(stderr,"    Read different values than written.\n");
-		  fprintf(stderr,"    At index %lu,%lu\n",
+		  HDfprintf(stderr,"    Read different values than written.\n");
+		  HDfprintf(stderr,"    At index %lu,%lu\n",
 		         (unsigned long)(i),
 		         (unsigned long)(hs_offset[1]+j));
-		  fprintf(stderr,"    At original: %d\n",
+		  HDfprintf(stderr,"    At original: %d\n",
 		         (int)points[i*size[1]+(size_t)hs_offset[1]+j]);
-		  fprintf(stderr,"    At returned: %d\n",
+		  HDfprintf(stderr,"    At returned: %d\n",
 		         (int)check[i*hs_size[1]+j]);
                   VRFY(FALSE, "");
 	    }
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 133ab18..6b4890d 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -766,6 +766,13 @@ void dataset_fillvalue(void)
     HDfree(wdata);
 }
 
+/* combined cngrpw and ingrpr tests because ingrpr reads file created by cngrpw. */
+void collective_group_write_independent_group_read(void)
+{
+    collective_group_write();
+    independent_group_read();
+}
+
 /* Write multiple groups with a chunked dataset in each group collectively.
  * These groups and datasets are for testing independent read later.
  *
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 94ecbfa..890a918 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -53,7 +53,7 @@ static int test_mpio_overlap_writes(char *filename) {
     MPI_Status mpi_stat;
 
     if (VERBOSE_MED)
-        printf("MPIO independent overlapping writes test on file %s\n",
+        HDprintf("MPIO independent overlapping writes test on file %s\n",
                 filename);
 
     nerrs = 0;
@@ -64,8 +64,8 @@ static int test_mpio_overlap_writes(char *filename) {
     /* Need at least 2 processes */
     if (mpi_size < 2) {
         if (MAINPROCESS)
-            printf("Need at least 2 processes to run MPIO test.\n");
-        printf(" -SKIP- \n");
+            HDprintf("Need at least 2 processes to run MPIO test.\n");
+        HDprintf(" -SKIP- \n");
         return 0;
     }
 
@@ -138,13 +138,13 @@ static int test_mpio_overlap_writes(char *filename) {
                 expected = (unsigned char) (mpi_off + i);
                 if ((expected != buf[i])
                         && (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED)) {
-                    printf(
+                    HDprintf(
                             "proc %d: found data error at [%ld], expect %u, got %u\n",
                             mpi_rank, (long) (mpi_off + i), expected, buf[i]);
                 }
             }
             if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-                printf("proc %d: [more errors ...]\n", mpi_rank);
+                HDprintf("proc %d: [more errors ...]\n", mpi_rank);
 
             nerrs += vrfyerrs;
         }
@@ -204,7 +204,7 @@ static int test_mpio_gb_file(char *filename) {
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
     if (VERBOSE_MED)
-        printf("MPI_Offset range test\n");
+        HDprintf("MPI_Offset range test\n");
 
     /* figure out the signness and sizeof MPI_Offset */
     mpi_off = 0;
@@ -216,10 +216,10 @@ static int test_mpio_gb_file(char *filename) {
     * sizes.
     */
     if (MAINPROCESS) { /* only process 0 needs to check it*/
-        printf("MPI_Offset is %s %d bytes integeral type\n",
+        HDprintf("MPI_Offset is %s %d bytes integeral type\n",
                 is_signed ? "signed" : "unsigned", (int) sizeof(MPI_Offset));
         if (sizeof_mpi_offset <= 4 && is_signed) {
-            printf("Skipped 2GB range test "
+            HDprintf("Skipped 2GB range test "
                     "because MPI_Offset cannot support it\n");
         } else {
             /* verify correctness of assigning 2GB sizes */
@@ -241,7 +241,7 @@ static int test_mpio_gb_file(char *filename) {
         }
 
         if (sizeof_mpi_offset <= 4) {
-            printf("Skipped 4GB range test "
+            HDprintf("Skipped 4GB range test "
                     "because MPI_Offset cannot support it\n");
         } else {
             /* verify correctness of assigning 4GB sizes */
@@ -267,10 +267,10 @@ static int test_mpio_gb_file(char *filename) {
     * Verify if we can write to a file of multiple GB sizes.
     */
     if (VERBOSE_MED)
-        printf("MPIO GB file test %s\n", filename);
+        HDprintf("MPIO GB file test %s\n", filename);
 
     if (sizeof_mpi_offset <= 4) {
-        printf("Skipped GB file range test "
+        HDprintf("Skipped GB file range test "
                 "because MPI_Offset cannot support it\n");
     } else {
         buf = (char *) HDmalloc(MB);
@@ -286,7 +286,7 @@ static int test_mpio_gb_file(char *filename) {
                 MPI_MODE_CREATE | MPI_MODE_RDWR, info, &fh);
         VRFY((mrc == MPI_SUCCESS), "MPI_FILE_OPEN");
 
-        printf("MPIO GB file write test %s\n", filename);
+        HDprintf("MPIO GB file write test %s\n", filename);
 
         /* instead of writing every bytes of the file, we will just write
         * some data around the 2 and 4 GB boundaries.  That should cover
@@ -328,9 +328,9 @@ static int test_mpio_gb_file(char *filename) {
         */
         /* open it again to verify the data written */
         /* but only if there was no write errors */
-        printf("MPIO GB file read test %s\n", filename);
+        HDprintf("MPIO GB file read test %s\n", filename);
         if (errors_sum(writerrs) > 0) {
-            printf("proc %d: Skip read test due to previous write errors\n",
+            HDprintf("proc %d: Skip read test due to previous write errors\n",
                     mpi_rank);
             goto finish;
         }
@@ -356,14 +356,14 @@ static int test_mpio_gb_file(char *filename) {
                 for (j = 0; j < MB; j++) {
                     if ((*(buf + j) != expected)
                             && (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED)) {
-                        printf(
+                        HDprintf(
                                 "proc %d: found data error at [%ld+%d], expect %d, got %d\n",
                                 mpi_rank, (long) mpi_off, j, expected,
                                 *(buf + j));
                     }
                 }
                 if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-                    printf("proc %d: [more errors ...]\n", mpi_rank);
+                    HDprintf("proc %d: [more errors ...]\n", mpi_rank);
 
                 nerrs += vrfyerrs;
             }
@@ -380,7 +380,7 @@ static int test_mpio_gb_file(char *filename) {
         mrc = MPI_Barrier(MPI_COMM_WORLD);
         VRFY((mrc == MPI_SUCCESS), "Sync before leaving test");
 
-        printf("Test if MPI_File_get_size works correctly with %s\n", filename);
+        HDprintf("Test if MPI_File_get_size works correctly with %s\n", filename);
 
         mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info,
                 &fh);
@@ -428,7 +428,7 @@ static int test_mpio_gb_file(char *filename) {
  */
 
 #define DIMSIZE    32        /* Dimension size. */
-#define PRINTID printf("Proc %d: ", mpi_rank)
+#define PRINTID HDprintf("Proc %d: ", mpi_rank)
 #define USENONE 0
 #define USEATOM 1        /* request atomic I/O */
 #define USEFSYNC 2        /* request file_sync */
@@ -452,24 +452,24 @@ static int test_mpio_1wMr(char *filename, int special_request) {
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
     if (MAINPROCESS && VERBOSE_MED) {
-        printf("Testing one process writes, all processes read.\n");
-        printf("Using %d processes accessing file %s\n", mpi_size, filename);
-        printf("    (Filename can be specified via program argument)\n");
+        HDprintf("Testing one process writes, all processes read.\n");
+        HDprintf("Using %d processes accessing file %s\n", mpi_size, filename);
+        HDprintf("    (Filename can be specified via program argument)\n");
     }
 
     /* show the hostname so that we can tell where the processes are running */
     if (VERBOSE_DEF) {
 #ifdef H5_HAVE_GETHOSTNAME
         if(HDgethostname(hostname, sizeof(hostname)) < 0) {
-            printf("gethostname failed\n");
+            HDprintf("gethostname failed\n");
             hostname[0] = '\0';
         }
 #else
-        printf("gethostname unavailable\n");
+        HDprintf("gethostname unavailable\n");
         hostname[0] = '\0';
 #endif
         PRINTID;
-        printf("hostname=%s\n", hostname);
+        HDprintf("hostname=%s\n", hostname);
     }
 
     /* Delete any old file in order to start anew. */
@@ -483,7 +483,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
             != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
         PRINTID;
-        printf("MPI_File_open failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -495,29 +495,29 @@ static int test_mpio_1wMr(char *filename, int special_request) {
         if ((mpi_err = MPI_File_get_atomicity(fh, &atomicity)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            printf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
         }
         if (VERBOSE_HI)
-            printf("Initial atomicity = %d\n", atomicity);
+            HDprintf("Initial atomicity = %d\n", atomicity);
         if ((mpi_err = MPI_File_set_atomicity(fh, 1)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            printf("MPI_File_set_atomicity failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_File_set_atomicity failed (%s)\n", mpi_err_str);
         }
         if ((mpi_err = MPI_File_get_atomicity(fh, &atomicity)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            printf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
         }
         if (VERBOSE_HI)
-            printf("After set_atomicity atomicity = %d\n", atomicity);
+            HDprintf("After set_atomicity atomicity = %d\n", atomicity);
     }
 
     /* This barrier is not necessary but do it anyway. */
     MPI_Barrier(MPI_COMM_WORLD);
     if (VERBOSE_HI) {
         PRINTID;
-        printf("between MPI_Barrier and MPI_File_write_at\n");
+        HDprintf("between MPI_Barrier and MPI_File_write_at\n");
     }
 
     /* ==================================================
@@ -533,13 +533,13 @@ static int test_mpio_1wMr(char *filename, int special_request) {
     if (mpi_rank == irank) {
         if (VERBOSE_HI) {
             PRINTID;
-            printf("wrote %d bytes at %ld\n", DIMSIZE, (long) mpi_off);
+            HDprintf("wrote %d bytes at %ld\n", DIMSIZE, (long) mpi_off);
         }
         if ((mpi_err = MPI_File_write_at(fh, mpi_off, writedata, DIMSIZE,
                 MPI_BYTE, &mpi_stat)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            printf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n",
+            HDprintf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n",
                     (long) mpi_off, DIMSIZE, mpi_err_str);
             return 1;
         };
@@ -550,7 +550,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
     MPI_Bcast(&mpi_err, 1, MPI_INT, irank, MPI_COMM_WORLD);
     if (VERBOSE_HI) {
         PRINTID;
-        printf("MPI_Bcast: mpi_err = %d\n", mpi_err);
+        HDprintf("MPI_Bcast: mpi_err = %d\n", mpi_err);
     }
 
     if (special_request & USEFSYNC) {
@@ -559,19 +559,19 @@ static int test_mpio_1wMr(char *filename, int special_request) {
         * should not need this.
         * ==================================================*/
         if (VERBOSE_HI)
-            printf("Apply MPI_File_sync\n");
+            HDprintf("Apply MPI_File_sync\n");
         /* call file_sync to force the write out */
         if ((mpi_err = MPI_File_sync(fh)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            printf("MPI_File_sync failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_File_sync failed (%s)\n", mpi_err_str);
         }
         MPI_Barrier(MPI_COMM_WORLD);
         /* call file_sync to force the write out */
         if ((mpi_err = MPI_File_sync(fh)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            printf("MPI_File_sync failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_File_sync failed (%s)\n", mpi_err_str);
         }
     }
 
@@ -580,7 +580,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
     MPI_Barrier(MPI_COMM_WORLD);
     if (VERBOSE_HI) {
         PRINTID;
-        printf("after MPI_Barrier\n");
+        HDprintf("after MPI_Barrier\n");
     }
 
     /* ==================================================
@@ -592,7 +592,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
             &mpi_stat)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
         PRINTID;
-        printf("MPI_File_read_at offset(%ld), bytes (%d), failed (%s)\n",
+        HDprintf("MPI_File_read_at offset(%ld), bytes (%d), failed (%s)\n",
                 (long) mpi_off, DIMSIZE, mpi_err_str);
         return 1;
     };
@@ -600,7 +600,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
         expect_val = irank * DIMSIZE + i;
         if (readdata[i] != expect_val) {
             PRINTID;
-            printf("read data[%d:%d] got %02x, expect %02x\n", irank, i,
+            HDprintf("read data[%d:%d] got %02x, expect %02x\n", irank, i,
                     readdata[i], expect_val);
             nerrs++;
         }
@@ -610,7 +610,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
 
     if (VERBOSE_HI) {
         PRINTID;
-        printf("%d data errors detected\n", nerrs);
+        HDprintf("%d data errors detected\n", nerrs);
     }
 
     mpi_err = MPI_Barrier(MPI_COMM_WORLD);
@@ -664,7 +664,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
  2. This test will verify whether the complicated derived datatype is working on
  the current platform.
 
- If this bug has been fixed in the previous not-working package, this test will issue a printf message to tell the developer to change
+ If this bug has been fixed in the previous not-working package, this test will issue a HDprintf message to tell the developer to change
  the configuration specific file of HDF5 so that we can change our configurationsetting to support collective IO for irregular selections.
 
  If it turns out that the previous working MPI-IO package no longer works, this test will also issue a message to inform the corresponding failure so that
@@ -703,7 +703,7 @@ static int test_mpio_derived_dtype(char *filename) {
             MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL, &fh))
             != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_open failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -717,13 +717,13 @@ static int test_mpio_derived_dtype(char *filename) {
     if ((mpi_err = MPI_Type_create_hindexed(count, blocklens, offsets, MPI_BYTE,
             &filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_Type_commit(&filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -733,13 +733,13 @@ static int test_mpio_derived_dtype(char *filename) {
     if ((mpi_err = MPI_Type_create_hindexed(count, blocklens, offsets, MPI_BYTE,
             &filetypenew)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_Type_commit(&filetypenew)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -754,52 +754,52 @@ static int test_mpio_derived_dtype(char *filename) {
     if ((mpi_err = MPI_Type_create_struct(outcount, adv_blocklens, adv_disp,
             bas_filetype, &adv_filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_Type_create_struct failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_Type_create_struct failed (%s)\n", mpi_err_str);
         return 1;
     }
     if ((mpi_err = MPI_Type_commit(&adv_filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_set_view(fh, disp, etype, adv_filetype, "native",
             MPI_INFO_NULL)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_set_view failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_set_view failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_write(fh, buf, 3, MPI_BYTE, &Status))
             != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_write failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_write failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_close(&fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_close failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_close failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY,
             MPI_INFO_NULL, &fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_open failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_set_view(fh, 0, MPI_BYTE, MPI_BYTE, "native",
             MPI_INFO_NULL)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_set_view failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_set_view failed (%s)\n", mpi_err_str);
         return 1;
     }
     if ((mpi_err = MPI_File_read(fh, outbuf, 3, MPI_BYTE, &Status))
             != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_read failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_read failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -807,9 +807,9 @@ static int test_mpio_derived_dtype(char *filename) {
         retcode = 0;
     } else {
         /*      if(mpi_rank == 0) {
-        printf("complicated derived datatype is NOT working at this platform\n");
-        printf("go back to hdf5/config and find the corresponding\n");
-        printf("configure-specific file and change ?????\n");
+        HDprintf("complicated derived datatype is NOT working at this platform\n");
+        HDprintf("go back to hdf5/config and find the corresponding\n");
+        HDprintf("configure-specific file and change ?????\n");
         }
         */
         retcode = -1;
@@ -817,16 +817,16 @@ static int test_mpio_derived_dtype(char *filename) {
 
     if ((mpi_err = MPI_File_close(&fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_close failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_close failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     mpi_err = MPI_Barrier(MPI_COMM_WORLD);
     if (retcode == -1) {
         if (mpi_rank == 0) {
-            printf(
+            HDprintf(
                     "Complicated derived datatype is NOT working at this platform\n");
-            printf(" Please report to help@hdfgroup.org about this problem.\n");
+            HDprintf(" Please report to help@hdfgroup.org about this problem.\n");
         }
         retcode = 1;
     }
@@ -851,7 +851,7 @@ static int test_mpio_derived_dtype(char *filename) {
  2. This test will fail with the MPI-IO package that doesn't support this. For example,
  mpich 1.2.6.
 
- If this bug has been fixed in the previous not-working package, this test will issue a printf message to tell the developer to change
+ If this bug has been fixed in the previous not-working package, this test will issue a HDprintf message to tell the developer to change
  the configuration specific file of HDF5 so that we can change our configurationsetting to support special collective IO; currently only special collective IO.
 
  If it turns out that the previous working MPI-IO package no longer works, this test will also issue a message to inform the corresponding failure so that
@@ -898,26 +898,26 @@ static int test_mpio_special_collective(char *filename) {
         if ((mpi_err = MPI_Type_create_hindexed(2, blocklens, offsets, etype,
                 &filetype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
 
         if ((mpi_err = MPI_Type_commit(&filetype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
 
         if ((mpi_err = MPI_Type_create_hindexed(2, blocklens, offsets, etype,
                 &buftype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
 
         if ((mpi_err = MPI_Type_commit(&buftype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+            HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
     } /* end if */
@@ -931,7 +931,7 @@ static int test_mpio_special_collective(char *filename) {
             MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL, &fh))
             != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_open failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     } /* end if */
 
@@ -943,7 +943,7 @@ static int test_mpio_special_collective(char *filename) {
     if ((mpi_err = MPI_File_set_view(fh, mpi_off, MPI_BYTE, filetype, filerep,
             MPI_INFO_NULL)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_set_view failed (%s)\n", mpi_err_str);
+        HDprintf("MPI_File_set_view failed (%s)\n", mpi_err_str);
         return 1;
     } /* end if */
 
@@ -951,7 +951,7 @@ static int test_mpio_special_collective(char *filename) {
     if ((mpi_err = MPI_File_write_at_all(fh, mpi_off, writedata, bufcount,
             buftype, &mpi_stat)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n",
+        HDprintf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n",
                 (long) mpi_off, bufcount, mpi_err_str);
         return 1;
     } /* end if */
@@ -959,7 +959,7 @@ static int test_mpio_special_collective(char *filename) {
     /* Close the file */
     if ((mpi_err = MPI_File_close(&fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        printf("MPI_File_close failed. \n");
+        HDprintf("MPI_File_close failed. \n");
         return 1;
     } /* end if */
 
@@ -967,8 +967,8 @@ static int test_mpio_special_collective(char *filename) {
     mpi_err = MPI_Barrier(MPI_COMM_WORLD);
     if (retcode != 0) {
         if (mpi_rank == 0) {
-            printf("special collective IO is NOT working at this platform\n");
-            printf(" Please report to help@hdfgroup.org about this problem.\n");
+            HDprintf("special collective IO is NOT working at this platform\n");
+            HDprintf(" Please report to help@hdfgroup.org about this problem.\n");
         } /* end if */
         retcode = 1;
     } /* end if */
@@ -1024,15 +1024,15 @@ static int parse_options(int argc, char **argv) {
         for (i = 0; i < n; i++)
             if (h5_fixname(FILENAME[i], plist, filenames[i],
                     sizeof(filenames[i])) == NULL) {
-                printf("h5_fixname failed\n");
+                HDprintf("h5_fixname failed\n");
                 nerrors++;
                 return (1);
             }
         H5Pclose(plist);
         if (VERBOSE_MED) {
-            printf("Test filenames are:\n");
+            HDprintf("Test filenames are:\n");
             for (i = 0; i < n; i++)
-                printf("    %s\n", filenames[i]);
+                HDprintf("    %s\n", filenames[i]);
         }
     }
 
@@ -1043,10 +1043,10 @@ static int parse_options(int argc, char **argv) {
  * Show command usage
  */
 static void usage(void) {
-    printf("Usage: t_mpi [-v<verbosity>] [-f <prefix>]\n");
-    printf("\t-v<verbosity>\tset verbose level (0-9,l,m,h)\n");
-    printf("\t-f <prefix>\tfilename prefix\n");
-    printf("\n");
+    HDprintf("Usage: t_mpi [-v<verbosity>] [-f <prefix>]\n");
+    HDprintf("\t-v<verbosity>\tset verbose level (0-9,l,m,h)\n");
+    HDprintf("\t-f <prefix>\tfilename prefix\n");
+    HDprintf("\n");
 }
 
 /*
@@ -1072,7 +1072,7 @@ int main(int argc, char **argv) {
     * calls.  By then, MPI calls may not work.
     */
     if (H5dont_atexit() < 0) {
-        printf("Failed to turn off atexit processing. Continue.\n");
+        HDprintf("Failed to turn off atexit processing. Continue.\n");
     };
     H5open();
     if (parse_options(argc, argv) != 0) {
@@ -1082,9 +1082,9 @@ int main(int argc, char **argv) {
     }
 
     if (MAINPROCESS) {
-        printf("===================================\n");
-        printf("MPI functionality tests\n");
-        printf("===================================\n");
+        HDprintf("===================================\n");
+        HDprintf("MPI functionality tests\n");
+        HDprintf("===================================\n");
     }
 
     if (VERBOSE_MED)
@@ -1103,7 +1103,7 @@ int main(int argc, char **argv) {
     ret_code = test_mpio_1wMr(filenames[0], USENONE);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        printf("***FAILED with %d total errors\n", ret_code);
+        HDprintf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1114,7 +1114,7 @@ int main(int argc, char **argv) {
         ret_code = test_mpio_1wMr(filenames[0], USEATOM);
         ret_code = errors_sum(ret_code);
         if (mpi_rank == 0 && ret_code > 0) {
-            printf("***FAILED with %d total errors\n", ret_code);
+            HDprintf("***FAILED with %d total errors\n", ret_code);
             nerrors += ret_code;
         }
 
@@ -1122,7 +1122,7 @@ int main(int argc, char **argv) {
         ret_code = test_mpio_1wMr(filenames[0], USEFSYNC);
         ret_code = errors_sum(ret_code);
         if (mpi_rank == 0 && ret_code > 0) {
-            printf("***FAILED with %d total errors\n", ret_code);
+            HDprintf("***FAILED with %d total errors\n", ret_code);
             nerrors += ret_code;
         }
     }
@@ -1135,12 +1135,12 @@ int main(int argc, char **argv) {
     ret_code = test_mpio_gb_file(filenames[0]);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        printf("***FAILED with %d total errors\n", ret_code);
+        HDprintf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 #else
     if (mpi_rank==0)
-        printf(" will be skipped on Windows (JIRA HDDFV-8064)\n");
+        HDprintf(" will be skipped on Windows (JIRA HDDFV-8064)\n");
 #endif
 
     /*=======================================
@@ -1150,7 +1150,7 @@ int main(int argc, char **argv) {
     ret_code = test_mpio_overlap_writes(filenames[0]);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        printf("***FAILED with %d total errors\n", ret_code);
+        HDprintf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1161,7 +1161,7 @@ int main(int argc, char **argv) {
     ret_code = test_mpio_derived_dtype(filenames[0]);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        printf("***FAILED with %d total errors\n", ret_code);
+        HDprintf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1171,7 +1171,7 @@ int main(int argc, char **argv) {
     if (mpi_size < 4) {
         MPI_BANNER("MPIO special collective io test SKIPPED.");
         if (mpi_rank == 0)
-            printf("This test needs at least four processes to run.\n");
+            HDprintf("This test needs at least four processes to run.\n");
         ret_code = 0;
         goto sc_finish;
     } /* end if */
@@ -1181,7 +1181,7 @@ int main(int argc, char **argv) {
 
     sc_finish: ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        printf("***FAILED with %d total errors\n", ret_code);
+        HDprintf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1191,14 +1191,14 @@ int main(int argc, char **argv) {
     */
     MPI_Barrier(MPI_COMM_WORLD);
     if (MAINPROCESS) { /* only process 0 reports */
-        printf("===================================\n");
+        HDprintf("===================================\n");
         if (nerrors) {
-            printf("***MPI tests detected %d errors***\n", nerrors);
+            HDprintf("***MPI tests detected %d errors***\n", nerrors);
         }
         else {
-            printf("MPI tests finished with no errors\n");
+            HDprintf("MPI tests finished with no errors\n");
         }
-        printf("===================================\n");
+        HDprintf("===================================\n");
     }
 
     /* turn off alarm */
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 26be360..38f54d0 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -270,10 +270,6 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
         /* set Parallel access with communicator */
         ret = H5Pset_fapl_mpio(ret_pl, comm, info);
         VRFY((ret >= 0), "");
-        ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE);
-        VRFY((ret >= 0), "");
-        ret = H5Pset_coll_metadata_write(ret_pl, TRUE);
-        VRFY((ret >= 0), "");
         return(ret_pl);
     }
 
@@ -514,9 +510,6 @@ int main(int argc, char **argv)
             "test cause for broken collective io",
             PARATESTFILE);
 
-    AddTest("edpl", test_plist_ed, NULL,
-            "encode/decode Property Lists", NULL);
-
     if((mpi_size < 2) && MAINPROCESS) {
         HDprintf("File Image Ops daisy chain test needs at least 2 processes.\n");
         HDprintf("File Image Ops daisy chain test will be skipped \n");
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index fd19e1f..5cbd1fa 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -19,7 +19,7 @@
 #include "testpar.h"
 
 enum H5TEST_COLL_CHUNK_API {API_NONE=0,API_LINK_HARD,
-	                    API_MULTI_HARD,API_LINK_TRUE,API_LINK_FALSE,
+                        API_MULTI_HARD,API_LINK_TRUE,API_LINK_FALSE,
                             API_MULTI_COLL,API_MULTI_IND};
 
 #ifndef FALSE
@@ -32,20 +32,20 @@ enum H5TEST_COLL_CHUNK_API {API_NONE=0,API_LINK_HARD,
 
 
 /* Constants definitions */
-#define DIM0		600 	/* Default dataset sizes. */
-#define DIM1		1200	/* Values are from a monitor pixel sizes */
-#define ROW_FACTOR	8 	/* Nominal row factor for dataset size */
-#define COL_FACTOR	16	/* Nominal column factor for dataset size */
-#define RANK		2
-#define DATASETNAME1	"Data1"
-#define DATASETNAME2	"Data2"
-#define DATASETNAME3	"Data3"
-#define DATASETNAME4	"Data4"
-#define DATASETNAME5	"Data5"
-#define DATASETNAME6	"Data6"
-#define DATASETNAME7	"Data7"
-#define DATASETNAME8	"Data8"
-#define DATASETNAME9	"Data9"
+#define DIM0        600     /* Default dataset sizes. */
+#define DIM1        1200    /* Values are from a monitor pixel sizes */
+#define ROW_FACTOR    8     /* Nominal row factor for dataset size */
+#define COL_FACTOR    16    /* Nominal column factor for dataset size */
+#define RANK        2
+#define DATASETNAME1    "Data1"
+#define DATASETNAME2    "Data2"
+#define DATASETNAME3    "Data3"
+#define DATASETNAME4    "Data4"
+#define DATASETNAME5    "Data5"
+#define DATASETNAME6    "Data6"
+#define DATASETNAME7    "Data7"
+#define DATASETNAME8    "Data8"
+#define DATASETNAME9    "Data9"
 
 /* point selection order */
 #define IN_ORDER 1
@@ -179,14 +179,14 @@ enum H5TEST_COLL_CHUNK_API {API_NONE=0,API_LINK_HARD,
 
 /* Definitions of the selection mode for the no_collective_cause_tests function. */
 #define TEST_COLLECTIVE                                 0x001
-#define TEST_SET_INDEPENDENT                            0x002 
+#define TEST_SET_INDEPENDENT                            0x002
 #define TEST_DATATYPE_CONVERSION                        0x004
 #define TEST_DATA_TRANSFORMS                            0x008
 #define TEST_NOT_SIMPLE_OR_SCALAR_DATASPACES            0x010
 #define TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT  0x020
 #define TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL 0x040
 #define TEST_FILTERS                                    0x080
-/* TEST_FILTERS will take place of this after supporting mpio + filter for 
+/* TEST_FILTERS will take place of this after supporting mpio + filter for
  * H5Dcreate and H5Dwrite */
 #define TEST_FILTERS_READ                               0x100
 
@@ -209,8 +209,8 @@ enum H5TEST_COLL_CHUNK_API {API_NONE=0,API_LINK_HARD,
 /* type definitions */
 typedef struct H5Ptest_param_t  /* holds extra test parameters */
 {
-    char	*name;
-    int		count;
+    char    *name;
+    int        count;
 } H5Ptest_param_t;
 
 /* Dataset data type.  Int's can be easily octo dumped. */
@@ -218,19 +218,19 @@ typedef int DATATYPE;
 
 /* Shape Same Tests Definitions */
 typedef enum {
-    IND_CONTIG,		/* Independent IO on contigous datasets */
-    COL_CONTIG,		/* Collective IO on contigous datasets */
-    IND_CHUNKED,	/* Independent IO on chunked datasets */
-    COL_CHUNKED		/* Collective IO on chunked datasets */
+    IND_CONTIG,        /* Independent IO on contigous datasets */
+    COL_CONTIG,        /* Collective IO on contigous datasets */
+    IND_CHUNKED,    /* Independent IO on chunked datasets */
+    COL_CHUNKED        /* Collective IO on chunked datasets */
 } ShapeSameTestMethods;
 
 /* Shared global variables */
-extern int dim0, dim1;				/*Dataset dimensions */
-extern int chunkdim0, chunkdim1;		/*Chunk dimensions */
-extern int nerrors;				/*errors count */
-extern H5E_auto2_t old_func;			/* previous error handler */
-extern void *old_client_data;			/*previous error handler arg.*/
-extern int facc_type;				/*Test file access type */
+extern int dim0, dim1;                /*Dataset dimensions */
+extern int chunkdim0, chunkdim1;        /*Chunk dimensions */
+extern int nerrors;                /*errors count */
+extern H5E_auto2_t old_func;            /* previous error handler */
+extern void *old_client_data;            /*previous error handler arg.*/
+extern int facc_type;                /*Test file access type */
 extern int dxfer_coll_type;
 
 /* Test program prototypes */
@@ -238,6 +238,7 @@ void zero_dim_dset(void);
 void multiple_dset_write(void);
 void multiple_group_write(void);
 void multiple_group_read(void);
+void collective_group_write_independent_group_read(void);
 void collective_group_write(void);
 void independent_group_read(void);
 void test_fapl_mpio_dup(void);
diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c
index 5edc5b6..fdc165e 100644
--- a/tools/h5copy/h5copygentest.c
+++ b/tools/h5copy/h5copygentest.c
@@ -543,7 +543,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     sid = H5Screate_simple(1, dims1, NULL);
     if (sid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -551,7 +551,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     oid = H5Dcreate2 (loc_id, OBJ_REF_DS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -559,7 +559,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = H5Dwrite(oid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -572,7 +572,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     oid = H5Gcreate2 (loc_id, OBJ_REF_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -581,14 +581,14 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = H5Rcreate (&or_data[0], loc_id, OBJ_REF_DS, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
     status = H5Rcreate (&or_data[1], loc_id, OBJ_REF_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -596,7 +596,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     sid = H5Screate_simple (1, dims2, NULL);
     if (sid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -604,7 +604,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     oid = H5Dcreate2 (loc_id, "Dset_OBJREF", H5T_STD_REF_OBJ, sid, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
     if (oid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -612,7 +612,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = H5Dwrite(oid, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, or_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -652,7 +652,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     sid = H5Screate_simple (2, dims2, NULL);
     if (sid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -661,7 +661,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     oid2 = H5Dcreate2 (loc_id, REG_REF_DS2, H5T_STD_I8LE, sid, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
     if (oid2 < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -670,7 +670,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Dwrite (oid2, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -679,7 +679,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Sselect_elements (sid, H5S_SELECT_SET, 4, coords[0]);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -688,7 +688,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Rcreate (&rr_data[0], loc_id, REG_REF_DS2, H5R_DATASET_REGION, sid);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -697,7 +697,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Sselect_hyperslab (sid, H5S_SELECT_SET, start, stride, count, block);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -706,7 +706,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Rcreate (&rr_data[1], loc_id, REG_REF_DS2, H5R_DATASET_REGION, sid);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -717,7 +717,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     sid = H5Screate_simple (1, dims1, NULL);
     if (sid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -726,7 +726,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     oid1 = H5Dcreate2 (loc_id, REG_REF_DS1, H5T_STD_REF_DSETREG, sid, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
     if (oid1 < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -735,7 +735,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Dwrite (oid1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rr_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -765,7 +765,7 @@ static void Test_Obj_Copy(void)
     fid = H5Fcreate(HDF_FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0)
     {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE1);
         goto out;
     }
 
@@ -797,19 +797,19 @@ static void Test_Ref_Copy(void)
     fid = H5Fcreate (HDF_FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0)
     {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE2);
         goto out;
     }
 
     /* add object reference */
     status = gen_obj_ref(fid);
     if (status < 0)
-        fprintf(stderr, "Failed to generate object reference.\n");
+        HDfprintf(stderr, "Failed to generate object reference.\n");
 
     /* add region reference */
     status = gen_region_ref(fid);
     if (status < 0)
-        fprintf(stderr, "Failed to generate region reference.\n");
+        HDfprintf(stderr, "Failed to generate region reference.\n");
 
 out:
     /*-----------------------------------------------------------------------
@@ -840,7 +840,7 @@ static herr_t gen_extlink_trg(hid_t loc_id)
     gid = H5Gcreate2(loc_id, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -856,7 +856,7 @@ static herr_t gen_extlink_trg(hid_t loc_id)
      status = H5Tcommit2(loc_id, "datatype", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -889,7 +889,7 @@ static herr_t gen_extlink_src(hid_t loc_id)
     gid = H5Gcreate2(loc_id, "/group_ext", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -901,7 +901,7 @@ static herr_t gen_extlink_src(hid_t loc_id)
     status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/simple", gid, "extlink_dset", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -910,7 +910,7 @@ static herr_t gen_extlink_src(hid_t loc_id)
     status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/group", gid, "extlink_grp", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -919,7 +919,7 @@ static herr_t gen_extlink_src(hid_t loc_id)
     status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/datatype", gid, "extlink_datatype", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -928,7 +928,7 @@ static herr_t gen_extlink_src(hid_t loc_id)
     status = H5Lcreate_external(HDF_EXT_TRG_FILE, "notyet", gid, "extlink_notyet1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -937,7 +937,7 @@ static herr_t gen_extlink_src(hid_t loc_id)
     status = H5Lcreate_external("notyet_file.h5", "notyet", gid, "extlink_notyet2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -964,26 +964,26 @@ static void Test_Extlink_Copy(void)
     fid1 = H5Fcreate (HDF_EXT_SRC_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0)
     {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_SRC_FILE);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_SRC_FILE);
         goto out;
     }
 
     fid2 = H5Fcreate (HDF_EXT_TRG_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0)
     {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_TRG_FILE);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_TRG_FILE);
         goto out;
     }
 
     /* add links to source external link file */
     status = gen_extlink_src(fid1);
     if (status < 0)
-        fprintf(stderr, "Error: %s> gen_extlink_src failed.\n", HDF_EXT_SRC_FILE);
+        HDfprintf(stderr, "Error: %s> gen_extlink_src failed.\n", HDF_EXT_SRC_FILE);
 
     /* add objs to target external link file */
     status = gen_extlink_trg(fid2);
     if (status < 0)
-        fprintf(stderr, "Error: %s> gen_extlink_trg failed.\n", HDF_EXT_TRG_FILE);
+        HDfprintf(stderr, "Error: %s> gen_extlink_trg failed.\n", HDF_EXT_TRG_FILE);
 
 out:
     /*-----------------------------------------------------------------------
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index d2c3261..f59cb47 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -292,11 +292,11 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
 
     /* create the empty file */
     if ((fid1 = H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        fprintf(stderr, "empty file (%s) creation failed.\n", fname3);
+        HDfprintf(stderr, "empty file (%s) creation failed.\n", fname3);
         goto out;
     }
     if (H5Fclose(fid1) < 0) {
-        fprintf(stderr, "empty file (%s) close failed.\n", fname3);
+        HDfprintf(stderr, "empty file (%s) close failed.\n", fname3);
         goto out;
     }
 
@@ -1047,7 +1047,7 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     * Create file1
     *-----------------------------------------------------------------------*/
     if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1057,28 +1057,28 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     */
     f1_gid = H5Gcreate2(fid1, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid2 = H5Gcreate2(fid1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid3 = H5Gcreate2(fid1, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid3 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid4 = H5Gcreate2(fid1, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid4 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1089,13 +1089,13 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     f1_sid = H5Screate_simple(1, dset_dims, NULL);
     f1_did = H5Dcreate2(fid1, "dset", H5T_NATIVE_INT, f1_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_did == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f1_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1106,7 +1106,7 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     f1_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid1, "ntype", f1_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1115,7 +1115,7 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     * Create file2
     *-----------------------------------------------------------------------*/
     if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1125,28 +1125,28 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     */
     f2_gid = H5Gcreate2(fid2, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid2 = H5Gcreate2(fid2, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid3 = H5Gcreate2(fid2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid3 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid4 = H5Gcreate2(fid2, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid4 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1157,13 +1157,13 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     f2_sid = H5Screate_simple(1, dset_dims, NULL);
     f2_did = H5Dcreate2(fid2, "dset", H5T_NATIVE_INT, f2_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_did == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f2_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1174,7 +1174,7 @@ static int test_attributes_verbose_level(const char *fname1, const char *fname2)
     f2_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid2, "ntype", f2_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1405,7 +1405,7 @@ static int test_link_name(const char *fname1)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1415,7 +1415,7 @@ static int test_link_name(const char *fname1)
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1423,7 +1423,7 @@ static int test_link_name(const char *fname1)
             H5P_DEFAULT);
 
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1433,14 +1433,14 @@ static int test_link_name(const char *fname1)
     *------------------------------------------------------------------------*/
     status = H5Lcreate_soft("group", fid1, "link_g1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("group_longname", fid1, "link_g2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1480,7 +1480,7 @@ static int test_soft_links(const char *fname1)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1490,7 +1490,7 @@ static int test_soft_links(const char *fname1)
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1501,21 +1501,21 @@ static int test_soft_links(const char *fname1)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1526,42 +1526,42 @@ static int test_soft_links(const char *fname1)
     /* file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/no_obj", fid1, "softlink_noexist", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1601,7 +1601,7 @@ static int test_linked_softlinks(const char *fname1)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1611,21 +1611,21 @@ static int test_linked_softlinks(const char *fname1)
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid1, "target_group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3 = H5Gcreate2(fid1, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid3 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1636,20 +1636,20 @@ static int test_linked_softlinks(const char *fname1)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1661,84 +1661,84 @@ static int test_linked_softlinks(const char *fname1)
     * file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink1_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_dset1", fid1, "softlink1_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_slink1", fid1, "softlink1_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink2_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_dset2", fid1, "softlink2_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_slink1", fid1, "softlink2_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group1", fid1, "softlink3_to_group1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_group1", fid1, "softlink3_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_slink1", fid1, "softlink3_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group2", fid1, "softlink4_to_group2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_group2", fid1, "softlink4_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_slink1", fid1, "softlink4_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1783,7 +1783,7 @@ static int test_external_links(const char *fname1, const char *fname2)
     /* source file */
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1791,7 +1791,7 @@ static int test_external_links(const char *fname1, const char *fname2)
     /* target file */
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1803,14 +1803,14 @@ static int test_external_links(const char *fname1, const char *fname2)
     * target file */
     gid1 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid2, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1821,21 +1821,21 @@ static int test_external_links(const char *fname1, const char *fname2)
     * target file */
     status = write_dset(fid2, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "x_dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "x_dset", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1847,42 +1847,42 @@ static int test_external_links(const char *fname1, const char *fname2)
     /* source file */
     status = H5Lcreate_external(fname2, "/target_group/x_dset", fid1, "ext_link_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group2/x_dset", fid1, "ext_link_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group", fid1, "/ext_link_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group2", fid1, "/ext_link_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link_noexist1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link_noexist2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1927,7 +1927,7 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     /* source file */
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1935,7 +1935,7 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     /* target file */
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1946,7 +1946,7 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     /* target file */
     gid2 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1958,14 +1958,14 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * target file */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1977,14 +1977,14 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * target file */
     status = H5Lcreate_soft("/dset1", fid2, "softlink_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "softlink_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1996,21 +1996,21 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * source file */
     status = H5Lcreate_external(fname2, "/target_group", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/softlink_to_dset1", fid1, "ext_link_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/softlink_to_dset2", fid1, "ext_link_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2050,14 +2050,14 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2068,14 +2068,14 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2083,14 +2083,14 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2101,28 +2101,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     /* file 1 */
     status = H5Lcreate_soft("no_obj", fid1, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset1", fid1, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid1, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj1", fid1, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2130,28 +2130,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     /* file 2 */
     status = H5Lcreate_soft("no_obj", fid2, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid2, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj2", fid2, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2162,28 +2162,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     /* file1 */
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/dset1", fid1, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2191,28 +2191,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     /* file2 */
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/dset2", fid2, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid2, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2253,14 +2253,14 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2271,28 +2271,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     gid1_f1 = H5Gcreate2(fid1, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1_f1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2_f1 = H5Gcreate2(fid1, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2_f1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3_f1 = H5Gcreate2(fid1, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid3_f1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid10_f1 = H5Gcreate2(fid1, "/grp10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid10_f1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2300,28 +2300,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     gid1_f2 = H5Gcreate2(fid2, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1_f2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2_f2 = H5Gcreate2(fid2, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2_f2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid3_f2 = H5Gcreate2(fid2, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid3_f2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid11_f2 = H5Gcreate2(fid2, "/grp11", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid11_f2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2332,21 +2332,21 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2354,21 +2354,21 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2379,54 +2379,54 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(gid1_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid2_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid3_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid10_f1, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid10_f1, 2, dims2, "dset5", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2434,54 +2434,54 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(gid1_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid2_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid3_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid11_f2, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid11_f2, 2, dims2, "dset5", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2492,28 +2492,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file 1 */
     status = H5Lcreate_soft("/grp1", fid1, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid1, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid1, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp10", fid1, "slink_grp10", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2521,28 +2521,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file 2 */
     status = H5Lcreate_soft("/grp1", fid2, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid2, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid2, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp11", fid2, "slink_grp11", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2553,21 +2553,21 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp1", fid1, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2", fid1, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2/grp3", fid1, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2575,21 +2575,21 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp1", fid2, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2", fid2, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2/grp3", fid2, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2601,14 +2601,14 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp11", gid10_f1, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp10", gid11_f2, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2682,28 +2682,28 @@ static int test_group_recurse2(void)
     *------------------------------------------------------------------------*/
     grp1 = H5Gcreate2(fileid1, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp2 = H5Gcreate2(grp1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp3 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp4 = H5Gcreate2(grp3, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp4 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
@@ -2778,7 +2778,7 @@ static int test_group_recurse2(void)
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
@@ -2802,7 +2802,7 @@ static int test_group_recurse2(void)
     */
     grp4 = H5Gcreate2(fileid4, "/g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp4 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3);
         status = FAIL;
         goto out;
     }
@@ -2836,14 +2836,14 @@ static int test_group_recurse2(void)
     */
     grp2 = H5Gcreate2(fileid3, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp3 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
@@ -2867,7 +2867,7 @@ static int test_group_recurse2(void)
     */
     status = H5Lcreate_external(GRP_RECURSE2_EXT3, "/g4", fileid3, "/g2/g3/g4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
@@ -2888,7 +2888,7 @@ static int test_group_recurse2(void)
     */
     grp1 = H5Gcreate2(fileid2, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
@@ -2912,7 +2912,7 @@ static int test_group_recurse2(void)
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid2, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
     }
@@ -2922,7 +2922,7 @@ static int test_group_recurse2(void)
     */
     status = H5Lcreate_external(GRP_RECURSE2_EXT2, "/g2", fileid2, "/g1/g2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1);
+        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
     }
@@ -2975,14 +2975,14 @@ static int test_exclude_obj1(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2993,7 +2993,7 @@ static int test_exclude_obj1(const char *fname1, const char *fname2)
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3002,7 +3002,7 @@ static int test_exclude_obj1(const char *fname1, const char *fname2)
     gid2 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3013,21 +3013,21 @@ static int test_exclude_obj1(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset3", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3035,21 +3035,21 @@ static int test_exclude_obj1(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3096,14 +3096,14 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3114,7 +3114,7 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3122,7 +3122,7 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     /* file2 */
     gid2 = H5Gcreate2(fid2, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3131,7 +3131,7 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     gid3 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     if (gid3 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3142,21 +3142,21 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3164,21 +3164,21 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3224,14 +3224,14 @@ static int test_exclude_obj3(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3242,7 +3242,7 @@ static int test_exclude_obj3(const char *fname1, const char *fname2)
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3253,14 +3253,14 @@ static int test_exclude_obj3(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3268,7 +3268,7 @@ static int test_exclude_obj3(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3590,7 +3590,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     if (is_file_new == 1) {
         fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
         if (fid1 < 0) {
-            fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+            HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
             status = FAIL;
             goto out;
         }
@@ -3598,7 +3598,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     else {
         fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT);
         if (fid1 < 0) {
-            fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
+            HDfprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
             status = FAIL;
             goto out;
         }
@@ -3609,7 +3609,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     *------------------------------------------------------------------------*/
     gid = H5Gcreate2(fid1, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3619,7 +3619,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     *------------------------------------------------------------------------*/
     sid_vlen_str = H5Screate_simple(STR_RANK, dims_vlen_str, NULL);
     if (sid_vlen_str < 0) {
-        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3627,7 +3627,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     tid_vlen_str = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_vlen_str, H5T_VARIABLE);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3637,7 +3637,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     *------------------------------------------------------------------------*/
     sid_fixlen_str = H5Screate_simple(STR_RANK, dims_fixlen_str, NULL);
     if (sid_fixlen_str < 0) {
-        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3645,7 +3645,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     tid_fixlen_str = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_fixlen_str, FIXLEN_STR_SIZE);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3655,7 +3655,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     *------------------------------------------------------------------------*/
     sid_vlen_str_array = H5Screate_simple(STR_RANK, dims_vlen_str_array, NULL);
     if (sid_vlen_str_array < 0) {
-        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3663,7 +3663,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     tid_vlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_vlen_str_array_pre, H5T_VARIABLE);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3671,7 +3671,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Create the array data type for the string array                */
     tid_vlen_str_array = H5Tarray_create2(tid_vlen_str_array_pre, COMP_RANK, dims_vlen_str_array);
     if (tid_vlen_str_array < 0) {
-        fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3681,7 +3681,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     *------------------------------------------------------------------------*/
     sid_fixlen_str_array = H5Screate_simple(STR_RANK, dims_fixlen_str_array, NULL);
     if (sid_fixlen_str_array < 0) {
-        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3689,14 +3689,14 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     tid_fixlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_fixlen_str_array_pre, FIXLEN_STR_ARRY_SIZE);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
     /* Create the array data type for the string array                */
     tid_fixlen_str_array = H5Tarray_create2(tid_fixlen_str_array_pre, COMP_RANK, dims_fixlen_str_array);
     if (tid_fixlen_str_array < 0) {
-        fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3706,7 +3706,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     *------------------------------------------------------------------------*/
     sid_comp = H5Screate_simple(COMP_RANK, dims_comp, NULL);
     if (sid_comp < 0) {
-        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3820,7 +3820,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset1", tid1_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid1_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp1_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3830,7 +3830,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset2", tid2_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid2_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp2_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3840,7 +3840,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset3", tid3_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid3_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp3_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3850,7 +3850,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset4", tid4_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid4_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp4_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3860,7 +3860,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset5", tid5_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid5_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp5_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3870,7 +3870,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset6", tid6_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid6_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp6_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3880,7 +3880,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset7", tid7_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid7_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp7_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3890,7 +3890,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset8", tid8_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid8_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp8_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3906,7 +3906,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     status = H5Dwrite(did_comp, tid9_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp9_buf);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4028,14 +4028,14 @@ static int test_enums(const char *fname)
     enum_val = 0;
     status = H5Tenum_insert(tid, "YIN", &enum_val);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
+        HDfprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
     enum_val = 1;
     status = H5Tenum_insert(tid, "YANG", &enum_val);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
+        HDfprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -4046,13 +4046,13 @@ static int test_enums(const char *fname)
 
     status = write_dset(fid, 1, &dims, "dset1", tid, data1);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
+        HDfprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
     }
     status = write_dset(fid, 1, &dims, "dset2", tid, data2);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
+        HDfprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -4686,7 +4686,7 @@ static void test_data_nocomparables(const char * fname, int make_diffs)
     *------------------------------------------------------------------------*/
     fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -4696,14 +4696,14 @@ static void test_data_nocomparables(const char * fname, int make_diffs)
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -4716,13 +4716,13 @@ static void test_data_nocomparables(const char * fname, int make_diffs)
 
     /*  dset1 */
     if ((did1 = H5Dcreate2(gid1, "dset1", tid_dset1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
+        HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
     if (H5Dwrite(did1, tid_dset1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr1) < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
@@ -4731,7 +4731,7 @@ static void test_data_nocomparables(const char * fname, int make_diffs)
     /*  dset2 */
     status = write_dset(gid1, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
 
@@ -4741,13 +4741,13 @@ static void test_data_nocomparables(const char * fname, int make_diffs)
     /* ---------
     *  dset1 */
     if ((did2 = H5Dcreate2(gid2, "dset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
+        HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
     if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr3) < 0) {
-        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
+        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
@@ -4767,7 +4767,7 @@ static void test_data_nocomparables(const char * fname, int make_diffs)
     * dset2 */
     status = write_dset(gid2, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr3);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
 
@@ -4823,7 +4823,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* file1 */
     fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4831,7 +4831,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* file2 */
     fid2 = H5Fopen(fname2, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fopen failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -4842,7 +4842,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* parent group */
     topgid1 = H5Gcreate2(fid1, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (topgid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4850,14 +4850,14 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* dataset */
     status = write_dset(topgid1, 1, dims, "obj1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         goto out;
     }
 
     /* group */
     gid1 = H5Gcreate2(topgid1, "obj2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4866,7 +4866,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     tid1 = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(topgid1, "obj3", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
         goto out;
     }
 
@@ -4876,7 +4876,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* parent group */
     topgid2 = H5Gcreate2(fid2, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (topgid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -4884,7 +4884,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* group */
     gid2 = H5Gcreate2(topgid2, "obj1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -4893,14 +4893,14 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     tid2 = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(topgid2, "obj2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
         goto out;
     }
 
     /* dataset */
     status = write_dset(topgid2, 1, dims, "obj3", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         goto out;
     }
 
@@ -4997,14 +4997,14 @@ static void test_objs_strings(const char *fname1, const char *fname2)
     /* file1 */
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         goto out;
     }
 
     /* file2 */
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         goto out;
     }
 
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 9b81b8d..9c1dfa3 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1708,7 +1708,7 @@ h5_fileaccess(void)
             for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
                 memb_fapl[mt] = H5P_DEFAULT;
                 memb_map[mt] = mt;
-                sprintf(sv[mt], "%%s-%c.h5", multi_letters[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);
             }
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index 7c0a05b..46373d2 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -842,7 +842,7 @@ dump_group(hid_t gid, const char *name)
             if(!type_table->objs[u].recorded) {
                 dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
                 type = H5Dget_type(dset);
-                sprintf(type_name, "#"H5_PRINTF_HADDR_FMT, type_table->objs[u].objno);
+                HDsprintf(type_name, "#"H5_PRINTF_HADDR_FMT, type_table->objs[u].objno);
                 dump_function_table->dump_named_datatype_function(type, type_name);
                 H5Tclose(type);
                 H5Dclose(dset);
@@ -1964,7 +1964,7 @@ handle_datatypes(hid_t fid, const char *type, void H5_ATTR_UNUSED * data, int pe
 
             if(!type_table->objs[idx].recorded) {
                 /* unamed datatype */
-                sprintf(name, "/#"H5_PRINTF_HADDR_FMT, type_table->objs[idx].objno);
+                HDsprintf(name, "/#"H5_PRINTF_HADDR_FMT, type_table->objs[idx].objno);
 
                 if(!HDstrcmp(name, real_name))
                     break;
diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c
index 15a059b..95b81b5 100644
--- a/tools/h5dump/h5dump_xml.c
+++ b/tools/h5dump/h5dump_xml.c
@@ -586,7 +586,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
             if (objno == HADDR_UNDEF) {
                 if (gen) {
                     objno = ref_path_table_gen_fake(str);
-                    sprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
+                    HDsprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
                     return 0;
                 }
                 else {
@@ -597,7 +597,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
         else {
             if (gen) {
                 objno = ref_path_table_gen_fake(str);
-                sprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
+                HDsprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
                 return 0;
             }
             else {
@@ -606,7 +606,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
         }
     }
 
-    sprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
+    HDsprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
 
     return(0);
 }
@@ -2685,7 +2685,7 @@ xml_dump_group(hid_t gid, const char *name)
                         if(!type_table->objs[u].recorded) {
                             dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
                             type = H5Dget_type(dset);
-                            sprintf(type_name, "#"H5_PRINTF_HADDR_FMT, type_table->objs[u].objno);
+                            HDsprintf(type_name, "#"H5_PRINTF_HADDR_FMT, type_table->objs[u].objno);
                             dump_function_table->dump_named_datatype_function(type, type_name);
                             H5Tclose(type);
                             H5Dclose(dset);
@@ -2767,7 +2767,7 @@ xml_dump_group(hid_t gid, const char *name)
                 if(!type_table->objs[u].recorded) {
                     dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
                     type = H5Dget_type(dset);
-                    sprintf(type_name, "#"H5_PRINTF_HADDR_FMT, type_table->objs[u].objno);
+                    HDsprintf(type_name, "#"H5_PRINTF_HADDR_FMT, type_table->objs[u].objno);
                     dump_function_table->dump_named_datatype_function(type, type_name);
                     H5Tclose(type);
                     H5Dclose(dset);
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 7acf08d..e6ddbd9 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -542,7 +542,7 @@ gent_attribute(void)
     dims[0] = 24;
     space = H5Screate_simple(1, dims, NULL);
     attr = H5Acreate2(root, "/attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    sprintf(buf, "attribute of root group");
+    HDsprintf(buf, "attribute of root group");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -1352,7 +1352,7 @@ static void gent_all(void)
     dims[0] = 10;
     space = H5Screate_simple(1, dims, NULL);
     attr = H5Acreate2(group, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    sprintf(buf, "abcdefghi");
+    HDsprintf(buf, "abcdefghi");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -1383,7 +1383,7 @@ static void gent_all(void)
     dims[0] = 27;
     space = H5Screate_simple(1, dims, NULL);
     attr = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    sprintf(buf, "1st attribute of dset1.1.1");
+    HDsprintf(buf, "1st attribute of dset1.1.1");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -1391,7 +1391,7 @@ static void gent_all(void)
     dims[0] = 27;
     space = H5Screate_simple(1, dims, NULL);
     attr = H5Acreate2(dataset, "attr2", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    sprintf(buf, "2nd attribute of dset1.1.1");
+    HDsprintf(buf, "2nd attribute of dset1.1.1");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -1587,7 +1587,7 @@ gent_many(void)
     dims[0] = 10;
     space2 = H5Screate_simple(1, dims, NULL);
     attr = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space2, H5P_DEFAULT, H5P_DEFAULT);
-    sprintf(buf, "abcdefghi");
+    HDsprintf(buf, "abcdefghi");
     H5Awrite(attr, H5T_NATIVE_CHAR, buf);
     H5Sclose(space2);
     H5Aclose(attr);
@@ -1906,9 +1906,9 @@ static void gent_str2(void)
     dims[0] = 3;
     space2 = H5Screate_simple(1, dims, NULL);
     attr = H5Acreate2(dataset, "attr1", fxdlenstr2, space2, H5P_DEFAULT, H5P_DEFAULT);
-    sprintf(&(buf2[0*LENSTR2]), "0123456789");
-    sprintf(&(buf2[1*LENSTR2]), "abcdefghij");
-    sprintf(&(buf2[2*LENSTR2]), "ABCDEFGHIJ");
+    HDsprintf(&(buf2[0*LENSTR2]), "0123456789");
+    HDsprintf(&(buf2[1*LENSTR2]), "abcdefghij");
+    HDsprintf(&(buf2[2*LENSTR2]), "ABCDEFGHIJ");
     H5Awrite(attr, fxdlenstr2, buf2);
     H5Sclose(space2);
     H5Tclose(fxdlenstr2);
@@ -1920,7 +1920,7 @@ static void gent_str2(void)
 
     for(i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        sprintf(buf, "This is row %1d of type H5T_STR_NULLTERM of", i);
+        HDsprintf(buf, "This is row %1d of type H5T_STR_NULLTERM of", i);
         H5Tset_size(memtype, HDstrlen(buf)+1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
@@ -1933,7 +1933,7 @@ static void gent_str2(void)
 
     for(i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        sprintf(buf, "This is row %1d of type H5T_STR_NULLTERM of string array", i);
+        HDsprintf(buf, "This is row %1d of type H5T_STR_NULLTERM of string array", i);
         H5Tset_size(memtype, HDstrlen(buf)+1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
@@ -1953,7 +1953,7 @@ static void gent_str2(void)
 
     for(i = 0;(hsize_t) i < sdim; i++) {
         start[0] = (hsize_t)i;
-        sprintf(buf, "This is row %1d of type H5T_STR_NULLPAD of", i);
+        HDsprintf(buf, "This is row %1d of type H5T_STR_NULLPAD of", i);
         H5Tset_size(memtype, HDstrlen(buf)+1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
@@ -1967,7 +1967,7 @@ static void gent_str2(void)
 
     for(i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        sprintf(buf, "This is row %1d of type H5T_STR_NULLPAD of string array", i);
+        HDsprintf(buf, "This is row %1d of type H5T_STR_NULLPAD of string array", i);
         H5Tset_size(memtype, HDstrlen(buf)+1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
@@ -1986,7 +1986,7 @@ static void gent_str2(void)
 
     for(i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        sprintf(buf, "This is row %1d of type H5T_STR_SPACEPAD of", i);
+        HDsprintf(buf, "This is row %1d of type H5T_STR_SPACEPAD of", i);
         H5Tset_size(memtype, HDstrlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
@@ -2000,7 +2000,7 @@ static void gent_str2(void)
 
     for(i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        sprintf(buf, "This is row %1d of type H5T_STR_SPACEPAD of string array", i);
+        HDsprintf(buf, "This is row %1d of type H5T_STR_SPACEPAD of string array", i);
         H5Tset_size(memtype, HDstrlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
@@ -3737,7 +3737,7 @@ void gent_multi(void)
     for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
         memb_fapl[mt] = H5P_DEFAULT;
         memb_map[mt] = mt;
-        sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
+        HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
         memb_name[mt] = sv[mt];
         /*printf("memb_name[%d]=%s, memb_map[%d]=%d; ", mt, memb_name[mt], mt, memb_map[mt]);*/
         memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
@@ -3778,7 +3778,7 @@ static void gent_large_objname(void)
     group = H5Gcreate2(fid, "this_is_a_large_group_name", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     for(i = 0; i < 50; ++i) {
-        sprintf(grp_name, "this_is_a_large_group_name%d", i);
+        HDsprintf(grp_name, "this_is_a_large_group_name%d", i);
         group2 = H5Gcreate2(group, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         H5Gclose(group2);
     }
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 16c0d8c..1eef5ab 100644
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -3753,7 +3753,7 @@ void setDefaultValues(struct Input *in, int count)
     in->path.count = 1;
 
     HDstrcpy(temp, "dataset");
-    sprintf(num, "%d", count);
+    HDsprintf(num, "%d", count);
     HDstrcat(temp, num);
     HDstrcpy(in->path.group[0], temp);
 
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index bbb67b6..27995d2 100644
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -183,8 +183,8 @@ main(void)
        for (i = 0; i < nrow; i++)
        {
            for (j = 0; j < ncol; j++)
-               (void) fprintf(sp, "%10u", b8i3[k][i][j]);
-           (void) fprintf(sp, "\n");
+               (void) HDfprintf(sp, "%10u", b8i3[k][i][j]);
+           (void) HDfprintf(sp, "\n");
        }
     }
     (void) HDfclose(sp);
@@ -200,8 +200,8 @@ main(void)
       for (i = 0; i < nrow; i++)
       {
           for (j = 0; j < ncol; j++)
-              (void) fprintf(sp, "%10u", b16i3[k][i][j]);
-          (void) fprintf(sp, "\n");
+              (void) HDfprintf(sp, "%10u", b16i3[k][i][j]);
+          (void) HDfprintf(sp, "\n");
       }
     }
     (void) HDfclose(sp);
@@ -217,8 +217,8 @@ main(void)
         for (i = 0; i < nrow; i++)
         {
             for (j = 0; j < ncol; j++)
-                (void) fprintf(sp, "%10d", b32i3[k][i][j]);
-            (void) fprintf(sp, "\n");
+                (void) HDfprintf(sp, "%10d", b32i3[k][i][j]);
+            (void) HDfprintf(sp, "\n");
         }
     }
     (void) HDfclose(sp);
@@ -243,16 +243,16 @@ main(void)
     (void) HDfclose(sp);
 
     sp = HDfopen("binin32.conf", "w");
-    (void) fprintf(sp, "PATH /int/bin/32-bit\n");
-    (void) fprintf(sp, "INPUT-CLASS IN\n");
-    (void) fprintf(sp, "INPUT-SIZE    32\n");
-    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void) fprintf(sp, "RANK 3\n");
-    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
-    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
-    (void) fprintf(sp, "\n");
+    (void) HDfprintf(sp, "PATH /int/bin/32-bit\n");
+    (void) HDfprintf(sp, "INPUT-CLASS IN\n");
+    (void) HDfprintf(sp, "INPUT-SIZE    32\n");
+    (void) HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) HDfprintf(sp, "RANK 3\n");
+    (void) HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) HDfprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void) HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
+    (void) HDfprintf(sp, "\n");
     (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
@@ -274,15 +274,15 @@ main(void)
     (void) HDfclose(sp);
 
     sp = HDfopen("binuin32.conf", "w");
-    (void) fprintf(sp, "PATH /int/buin/32-bit\n");
-    (void) fprintf(sp, "INPUT-CLASS UIN\n");
-    (void) fprintf(sp, "INPUT-SIZE    32\n");
-    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void) fprintf(sp, "RANK 3\n");
-    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void) fprintf(sp, "\n");
+    (void) HDfprintf(sp, "PATH /int/buin/32-bit\n");
+    (void) HDfprintf(sp, "INPUT-CLASS UIN\n");
+    (void) HDfprintf(sp, "INPUT-SIZE    32\n");
+    (void) HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) HDfprintf(sp, "RANK 3\n");
+    (void) HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) HDfprintf(sp, "\n");
     (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
@@ -304,17 +304,17 @@ main(void)
     (void) HDfclose(sp);
 
     sp = HDfopen("binin16.conf", "w");
-    (void) fprintf(sp, "PATH /int/bin/16-bit\n");
-    (void) fprintf(sp, "INPUT-CLASS IN\n");
-    (void) fprintf(sp, "INPUT-SIZE    16\n");
-    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void) fprintf(sp, "RANK 3\n");
-    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
-    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
-    (void) fprintf(sp, "\n");
+    (void) HDfprintf(sp, "PATH /int/bin/16-bit\n");
+    (void) HDfprintf(sp, "INPUT-CLASS IN\n");
+    (void) HDfprintf(sp, "INPUT-SIZE    16\n");
+    (void) HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) HDfprintf(sp, "RANK 3\n");
+    (void) HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) HDfprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void) HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void) HDfprintf(sp, "\n");
     (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
@@ -335,17 +335,17 @@ main(void)
     (void) HDfclose(sp);
 
     sp = HDfopen("binuin16.conf", "w");
-    (void) fprintf(sp, "PATH /int/buin/16-bit\n");
-    (void) fprintf(sp, "INPUT-CLASS UIN\n");
-    (void) fprintf(sp, "INPUT-SIZE    16\n");
-    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void) fprintf(sp, "RANK 3\n");
-    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
-    (void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
-    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
-    (void) fprintf(sp, "\n");
+    (void) HDfprintf(sp, "PATH /int/buin/16-bit\n");
+    (void) HDfprintf(sp, "INPUT-CLASS UIN\n");
+    (void) HDfprintf(sp, "INPUT-SIZE    16\n");
+    (void) HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) HDfprintf(sp, "RANK 3\n");
+    (void) HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) HDfprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void) HDfprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void) HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void) HDfprintf(sp, "\n");
     (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
@@ -367,20 +367,20 @@ main(void)
     (void) HDfclose(sp);
 
     sp = HDfopen("binin8.conf", "w");
-    (void) fprintf(sp, "PATH /int/bin/8-bit\n");
-    (void) fprintf(sp, "INPUT-CLASS IN\n");
-    (void) fprintf(sp, "INPUT-SIZE    8\n");
-    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void) fprintf(sp, "RANK 3\n");
-    (void) fprintf(sp, "OUTPUT-CLASS IN\n");
-    (void) fprintf(sp, "OUTPUT-SIZE    16\n");
-    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
-    (void) fprintf(sp, "COMPRESSION-PARAM 3\n");
-    (void) fprintf(sp, "\n");
+    (void) HDfprintf(sp, "PATH /int/bin/8-bit\n");
+    (void) HDfprintf(sp, "INPUT-CLASS IN\n");
+    (void) HDfprintf(sp, "INPUT-SIZE    8\n");
+    (void) HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) HDfprintf(sp, "RANK 3\n");
+    (void) HDfprintf(sp, "OUTPUT-CLASS IN\n");
+    (void) HDfprintf(sp, "OUTPUT-SIZE    16\n");
+    (void) HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
+    (void) HDfprintf(sp, "COMPRESSION-PARAM 3\n");
+    (void) HDfprintf(sp, "\n");
     (void) HDfclose(sp);
 
 #endif /* UNICOS */
@@ -408,18 +408,18 @@ main(void)
     (void) HDfclose(sp);
 
     sp = HDfopen("binfp64.conf", "w");
-    (void) fprintf(sp, "PATH /fp/bin/64-bit\n");
-    (void) fprintf(sp, "INPUT-CLASS FP\n");
-    (void) fprintf(sp, "INPUT-SIZE    64\n");
-    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void) fprintf(sp, "RANK 3\n");
-    (void) fprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n");
-    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
-    (void) fprintf(sp, "COMPRESSION-PARAM 8\n");
-    (void) fprintf(sp, "\n");
+    (void) HDfprintf(sp, "PATH /fp/bin/64-bit\n");
+    (void) HDfprintf(sp, "INPUT-CLASS FP\n");
+    (void) HDfprintf(sp, "INPUT-SIZE    64\n");
+    (void) HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) HDfprintf(sp, "RANK 3\n");
+    (void) HDfprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n");
+    (void) HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
+    (void) HDfprintf(sp, "COMPRESSION-PARAM 8\n");
+    (void) HDfprintf(sp, "\n");
     (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
@@ -441,16 +441,16 @@ main(void)
         HDfclose(sp);
 
         sp = HDfopen("binin8w.conf", "w");
-        (void) fprintf(sp, "INPUT-CLASS IN\n");
-        (void) fprintf(sp, "INPUT-SIZE    8\n");
-        (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-        (void) fprintf(sp, "RANK 1\n");
-        (void) fprintf(sp, "OUTPUT-CLASS IN\n");
-        (void) fprintf(sp, "OUTPUT-SIZE    8\n");
-        (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-        (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-        (void) fprintf(sp, "DIMENSION-SIZES 4\n");
-        (void) fprintf(sp, "\n");
+        (void) HDfprintf(sp, "INPUT-CLASS IN\n");
+        (void) HDfprintf(sp, "INPUT-SIZE    8\n");
+        (void) HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+        (void) HDfprintf(sp, "RANK 1\n");
+        (void) HDfprintf(sp, "OUTPUT-CLASS IN\n");
+        (void) HDfprintf(sp, "OUTPUT-SIZE    8\n");
+        (void) HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+        (void) HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+        (void) HDfprintf(sp, "DIMENSION-SIZES 4\n");
+        (void) HDfprintf(sp, "\n");
         (void) HDfclose(sp);
 
     }
diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c
index 12ea6b8..e7a1878 100644
--- a/tools/h5jam/h5jamgentest.c
+++ b/tools/h5jam/h5jamgentest.c
@@ -177,7 +177,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
   dims[0] = 10;
   space = H5Screate_simple(1, dims, NULL);
   attr = H5Acreate2(group, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-  sprintf(buf, "abcdefghi");
+  HDsprintf(buf, "abcdefghi");
   H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
   H5Sclose(space);
   H5Aclose(attr);
@@ -208,7 +208,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
   dims[0] = 27;
   space = H5Screate_simple(1, dims, NULL);
   attr = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-  sprintf(buf, "1st attribute of dset1.1.1");
+  HDsprintf(buf, "1st attribute of dset1.1.1");
   H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
   H5Sclose(space);
   H5Aclose(attr);
@@ -216,7 +216,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
   dims[0] = 27;
   space = H5Screate_simple(1, dims, NULL);
   attr = H5Acreate2(dataset, "attr2", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-  sprintf(buf, "2nd attribute of dset1.1.1");
+  HDsprintf(buf, "2nd attribute of dset1.1.1");
   H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
   H5Sclose(space);
   H5Aclose(attr);
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index dee5145..6b9b079 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -1246,7 +1246,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
                 {
                     unsigned level = cd_values[0];
 
-                    sprintf(temp,"(%d)", level);
+                    HDsprintf(temp,"(%d)", level);
                     HDstrcat(strfilter, temp);
                 }
 #endif
@@ -1260,7 +1260,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
                     unsigned options_mask = cd_values[0]; /* from dcpl, not filt*/
                     unsigned ppb = cd_values[1];
 
-                    sprintf(temp,"(%d,", ppb);
+                    HDsprintf(temp,"(%d,", ppb);
                     HDstrcat(strfilter, temp);
                     if (options_mask & H5_SZIP_EC_OPTION_MASK)
                         HDstrcpy(temp, "EC) ");
@@ -1300,7 +1300,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
 
         HDstrcpy(str, "dset     ");
         HDstrcat(str, strfilter);
-        sprintf(temp, "  (%.3f:1)", ratio);
+        HDsprintf(temp, "  (%.3f:1)", ratio);
         HDstrcat(str, temp);
         printf(FORMAT_OBJ, str, objname);
     }
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 6ab9771..c43a2ee 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -2718,7 +2718,7 @@ int make_early(void)
             goto out;
         if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
             goto out;
-        sprintf(name, "%d", i);
+        HDsprintf(name, "%d", i);
         if ((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
         if (H5Tclose(tid) < 0)
@@ -2743,7 +2743,7 @@ int make_early(void)
     {
         if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
             goto out;
-        sprintf(name, "%d", i);
+        HDsprintf(name, "%d", i);
         if ((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
         if (H5Tclose(tid) < 0)
@@ -2805,7 +2805,7 @@ int make_layout(hid_t loc_id)
     */
     for (i=0; i<4; i++)
     {
-        sprintf(name,"dset%d",i+1);
+        HDsprintf(name,"dset%d",i+1);
         if (write_dset(loc_id,RANK,dims,name,H5T_NATIVE_INT,buf) < 0)
             return -1;
     }
@@ -5792,7 +5792,7 @@ static herr_t add_attr_with_objref(hid_t file_id, hid_t obj_id)
     status = H5Rcreate(&data_attr_objref[0],file_id,NAME_OBJ_DS1,H5R_OBJECT,(hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5801,7 +5801,7 @@ static herr_t add_attr_with_objref(hid_t file_id, hid_t obj_id)
     status = H5Rcreate(&data_attr_objref[1],file_id,NAME_OBJ_GRP,H5R_OBJECT,(hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5810,7 +5810,7 @@ static herr_t add_attr_with_objref(hid_t file_id, hid_t obj_id)
     status = H5Rcreate(&data_attr_objref[2],file_id,NAME_OBJ_NDTYPE,H5R_OBJECT,(hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5819,7 +5819,7 @@ static herr_t add_attr_with_objref(hid_t file_id, hid_t obj_id)
     status = make_attr(obj_id,1,dim_attr_objref,"Attr_OBJREF",H5T_STD_REF_OBJ,data_attr_objref);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> make_attr failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> make_attr failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5861,7 +5861,7 @@ static herr_t add_attr_with_regref(hid_t file_id, hid_t obj_id)
     sid_regrefed_dset = H5Screate_simple (2, dim_regrefed_dset, NULL);
     if (sid_regrefed_dset < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5870,7 +5870,7 @@ static herr_t add_attr_with_regref(hid_t file_id, hid_t obj_id)
     status = H5Sselect_elements (sid_regrefed_dset, H5S_SELECT_SET, (size_t)3, coords_regrefed_dset[0]);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5879,7 +5879,7 @@ static herr_t add_attr_with_regref(hid_t file_id, hid_t obj_id)
     status = H5Rcreate (&data_attr_regref[0], file_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_regrefed_dset);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5888,7 +5888,7 @@ static herr_t add_attr_with_regref(hid_t file_id, hid_t obj_id)
     status = make_attr(obj_id,1,dim_attr_regref,"Attr_REGREF",H5T_STD_REF_DSETREG,data_attr_regref);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> make_attr failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> make_attr failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5934,7 +5934,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
     sid = H5Screate_simple(1, dims1, NULL);
     if (sid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5942,7 +5942,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
     did1 = H5Dcreate2 (loc_id, NAME_OBJ_DS1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (did1 < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5950,7 +5950,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
     status = H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5962,7 +5962,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
     gid = H5Gcreate2 (loc_id, NAME_OBJ_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5975,7 +5975,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
      status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
      if (status < 0)
      {
-        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
      }
@@ -5988,7 +5988,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
     sid2 = H5Screate_simple (2, dims2, NULL);
     if (sid2 < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -5997,7 +5997,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
     did2 = H5Dcreate2 (loc_id, NAME_OBJ_DS2, H5T_STD_I8LE, sid2, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
     if (did2 < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6006,7 +6006,7 @@ static herr_t gen_refered_objs(hid_t loc_id)
     status = H5Dwrite (did2, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6063,7 +6063,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = H5Rcreate (&objref_buf[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6072,7 +6072,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = H5Rcreate (&objref_buf[1], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6081,7 +6081,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = H5Rcreate (&objref_buf[2], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6092,7 +6092,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     sid = H5Screate_simple (1, dims_dset_objref, NULL);
     if (sid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6100,7 +6100,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     oid = H5Dcreate2 (loc_id, "Dset_OBJREF", H5T_STD_REF_OBJ, sid, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
     if (oid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6108,7 +6108,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = H5Dwrite(oid, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, objref_buf);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6121,7 +6121,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = add_attr_with_objref(loc_id, oid);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6130,7 +6130,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
     status = add_attr_with_regref(loc_id, oid);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6183,7 +6183,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     sid_trg = H5Screate_simple (2, dims_trg, NULL);
     if (sid_trg < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6192,7 +6192,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Sselect_elements (sid_trg, H5S_SELECT_SET, (size_t)4, coords[0]);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6201,7 +6201,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Rcreate (&rr_data[0], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6210,7 +6210,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Sselect_hyperslab (sid_trg, H5S_SELECT_SET, start, stride, count, block);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6219,7 +6219,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Rcreate (&rr_data[1], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6228,7 +6228,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     sid_ref = H5Screate_simple (1, dims1, NULL);
     if (sid_ref < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6237,7 +6237,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     oid_ref = H5Dcreate2 (loc_id, REG_REF_DS1, H5T_STD_REF_DSETREG, sid_ref, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
     if (oid_ref < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6246,7 +6246,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = H5Dwrite (oid_ref, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rr_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6259,7 +6259,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = add_attr_with_objref(loc_id, oid_ref);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6268,7 +6268,7 @@ static herr_t gen_region_ref(hid_t loc_id)
     status = add_attr_with_regref(loc_id, oid_ref);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6301,7 +6301,7 @@ static herr_t make_references(hid_t loc_id)
     status = gen_refered_objs(loc_id);
     if (status == FAIL)
     {
-        fprintf(stderr, "Failed to generate referenced object.\n");
+        HDfprintf(stderr, "Failed to generate referenced object.\n");
         ret = FAIL;
     }
 
@@ -6309,7 +6309,7 @@ static herr_t make_references(hid_t loc_id)
     status = gen_obj_ref(loc_id);
     if (status == FAIL)
     {
-        fprintf(stderr, "Failed to generate object reference.\n");
+        HDfprintf(stderr, "Failed to generate object reference.\n");
         ret = FAIL;
     }
 
@@ -6317,7 +6317,7 @@ static herr_t make_references(hid_t loc_id)
     status = gen_region_ref(loc_id);
     if (status == FAIL)
     {
-        fprintf(stderr, "Failed to generate region reference.\n");
+        HDfprintf(stderr, "Failed to generate region reference.\n");
         ret = FAIL;
     }
 
@@ -6441,7 +6441,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Dwrite(objdid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6451,7 +6451,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, objtid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6464,7 +6464,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     main_gid = H5Gcreate2(loc_id, "group_main", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (main_gid < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6479,7 +6479,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Dwrite(main_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6503,7 +6503,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Rcreate (&(comp_objref_data[0].val_objref), loc_id, NAME_OBJ_DS1, H5R_OBJECT,(hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6513,7 +6513,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Rcreate (&(comp_objref_data[1].val_objref), loc_id, NAME_OBJ_GRP, H5R_OBJECT,(hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6523,7 +6523,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Rcreate (&(comp_objref_data[2].val_objref), loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT,(hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6537,7 +6537,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Awrite (comp_objref_aid, comp_objref_tid, comp_objref_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6559,14 +6559,14 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Sselect_elements (objsid, H5S_SELECT_SET, (size_t)4, coords[0]);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
     status = H5Rcreate (&(comp_regref_data[0].val_regref), loc_id, NAME_OBJ_DS1, H5R_DATASET_REGION, objsid);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6580,7 +6580,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Awrite (comp_regref_aid, comp_regref_tid, comp_regref_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6606,7 +6606,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
      status = H5Rcreate (&((hobj_ref_t*)vlen_objref_data[0].p)[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6614,7 +6614,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
      status = H5Rcreate (&((hobj_ref_t*)vlen_objref_data[1].p)[0], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6622,7 +6622,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
      status = H5Rcreate (&((hobj_ref_t*)vlen_objref_data[2].p)[0], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6640,7 +6640,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
      status = H5Awrite (vlen_objref_attr_id, vlen_objref_attr_tid, vlen_objref_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6649,7 +6649,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Dvlen_reclaim (vlen_objref_attr_tid, vlen_objref_attr_sid, H5P_DEFAULT, vlen_objref_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6670,14 +6670,14 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Sselect_elements(objsid, H5S_SELECT_SET, (size_t)4, coords[0]);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
     status = H5Rcreate (&((hdset_reg_ref_t*)vlen_regref_data[0].p)[0], loc_id, NAME_OBJ_DS1, H5R_DATASET_REGION, objsid);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6695,7 +6695,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Awrite(vlen_regref_attr_id, vlen_regref_attr_tid, vlen_regref_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6704,7 +6704,7 @@ static herr_t make_complex_attr_references(hid_t loc_id)
     status = H5Dvlen_reclaim (vlen_regref_attr_tid, vlen_regref_attr_sid, H5P_DEFAULT, vlen_regref_data);
     if (status < 0)
     {
-        fprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
+        HDfprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
         ret = FAIL;
         goto out;
     }
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index 3223c37..b583faa 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -71,7 +71,7 @@ gen_newgrat_file(const char *fname)
 
     /* Create NUM_GRPS groups in the root group */
     for(i = 1; i <= NUM_GRPS; i++) {
-        sprintf(name, "%s%d", GROUP_NAME,i);
+        HDsprintf(name, "%s%d", GROUP_NAME,i);
         if((gid = H5Gcreate2(fid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if(H5Gclose(gid) < 0)
@@ -92,7 +92,7 @@ gen_newgrat_file(const char *fname)
 
     /* Create NUM_ATTRS for the dataset */
     for(i = 1; i <= NUM_ATTRS; i++) {
-        sprintf(attrname, "%s%d", ATTR_NAME,i);
+        HDsprintf(attrname, "%s%d", ATTR_NAME,i);
         if((attr_id = H5Acreate2(did, attrname, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if(H5Aclose(attr_id) < 0)
@@ -172,7 +172,7 @@ gen_threshold_file(const char *fname)
 
     /* Create 11 attributes for the dataset */
     for(i = 1; i <= (THRES_NUM+1); i++) {
-        sprintf(name, "%s%d", THRES_ATTR_NAME,i);
+        HDsprintf(name, "%s%d", THRES_ATTR_NAME,i);
         if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if(H5Aclose(attr_id) < 0)
@@ -199,7 +199,7 @@ gen_threshold_file(const char *fname)
 
     /* Create 10 attributes for the 2-D dataset */
     for(i = 1; i <= THRES_NUM; i++) {
-        sprintf(name, "%s%d", THRES_ATTR_NAME,i);
+        HDsprintf(name, "%s%d", THRES_ATTR_NAME,i);
         if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if(H5Aclose(attr_id) < 0)
@@ -223,7 +223,7 @@ gen_threshold_file(const char *fname)
     /* Create 10 1-D datasets with non-zero dimension size for the group */
     for(i = 1; i <= THRES_NUM; i++) {
         /* set up dataset name */
-        sprintf(name, "%s%d", THRES_DSET_NAME,i);
+        HDsprintf(name, "%s%d", THRES_DSET_NAME,i);
 
         /* Create the dataset */
         if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -246,7 +246,7 @@ gen_threshold_file(const char *fname)
     /* Create 25 attributes for the group */
     for(i = 1; i <= THRES_NUM_25; i++) {
     /* Set up attribute name */
-        sprintf(name, "%s%d", THRES_ATTR_GRP_NAME,i);
+        HDsprintf(name, "%s%d", THRES_ATTR_GRP_NAME,i);
 
         /* Create the attribute */
         if((attr_id = H5Acreate2(gid, name, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -268,7 +268,7 @@ gen_threshold_file(const char *fname)
     /* Create 9 1-D datasets with non-zero dimension size for the group */
     for(i = 1; i < THRES_NUM; i++) {
         /* set up dataset name */
-        sprintf(name, "%s%d", THRES_DSET_NAME,i);
+        HDsprintf(name, "%s%d", THRES_DSET_NAME,i);
 
         /* Create the dataset */
         if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index f758b1f..245b5a1 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
     } /* end if */
     if(HDstrchr(argv[1], '%'))
         if(H5Pset_fapl_family (fapl, (hsize_t)0, H5P_DEFAULT) < 0) {
-            fprintf(stderr, "cannot set file access property list\n");
+            HDfprintf(stderr, "cannot set file access property list\n");
             HDexit(1);
         }
     if((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) {
diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c
index f6252b2..dea27d4 100644
--- a/tools/misc/h5repart.c
+++ b/tools/misc/h5repart.c
@@ -66,18 +66,18 @@
 static void
 usage (const char *progname)
 {
-    fprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2] SRC DST\n",
+    HDfprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2] SRC DST\n",
 	    progname);
-    fprintf(stderr, "   -v     Produce verbose output\n");
-    fprintf(stderr, "   -V     Print a version number and exit\n");
-    fprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
-    fprintf(stderr, "   -m N   The destination member size or 1GB\n");
-    fprintf(stderr, "   -family_to_sec2   Change file driver from family to sec2\n");
-    fprintf(stderr, "   SRC    The name of the source file\n");
-    fprintf(stderr, "   DST	The name of the destination files\n");
-    fprintf(stderr, "Sizes may be suffixed with `g' for GB, `m' for MB or "
+    HDfprintf(stderr, "   -v     Produce verbose output\n");
+    HDfprintf(stderr, "   -V     Print a version number and exit\n");
+    HDfprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
+    HDfprintf(stderr, "   -m N   The destination member size or 1GB\n");
+    HDfprintf(stderr, "   -family_to_sec2   Change file driver from family to sec2\n");
+    HDfprintf(stderr, "   SRC    The name of the source file\n");
+    HDfprintf(stderr, "   DST	The name of the destination files\n");
+    HDfprintf(stderr, "Sizes may be suffixed with `g' for GB, `m' for MB or "
 	    "`k' for kB.\n");
-    fprintf(stderr, "File family names include an integer printf "
+    HDfprintf(stderr, "File family names include an integer printf "
 	    "format such as `%%d'\n");
     exit (EXIT_FAILURE);
 }
@@ -255,7 +255,7 @@ main (int argc, char *argv[])
         exit (EXIT_FAILURE);
     }
     src_size = src_act_size = sb.st_size;
-    if (verbose) fprintf (stderr, "< %s\n", src_name);
+    if (verbose) HDfprintf (stderr, "< %s\n", src_name);
 
     /*
      * Get the name for the destination file and open the first member.
@@ -269,7 +269,7 @@ main (int argc, char *argv[])
         HDperror (dst_name);
         HDexit (EXIT_FAILURE);
     }
-    if (verbose) fprintf (stderr, "> %s\n", dst_name);
+    if (verbose) HDfprintf (stderr, "> %s\n", dst_name);
 
     /* No more arguments */
     if (argno<argc) usage (prog_name);
@@ -295,7 +295,7 @@ main (int argc, char *argv[])
 		perror ("read");
 		exit (EXIT_FAILURE);
 	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short read\n", src_name);
+		HDfprintf (stderr, "%s: short read\n", src_name);
 		exit (EXIT_FAILURE);
 	    }
 	    for (i=0; i<n; i++) {
@@ -322,7 +322,7 @@ main (int argc, char *argv[])
 		perror ("write");
 		exit (EXIT_FAILURE);
 	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short write\n", dst_name);
+		HDfprintf (stderr, "%s: short write\n", dst_name);
 		exit (EXIT_FAILURE);
 	    }
 	    need_seek = FALSE;
@@ -359,11 +359,11 @@ main (int argc, char *argv[])
 	    }
 	    src_act_size = sb.st_size;
 	    if (src_act_size>src_size) {
-		fprintf (stderr, "%s: member truncated to %lu bytes\n",
+		HDfprintf (stderr, "%s: member truncated to %lu bytes\n",
 			 src_name, (unsigned long)src_size);
 	    }
 	    src_offset = 0;
-	    if (verbose) fprintf (stderr, "< %s\n", src_name);
+	    if (verbose) HDfprintf (stderr, "< %s\n", src_name);
 	}
 
 	/*
@@ -399,7 +399,7 @@ main (int argc, char *argv[])
 	    }
 	    dst_offset = 0;
 	    need_seek = FALSE;
-	    if (verbose) fprintf (stderr, "> %s\n", dst_name);
+	    if (verbose) HDfprintf (stderr, "> %s\n", dst_name);
 	}
     }
 
diff --git a/tools/perform/iopipe.c b/tools/perform/iopipe.c
index eac099b..2d9c44f 100644
--- a/tools/perform/iopipe.c
+++ b/tools/perform/iopipe.c
@@ -224,7 +224,7 @@ main (void)
   _ftime(tbstart);
 #endif
 #endif
-    fprintf (stderr, HEADING, "fill raw");
+    HDfprintf (stderr, HEADING, "fill raw");
     for(u = 0; u < nwrite; u++) {
   putc (PROGRESS, stderr);
   HDfflush(stderr);
@@ -262,7 +262,7 @@ main (void)
   _ftime(tbstart);
 #endif
 #endif
-    fprintf (stderr, HEADING, "fill hdf5");
+    HDfprintf (stderr, HEADING, "fill hdf5");
     for(u = 0; u < nread; u++) {
   putc (PROGRESS, stderr);
   HDfflush(stderr);
@@ -301,7 +301,7 @@ main (void)
   _ftime(tbstart);
 #endif
 #endif
-    fprintf (stderr, HEADING, "out raw");
+    HDfprintf (stderr, HEADING, "out raw");
     for(u = 0; u < nwrite; u++) {
   putc (PROGRESS, stderr);
   HDfflush(stderr);
@@ -341,7 +341,7 @@ main (void)
   _ftime(tbstart);
 #endif
 #endif
-    fprintf (stderr, HEADING, "out hdf5");
+    HDfprintf (stderr, HEADING, "out hdf5");
     for(u = 0; u < nwrite; u++) {
   putc (PROGRESS, stderr);
   HDfflush(stderr);
@@ -380,7 +380,7 @@ main (void)
   _ftime(tbstart);
 #endif
 #endif
-    fprintf (stderr, HEADING, "in raw");
+    HDfprintf (stderr, HEADING, "in raw");
     for(u = 0; u < nread; u++) {
   putc (PROGRESS, stderr);
   HDfflush(stderr);
@@ -421,7 +421,7 @@ main (void)
   _ftime(tbstart);
 #endif
 #endif
-    fprintf (stderr, HEADING, "in hdf5");
+    HDfprintf (stderr, HEADING, "in hdf5");
     for(u = 0; u < nread; u++) {
   putc (PROGRESS, stderr);
   HDfflush(stderr);
@@ -465,7 +465,7 @@ main (void)
   _ftime(tbstart);
 #endif
 #endif
-    fprintf (stderr, HEADING, "in hdf5 partial");
+    HDfprintf (stderr, HEADING, "in hdf5 partial");
     for(u = 0; u < nread; u++) {
   putc (PROGRESS, stderr);
   HDfflush(stderr);
diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c
index 81f9de6..108d9e4 100644
--- a/tools/perform/overhead.c
+++ b/tools/perform/overhead.c
@@ -84,9 +84,9 @@ typedef enum fill_t {
 static void
 usage(const char *prog)
 {
-    fprintf(stderr, "usage: %s [STYLE|cache] [LEFT [MIDDLE [RIGHT]]]\n",
+    HDfprintf(stderr, "usage: %s [STYLE|cache] [LEFT [MIDDLE [RIGHT]]]\n",
       prog);
-    fprintf(stderr, "\
+    HDfprintf(stderr, "\
     STYLE is the order that the dataset is filled and should be one of:\n\
         forward   --  Fill the dataset from lowest address to highest\n\
                       address. This style tests the right split ratio.\n\
@@ -401,6 +401,6 @@ main(int argc, char *argv[])
     return 0;
 
  error:
-    fprintf(stderr, "*** ERRORS DETECTED ***\n");
+    HDfprintf(stderr, "*** ERRORS DETECTED ***\n");
     return 1;
 }
diff --git a/tools/perform/perf_meta.c b/tools/perform/perf_meta.c
index c24e598..b56f074 100644
--- a/tools/perform/perf_meta.c
+++ b/tools/perform/perf_meta.c
@@ -313,7 +313,7 @@ create_dsets(hid_t file)
      * Create a dataset using the default dataset creation properties.
      */
     for(i = 0; i < NUM_DSETS; i++) {
-	sprintf(dset_name, "dataset %d", i);
+	HDsprintf(dset_name, "dataset %d", i);
     	if((dataset = H5Dcreate2(file, dset_name, H5T_NATIVE_DOUBLE, space,
                 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
@@ -378,14 +378,14 @@ create_attrs_1(void)
      * Create all(user specifies the number) attributes for each dataset
      */
     for(i = 0; i < NUM_DSETS; i++) {
-	sprintf(dset_name, "dataset %d", i);
+	HDsprintf(dset_name, "dataset %d", i);
         open_t.start = retrieve_time();
 	if((dataset = H5Dopen2(file, dset_name, H5P_DEFAULT)) < 0)
 		goto error;
 	perf(&open_t, open_t.start, retrieve_time());
 
 	for(j = 0; j < NUM_ATTRS; j++) {
-            sprintf(attr_name, "all attrs for each dset %d", j);
+            HDsprintf(attr_name, "all attrs for each dset %d", j);
             attr_t.start = retrieve_time();
             if((attr = H5Acreate2(dataset, attr_name, H5T_NATIVE_DOUBLE,
                     small_space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -422,7 +422,7 @@ create_attrs_1(void)
             attr_t.avg  = attr_t.total / (NUM_ATTRS*NUM_DSETS);
 
         /* Print out the performance result */
-        fprintf(stderr, "1.  Create %d attributes for each of %d existing datasets\n",
+        HDfprintf(stderr, "1.  Create %d attributes for each of %d existing datasets\n",
             NUM_ATTRS, NUM_DSETS);
         print_perf(open_t, close_t, attr_t);
     }
@@ -480,7 +480,7 @@ create_attrs_2(void)
      * Create all(user specifies the number) attributes for each new dataset
      */
     for(i = 0; i < NUM_DSETS; i++) {
-	sprintf(dset_name, "dataset %d", i);
+	HDsprintf(dset_name, "dataset %d", i);
         create_t.start = retrieve_time();
    	if((dataset = H5Dcreate2(file, dset_name, H5T_NATIVE_DOUBLE,
                 space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -488,7 +488,7 @@ create_attrs_2(void)
 	perf(&create_t, create_t.start, retrieve_time());
 
 	for(j = 0; j < NUM_ATTRS; j++) {
-            sprintf(attr_name, "all attrs for each dset %d", j);
+            HDsprintf(attr_name, "all attrs for each dset %d", j);
             attr_t.start = retrieve_time();
             if((attr = H5Acreate2(dataset, attr_name, H5T_NATIVE_DOUBLE,
                     small_space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -525,7 +525,7 @@ create_attrs_2(void)
             attr_t.avg = attr_t.total / (NUM_ATTRS*NUM_DSETS);
 
         /* Print out the performance result */
-        fprintf(stderr, "2.  Create %d attributes for each of %d new datasets\n",
+        HDfprintf(stderr, "2.  Create %d attributes for each of %d new datasets\n",
             NUM_ATTRS, NUM_DSETS);
         print_perf(create_t, close_t, attr_t);
     }
@@ -593,14 +593,14 @@ create_attrs_3(void)
 
     for(i = 0; i < loop_num; i++) {
     	for(j = 0; j < NUM_DSETS; j++) {
-            sprintf(dset_name, "dataset %d", j);
+            HDsprintf(dset_name, "dataset %d", j);
             open_t.start = retrieve_time();
             if((dataset = H5Dopen2(file, dset_name, H5P_DEFAULT)) < 0)
                 goto error;
             perf(&open_t, open_t.start, retrieve_time());
 
             for(k = 0; k < BATCH_ATTRS; k++) {
-                sprintf(attr_name, "some attrs for each dset %d %d", i, k);
+                HDsprintf(attr_name, "some attrs for each dset %d %d", i, k);
                 attr_t.start = retrieve_time();
                 if((attr = H5Acreate2(dataset, attr_name, H5T_NATIVE_DOUBLE,
                         small_space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -637,7 +637,7 @@ create_attrs_3(void)
         attr_t.avg = attr_t.total / (NUM_ATTRS*NUM_DSETS);
 
         /* Print out the performance result */
-        fprintf(stderr, "3.  Create %d attributes for each of %d existing datasets for %d times\n",
+        HDfprintf(stderr, "3.  Create %d attributes for each of %d existing datasets for %d times\n",
             BATCH_ATTRS, NUM_DSETS, loop_num);
         print_perf(open_t, close_t, attr_t);
     }
@@ -750,12 +750,12 @@ void perf(p_time *perf_t, double start_t, double end_t)
  */
 void print_perf(p_time open_t, p_time close_t, p_time attr_t)
 {
-    fprintf(stderr, "\t%s:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n",
+    HDfprintf(stderr, "\t%s:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n",
 		open_t.func, open_t.avg, open_t.max, open_t.min);
-    fprintf(stderr, "\tH5Dclose:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n",
+    HDfprintf(stderr, "\tH5Dclose:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n",
 		close_t.avg, close_t.max, close_t.min);
     if(NUM_ATTRS)
-        fprintf(stderr, "\tH5A(create & close):\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n",
+        HDfprintf(stderr, "\tH5A(create & close):\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n",
 		attr_t.avg, attr_t.max, attr_t.min);
 }
 
@@ -799,7 +799,7 @@ main(int argc, char **argv)
 #ifdef H5_HAVE_PARALLEL
     if (facc_type == FACC_DEFAULT || (facc_type != FACC_DEFAULT && MAINPROCESS))
 #endif /*H5_HAVE_PARALLEL*/
-        fprintf(stderr, "\t\tPerformance result of metadata for datasets and attributes\n\n");
+        HDfprintf(stderr, "\t\tPerformance result of metadata for datasets and attributes\n\n");
 
     fapl = H5Pcreate (H5P_FILE_ACCESS);
 #ifdef H5_HAVE_PARALLEL
diff --git a/tools/perform/pio_engine.c b/tools/perform/pio_engine.c
index d47cd43..6cff0e5 100644
--- a/tools/perform/pio_engine.c
+++ b/tools/perform/pio_engine.c
@@ -61,14 +61,14 @@
 #define GOTOERROR(errcode)  { ret_code = errcode; goto done; }
 #define GOTODONE        { goto done; }
 #define ERRMSG(mesg) {                                                  \
-    fprintf(stderr, "Proc %d: ", pio_mpi_rank_g);                       \
-    fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n",    \
+    HDfprintf(stderr, "Proc %d: ", pio_mpi_rank_g);                       \
+    HDfprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n",    \
         mesg, (int)__LINE__, __FILE__);                             \
 }
 
 #define MSG(mesg) {                                     \
-    fprintf(stderr, "Proc %d: ", pio_mpi_rank_g);       \
-    fprintf(stderr, "(%s) at line %4d in %s\n",         \
+    HDfprintf(stderr, "Proc %d: ", pio_mpi_rank_g);       \
+    HDfprintf(stderr, "(%s) at line %4d in %s\n",         \
         mesg, (int)__LINE__, __FILE__);             \
 }
 
@@ -194,7 +194,7 @@ do_pio(parameters param)
             break;
         default:
             /* unknown request */
-            fprintf(stderr, "Unknown IO type request (%d)\n", iot);
+            HDfprintf(stderr, "Unknown IO type request (%d)\n", iot);
             GOTOERROR(FAIL);
     }
 
@@ -213,21 +213,21 @@ do_pio(parameters param)
     }
 
     if (param.num_files < 0 ) {
-    fprintf(stderr,
+    HDfprintf(stderr,
         "number of files must be >= 0 (%ld)\n",
         param.num_files);
     GOTOERROR(FAIL);
     }
 
     if (ndsets < 0 ) {
-    fprintf(stderr,
+    HDfprintf(stderr,
         "number of datasets per file must be >= 0 (%ld)\n",
         ndsets);
     GOTOERROR(FAIL);
     }
 
     if (param.num_procs <= 0 ) {
-    fprintf(stderr,
+    HDfprintf(stderr,
         "maximum number of process to use must be > 0 (%d)\n",
         param.num_procs);
     GOTOERROR(FAIL);
@@ -292,7 +292,7 @@ do_pio(parameters param)
 
     /* output all of the times for all iterations */
     if (myrank == 0)
-        fprintf(output, "Timer details:\n");
+        HDfprintf(output, "Timer details:\n");
     }
 
     for (nf = 1; nf <= param.num_files; nf++) {
@@ -302,7 +302,7 @@ do_pio(parameters param)
     /* Open file for write */
     char base_name[256];
 
-    sprintf(base_name, "#pio_tmp_%lu", nf);
+    HDsprintf(base_name, "#pio_tmp_%lu", nf);
     pio_create_filename(iot, base_name, fname, sizeof(fname));
     if (pio_debug_level > 0)
         HDfprintf(output, "rank %d: data filename=%s\n",
@@ -853,7 +853,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         /* Create the dataset transfer property list */
         h5dxpl = H5Pcreate(H5P_DATASET_XFER);
         if (h5dxpl < 0) {
-        fprintf(stderr, "HDF5 Property List Create failed\n");
+        HDfprintf(stderr, "HDF5 Property List Create failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -861,7 +861,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         if(parms->collective) {
             hrc = H5Pset_dxpl_mpio(h5dxpl, H5FD_MPIO_COLLECTIVE);
             if (hrc < 0) {
-                fprintf(stderr, "HDF5 Property List Set failed\n");
+                HDfprintf(stderr, "HDF5 Property List Set failed\n");
                 GOTOERROR(FAIL);
             } /* end if */
         } /* end if */
@@ -883,7 +883,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         case PHDF5:
             h5dcpl = H5Pcreate(H5P_DATASET_CREATE);
             if (h5dcpl < 0) {
-                fprintf(stderr, "HDF5 Property List Create failed\n");
+                HDfprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
             /* 1D dataspace */
@@ -894,7 +894,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                 h5dims[0] = blk_size;
                 hrc = H5Pset_chunk(h5dcpl, 1, h5dims);
                 if (hrc < 0) {
-                    fprintf(stderr, "HDF5 Property List Set failed\n");
+                    HDfprintf(stderr, "HDF5 Property List Set failed\n");
                     GOTOERROR(FAIL);
                 } /* end if */
                 } /* end if */
@@ -907,25 +907,25 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                 h5dims[1] = blk_size;
                 hrc = H5Pset_chunk(h5dcpl, 2, h5dims);
                 if (hrc < 0) {
-                    fprintf(stderr, "HDF5 Property List Set failed\n");
+                    HDfprintf(stderr, "HDF5 Property List Set failed\n");
                     GOTOERROR(FAIL);
                 } /* end if */
                 } /* end if */
             }/* end else */
 
-            sprintf(dname, "Dataset_%ld", ndset);
+            HDsprintf(dname, "Dataset_%ld", ndset);
             h5ds_id = H5DCREATE(fd->h5fd, dname, ELMT_H5_TYPE,
                 h5dset_space_id, h5dcpl);
 
             if (h5ds_id < 0) {
-                fprintf(stderr, "HDF5 Dataset Create failed\n");
+                HDfprintf(stderr, "HDF5 Dataset Create failed\n");
                 GOTOERROR(FAIL);
             }
 
             hrc = H5Pclose(h5dcpl);
             /* verifying the close of the dcpl */
             if (hrc < 0) {
-                fprintf(stderr, "HDF5 Property List Close failed\n");
+                HDfprintf(stderr, "HDF5 Property List Close failed\n");
                 GOTOERROR(FAIL);
             }
             break;
@@ -1398,7 +1398,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         hrc = H5Dclose(h5ds_id);
 
         if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Close failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -1455,7 +1455,7 @@ done:
     if (h5dset_space_id != -1) {
     hrc = H5Sclose(h5dset_space_id);
     if (hrc < 0){
-        fprintf(stderr, "HDF5 Dataset Space Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
         ret_code = FAIL;
     } else {
         h5dset_space_id = -1;
@@ -1465,7 +1465,7 @@ done:
     if (h5mem_space_id != -1) {
     hrc = H5Sclose(h5mem_space_id);
     if (hrc < 0) {
-        fprintf(stderr, "HDF5 Memory Space Close failed\n");
+        HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
         ret_code = FAIL;
     } else {
         h5mem_space_id = -1;
@@ -1475,7 +1475,7 @@ done:
     if (h5dxpl != -1) {
     hrc = H5Pclose(h5dxpl);
     if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
         ret_code = FAIL;
     } else {
         h5dxpl = -1;
@@ -1824,7 +1824,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         /* Create the dataset transfer property list */
         h5dxpl = H5Pcreate(H5P_DATASET_XFER);
         if (h5dxpl < 0) {
-        fprintf(stderr, "HDF5 Property List Create failed\n");
+        HDfprintf(stderr, "HDF5 Property List Create failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -1832,7 +1832,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         if(parms->collective) {
         hrc = H5Pset_dxpl_mpio(h5dxpl, H5FD_MPIO_COLLECTIVE);
         if (hrc < 0) {
-            fprintf(stderr, "HDF5 Property List Set failed\n");
+            HDfprintf(stderr, "HDF5 Property List Set failed\n");
             GOTOERROR(FAIL);
         } /* end if */
         } /* end if */
@@ -1852,10 +1852,10 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         break;
 
         case PHDF5:
-        sprintf(dname, "Dataset_%ld", ndset);
+        HDsprintf(dname, "Dataset_%ld", ndset);
         h5ds_id = H5DOPEN(fd->h5fd, dname);
         if (h5ds_id < 0) {
-            fprintf(stderr, "HDF5 Dataset open failed\n");
+            HDfprintf(stderr, "HDF5 Dataset open failed\n");
             GOTOERROR(FAIL);
         }
 
@@ -2353,7 +2353,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         hrc = H5Dclose(h5ds_id);
 
         if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Close failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -2410,7 +2410,7 @@ done:
     if (h5dset_space_id != -1) {
     hrc = H5Sclose(h5dset_space_id);
     if (hrc < 0){
-        fprintf(stderr, "HDF5 Dataset Space Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
         ret_code = FAIL;
     } else {
         h5dset_space_id = -1;
@@ -2420,7 +2420,7 @@ done:
     if (h5mem_space_id != -1) {
     hrc = H5Sclose(h5mem_space_id);
     if (hrc < 0) {
-        fprintf(stderr, "HDF5 Memory Space Close failed\n");
+        HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
         ret_code = FAIL;
     } else {
         h5mem_space_id = -1;
@@ -2430,7 +2430,7 @@ done:
     if (h5dxpl != -1) {
     hrc = H5Pclose(h5dxpl);
     if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
         ret_code = FAIL;
     } else {
         h5dxpl = -1;
@@ -2461,7 +2461,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
                 fd->posixfd = POSIXOPEN(fname, O_RDONLY);
 
             if (fd->posixfd < 0 ) {
-                fprintf(stderr, "POSIX File Open failed(%s)\n", fname);
+                HDfprintf(stderr, "POSIX File Open failed(%s)\n", fname);
                 GOTOERROR(FAIL);
             }
 
@@ -2485,7 +2485,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
                     h5_io_info_g, &fd->mpifd);
 
                 if (mrc != MPI_SUCCESS) {
-                    fprintf(stderr, "MPI File Open failed(%s)\n", fname);
+                    HDfprintf(stderr, "MPI File Open failed(%s)\n", fname);
                     GOTOERROR(FAIL);
                 }
 
@@ -2493,13 +2493,13 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
                 /*filesize , set size to 0 explicitedly.    */
                 mrc = MPI_File_set_size(fd->mpifd, (MPI_Offset)0);
                 if (mrc != MPI_SUCCESS) {
-                    fprintf(stderr, "MPI_File_set_size failed\n");
+                    HDfprintf(stderr, "MPI_File_set_size failed\n");
                     GOTOERROR(FAIL);
                 }
             } else {
                 mrc = MPI_File_open(pio_comm_g, fname, MPI_MODE_RDONLY, h5_io_info_g, &fd->mpifd);
                 if (mrc != MPI_SUCCESS) {
-                    fprintf(stderr, "MPI File Open failed(%s)\n", fname);
+                    HDfprintf(stderr, "MPI File Open failed(%s)\n", fname);
                     GOTOERROR(FAIL);
                 }
             }
@@ -2508,19 +2508,19 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
 
         case PHDF5:
             if ((acc_tpl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-                fprintf(stderr, "HDF5 Property List Create failed\n");
+                HDfprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
 
             /* Set the file driver to the MPI-IO driver */
             if (H5Pset_fapl_mpio(acc_tpl, pio_comm_g, h5_io_info_g) < 0) {
-                fprintf(stderr, "HDF5 Property List Set failed\n");
+                HDfprintf(stderr, "HDF5 Property List Set failed\n");
                 GOTOERROR(FAIL);
             }
 
             /* Set the alignment of objects in HDF5 file */
             if (H5Pset_alignment(acc_tpl, param->h5_thresh, param->h5_align) < 0) {
-                fprintf(stderr, "HDF5 Property List Set failed\n");
+                HDfprintf(stderr, "HDF5 Property List Set failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -2530,13 +2530,13 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
             else
                 fd->h5fd = H5Fopen(fname, H5F_ACC_RDONLY, acc_tpl);
             if (fd->h5fd < 0) {
-                fprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
+                HDfprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
                 GOTOERROR(FAIL);
             }
 
             /* verifying the close of the acc_tpl */
             if (H5Pclose(acc_tpl) < 0) {
-                fprintf(stderr, "HDF5 Property List Close failed\n");
+                HDfprintf(stderr, "HDF5 Property List Close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -2565,7 +2565,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
         rc = POSIXCLOSE(fd->posixfd);
 
         if (rc != 0){
-        fprintf(stderr, "POSIX File Close failed\n");
+        HDfprintf(stderr, "POSIX File Close failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -2576,7 +2576,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
         mrc = MPI_File_close(&fd->mpifd);
 
         if (mrc != MPI_SUCCESS){
-        fprintf(stderr, "MPI File close failed\n");
+        HDfprintf(stderr, "MPI File close failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -2587,7 +2587,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
         hrc = H5Fclose(fd->h5fd);
 
         if (hrc < 0) {
-        fprintf(stderr, "HDF5 File Close failed\n");
+        HDfprintf(stderr, "HDF5 File Close failed\n");
         GOTOERROR(FAIL);
         }
 
diff --git a/tools/perform/pio_perf.c b/tools/perform/pio_perf.c
index 597629e..0acc644 100644
--- a/tools/perform/pio_perf.c
+++ b/tools/perform/pio_perf.c
@@ -98,12 +98,12 @@ MPI_Comm    pio_comm_g;         /* Communicator to run the PIO          */
 int         pio_mpi_rank_g;     /* MPI rank of pio_comm_g               */
 int         pio_mpi_nprocs_g;   /* Number of processes of pio_comm_g    */
 int         pio_debug_level = 0;/* The debug level:
-                                 *   0 - Off
-                                 *   1 - Minimal
-                                 *   2 - Some more
-                                 *   3 - Maximal
-                                 *   4 - Maximal & then some
-                                 */
+ *   0 - Off
+ *   1 - Minimal
+ *   2 - Some more
+ *   3 - Maximal
+ *   4 - Maximal & then some
+ */
 
 /* local variables */
 static const char  *progname = "h5perf";
@@ -119,147 +119,147 @@ static const char *s_opts = "a:A:B:cCd:D:e:F:ghi:Imno:p:P:stT:wx:X:";
 static const char *s_opts = "a:A:bB:cCd:D:e:F:ghi:Imno:p:P:stT:wx:X:";
 #endif  /* 1 */
 static struct long_options l_opts[] = {
-    { "align", require_arg, 'a' },
-    { "alig", require_arg, 'a' },
-    { "ali", require_arg, 'a' },
-    { "al", require_arg, 'a' },
-    { "api", require_arg, 'A' },
-    { "ap", require_arg, 'A' },
+        { "align", require_arg, 'a' },
+        { "alig", require_arg, 'a' },
+        { "ali", require_arg, 'a' },
+        { "al", require_arg, 'a' },
+        { "api", require_arg, 'A' },
+        { "ap", require_arg, 'A' },
 #if 0
-    /* a sighting of the elusive binary option */
-    { "binary", no_arg, 'b' },
-    { "binar", no_arg, 'b' },
-    { "bina", no_arg, 'b' },
-    { "bin", no_arg, 'b' },
-    { "bi", no_arg, 'b' },
+        /* a sighting of the elusive binary option */
+        { "binary", no_arg, 'b' },
+        { "binar", no_arg, 'b' },
+        { "bina", no_arg, 'b' },
+        { "bin", no_arg, 'b' },
+        { "bi", no_arg, 'b' },
 #endif  /* 0 */
-    { "block-size", require_arg, 'B' },
-    { "block-siz", require_arg, 'B' },
-    { "block-si", require_arg, 'B' },
-    { "block-s", require_arg, 'B' },
-    { "block-", require_arg, 'B' },
-    { "block", require_arg, 'B' },
-    { "bloc", require_arg, 'B' },
-    { "blo", require_arg, 'B' },
-    { "bl", require_arg, 'B' },
-    { "chunk", no_arg, 'c' },
-    { "chun", no_arg, 'c' },
-    { "chu", no_arg, 'c' },
-    { "ch", no_arg, 'c' },
-    { "collective", no_arg, 'C' },
-    { "collectiv", no_arg, 'C' },
-    { "collecti", no_arg, 'C' },
-    { "collect", no_arg, 'C' },
-    { "collec", no_arg, 'C' },
-    { "colle", no_arg, 'C' },
-    { "coll", no_arg, 'C' },
-    { "col", no_arg, 'C' },
-    { "co", no_arg, 'C' },
-    { "debug", require_arg, 'D' },
-    { "debu", require_arg, 'D' },
-    { "deb", require_arg, 'D' },
-    { "de", require_arg, 'D' },
-    { "geometry", no_arg, 'g' },
-    { "geometr", no_arg, 'g' },
-    { "geomet", no_arg, 'g' },
-    { "geome", no_arg, 'g' },
-    { "geom", no_arg, 'g' },
-    { "geo", no_arg, 'g' },
-    { "ge", no_arg, 'g' },
-    { "help", no_arg, 'h' },
-    { "hel", no_arg, 'h' },
-    { "he", no_arg, 'h' },
-    { "interleaved", require_arg, 'I' },
-    { "interleave", require_arg, 'I' },
-    { "interleav", require_arg, 'I' },
-    { "interlea", require_arg, 'I' },
-    { "interle", require_arg, 'I' },
-    { "interl", require_arg, 'I' },
-    { "inter", require_arg, 'I' },
-    { "inte", require_arg, 'I' },
-    { "int", require_arg, 'I' },
-    { "in", require_arg, 'I' },
-    { "max-num-processes", require_arg, 'P' },
-    { "max-num-processe", require_arg, 'P' },
-    { "max-num-process", require_arg, 'P' },
-    { "max-num-proces", require_arg, 'P' },
-    { "max-num-proce", require_arg, 'P' },
-    { "max-num-proc", require_arg, 'P' },
-    { "max-num-pro", require_arg, 'P' },
-    { "max-num-pr", require_arg, 'P' },
-    { "max-num-p", require_arg, 'P' },
-    { "min-num-processes", require_arg, 'p' },
-    { "min-num-processe", require_arg, 'p' },
-    { "min-num-process", require_arg, 'p' },
-    { "min-num-proces", require_arg, 'p' },
-    { "min-num-proce", require_arg, 'p' },
-    { "min-num-proc", require_arg, 'p' },
-    { "min-num-pro", require_arg, 'p' },
-    { "min-num-pr", require_arg, 'p' },
-    { "min-num-p", require_arg, 'p' },
-    { "max-xfer-size", require_arg, 'X' },
-    { "max-xfer-siz", require_arg, 'X' },
-    { "max-xfer-si", require_arg, 'X' },
-    { "max-xfer-s", require_arg, 'X' },
-    { "max-xfer", require_arg, 'X' },
-    { "max-xfe", require_arg, 'X' },
-    { "max-xf", require_arg, 'X' },
-    { "max-x", require_arg, 'X' },
-    { "min-xfer-size", require_arg, 'x' },
-    { "min-xfer-siz", require_arg, 'x' },
-    { "min-xfer-si", require_arg, 'x' },
-    { "min-xfer-s", require_arg, 'x' },
-    { "min-xfer", require_arg, 'x' },
-    { "min-xfe", require_arg, 'x' },
-    { "min-xf", require_arg, 'x' },
-    { "min-x", require_arg, 'x' },
-    { "num-bytes", require_arg, 'e' },
-    { "num-byte", require_arg, 'e' },
-    { "num-byt", require_arg, 'e' },
-    { "num-by", require_arg, 'e' },
-    { "num-b", require_arg, 'e' },
-    { "num-dsets", require_arg, 'd' },
-    { "num-dset", require_arg, 'd' },
-    { "num-dse", require_arg, 'd' },
-    { "num-ds", require_arg, 'd' },
-    { "num-d", require_arg, 'd' },
-    { "num-files", require_arg, 'F' },
-    { "num-file", require_arg, 'F' },
-    { "num-fil", require_arg, 'F' },
-    { "num-fi", require_arg, 'F' },
-    { "num-f", require_arg, 'F' },
-    { "num-iterations", require_arg, 'i' },
-    { "num-iteration", require_arg, 'i' },
-    { "num-iteratio", require_arg, 'i' },
-    { "num-iterati", require_arg, 'i' },
-    { "num-iterat", require_arg, 'i' },
-    { "num-itera", require_arg, 'i' },
-    { "num-iter", require_arg, 'i' },
-    { "num-ite", require_arg, 'i' },
-    { "num-it", require_arg, 'i' },
-    { "num-i", require_arg, 'i' },
-    { "output", require_arg, 'o' },
-    { "outpu", require_arg, 'o' },
-    { "outp", require_arg, 'o' },
-    { "out", require_arg, 'o' },
-    { "ou", require_arg, 'o' },
-    { "threshold", require_arg, 'T' },
-    { "threshol", require_arg, 'T' },
-    { "thresho", require_arg, 'T' },
-    { "thresh", require_arg, 'T' },
-    { "thres", require_arg, 'T' },
-    { "thre", require_arg, 'T' },
-    { "thr", require_arg, 'T' },
-    { "th", require_arg, 'T' },
-    { "write-only", require_arg, 'w' },
-    { "write-onl", require_arg, 'w' },
-    { "write-on", require_arg, 'w' },
-    { "write-o", require_arg, 'w' },
-    { "write", require_arg, 'w' },
-    { "writ", require_arg, 'w' },
-    { "wri", require_arg, 'w' },
-    { "wr", require_arg, 'w' },
-    { NULL, 0, '\0' }
+        { "block-size", require_arg, 'B' },
+        { "block-siz", require_arg, 'B' },
+        { "block-si", require_arg, 'B' },
+        { "block-s", require_arg, 'B' },
+        { "block-", require_arg, 'B' },
+        { "block", require_arg, 'B' },
+        { "bloc", require_arg, 'B' },
+        { "blo", require_arg, 'B' },
+        { "bl", require_arg, 'B' },
+        { "chunk", no_arg, 'c' },
+        { "chun", no_arg, 'c' },
+        { "chu", no_arg, 'c' },
+        { "ch", no_arg, 'c' },
+        { "collective", no_arg, 'C' },
+        { "collectiv", no_arg, 'C' },
+        { "collecti", no_arg, 'C' },
+        { "collect", no_arg, 'C' },
+        { "collec", no_arg, 'C' },
+        { "colle", no_arg, 'C' },
+        { "coll", no_arg, 'C' },
+        { "col", no_arg, 'C' },
+        { "co", no_arg, 'C' },
+        { "debug", require_arg, 'D' },
+        { "debu", require_arg, 'D' },
+        { "deb", require_arg, 'D' },
+        { "de", require_arg, 'D' },
+        { "geometry", no_arg, 'g' },
+        { "geometr", no_arg, 'g' },
+        { "geomet", no_arg, 'g' },
+        { "geome", no_arg, 'g' },
+        { "geom", no_arg, 'g' },
+        { "geo", no_arg, 'g' },
+        { "ge", no_arg, 'g' },
+        { "help", no_arg, 'h' },
+        { "hel", no_arg, 'h' },
+        { "he", no_arg, 'h' },
+        { "interleaved", require_arg, 'I' },
+        { "interleave", require_arg, 'I' },
+        { "interleav", require_arg, 'I' },
+        { "interlea", require_arg, 'I' },
+        { "interle", require_arg, 'I' },
+        { "interl", require_arg, 'I' },
+        { "inter", require_arg, 'I' },
+        { "inte", require_arg, 'I' },
+        { "int", require_arg, 'I' },
+        { "in", require_arg, 'I' },
+        { "max-num-processes", require_arg, 'P' },
+        { "max-num-processe", require_arg, 'P' },
+        { "max-num-process", require_arg, 'P' },
+        { "max-num-proces", require_arg, 'P' },
+        { "max-num-proce", require_arg, 'P' },
+        { "max-num-proc", require_arg, 'P' },
+        { "max-num-pro", require_arg, 'P' },
+        { "max-num-pr", require_arg, 'P' },
+        { "max-num-p", require_arg, 'P' },
+        { "min-num-processes", require_arg, 'p' },
+        { "min-num-processe", require_arg, 'p' },
+        { "min-num-process", require_arg, 'p' },
+        { "min-num-proces", require_arg, 'p' },
+        { "min-num-proce", require_arg, 'p' },
+        { "min-num-proc", require_arg, 'p' },
+        { "min-num-pro", require_arg, 'p' },
+        { "min-num-pr", require_arg, 'p' },
+        { "min-num-p", require_arg, 'p' },
+        { "max-xfer-size", require_arg, 'X' },
+        { "max-xfer-siz", require_arg, 'X' },
+        { "max-xfer-si", require_arg, 'X' },
+        { "max-xfer-s", require_arg, 'X' },
+        { "max-xfer", require_arg, 'X' },
+        { "max-xfe", require_arg, 'X' },
+        { "max-xf", require_arg, 'X' },
+        { "max-x", require_arg, 'X' },
+        { "min-xfer-size", require_arg, 'x' },
+        { "min-xfer-siz", require_arg, 'x' },
+        { "min-xfer-si", require_arg, 'x' },
+        { "min-xfer-s", require_arg, 'x' },
+        { "min-xfer", require_arg, 'x' },
+        { "min-xfe", require_arg, 'x' },
+        { "min-xf", require_arg, 'x' },
+        { "min-x", require_arg, 'x' },
+        { "num-bytes", require_arg, 'e' },
+        { "num-byte", require_arg, 'e' },
+        { "num-byt", require_arg, 'e' },
+        { "num-by", require_arg, 'e' },
+        { "num-b", require_arg, 'e' },
+        { "num-dsets", require_arg, 'd' },
+        { "num-dset", require_arg, 'd' },
+        { "num-dse", require_arg, 'd' },
+        { "num-ds", require_arg, 'd' },
+        { "num-d", require_arg, 'd' },
+        { "num-files", require_arg, 'F' },
+        { "num-file", require_arg, 'F' },
+        { "num-fil", require_arg, 'F' },
+        { "num-fi", require_arg, 'F' },
+        { "num-f", require_arg, 'F' },
+        { "num-iterations", require_arg, 'i' },
+        { "num-iteration", require_arg, 'i' },
+        { "num-iteratio", require_arg, 'i' },
+        { "num-iterati", require_arg, 'i' },
+        { "num-iterat", require_arg, 'i' },
+        { "num-itera", require_arg, 'i' },
+        { "num-iter", require_arg, 'i' },
+        { "num-ite", require_arg, 'i' },
+        { "num-it", require_arg, 'i' },
+        { "num-i", require_arg, 'i' },
+        { "output", require_arg, 'o' },
+        { "outpu", require_arg, 'o' },
+        { "outp", require_arg, 'o' },
+        { "out", require_arg, 'o' },
+        { "ou", require_arg, 'o' },
+        { "threshold", require_arg, 'T' },
+        { "threshol", require_arg, 'T' },
+        { "thresho", require_arg, 'T' },
+        { "thresh", require_arg, 'T' },
+        { "thres", require_arg, 'T' },
+        { "thre", require_arg, 'T' },
+        { "thr", require_arg, 'T' },
+        { "th", require_arg, 'T' },
+        { "write-only", require_arg, 'w' },
+        { "write-onl", require_arg, 'w' },
+        { "write-on", require_arg, 'w' },
+        { "write-o", require_arg, 'w' },
+        { "write", require_arg, 'w' },
+        { "writ", require_arg, 'w' },
+        { "wri", require_arg, 'w' },
+        { "wr", require_arg, 'w' },
+        { NULL, 0, '\0' }
 };
 
 struct options {
@@ -277,13 +277,13 @@ struct options {
     unsigned interleaved;       /* Interleaved vs. contiguous blocks    */
     unsigned collective;        /* Collective vs. independent I/O       */
     unsigned dim2d;             /* 1D vs. 2D geometry                   */
-    int print_times;       	/* print times as well as throughputs   */
-    int print_raw;         	/* print raw data throughput info       */
+    int print_times;           /* print times as well as throughputs   */
+    int print_raw;             /* print raw data throughput info       */
     off_t h5_alignment;         /* alignment in HDF5 file               */
     off_t h5_threshold;         /* threshold for alignment in HDF5 file */
-    int h5_use_chunks;     	/* Make HDF5 dataset chunked            */
-    int h5_write_only;        	/* Perform the write tests only         */
-    int verify;        		/* Verify data correctness              */
+    int h5_use_chunks;         /* Make HDF5 dataset chunked            */
+    int h5_write_only;            /* Perform the write tests only         */
+    int verify;                /* Verify data correctness              */
 };
 
 typedef struct _minmax {
@@ -304,9 +304,9 @@ static minmax accumulate_minmax_stuff(minmax *mm, int count);
 static int create_comm_world(int num_procs, int *doing_pio);
 static int destroy_comm_world(void);
 static void output_results(const struct options *options, const char *name,
-                           minmax *table, int table_size, off_t data_size);
+        minmax *table, int table_size, off_t data_size);
 static void output_times(const struct options *options, const char *name,
-                           minmax *table, int table_size);
+        minmax *table, int table_size);
 static void output_report(const char *fmt, ...);
 static void print_indent(register int indent);
 static void usage(const char *prog);
@@ -339,12 +339,12 @@ main(int argc, char **argv)
     ret = MPI_Comm_size(MPI_COMM_WORLD, &comm_world_nprocs_g);
 
     if (ret != MPI_SUCCESS) {
-        fprintf(stderr, "%s: MPI_Comm_size call failed\n", progname);
+        HDfprintf(stderr, "%s: MPI_Comm_size call failed\n", progname);
 
         if (ret == MPI_ERR_COMM)
-            fprintf(stderr, "invalid MPI communicator\n");
+            HDfprintf(stderr, "invalid MPI communicator\n");
         else
-            fprintf(stderr, "invalid argument\n");
+            HDfprintf(stderr, "invalid argument\n");
 
         exit_value = EXIT_FAILURE;
         goto finish;
@@ -353,12 +353,12 @@ main(int argc, char **argv)
     ret = MPI_Comm_rank(MPI_COMM_WORLD, &comm_world_rank_g);
 
     if (ret != MPI_SUCCESS) {
-        fprintf(stderr, "%s: MPI_Comm_rank call failed\n", progname);
+        HDfprintf(stderr, "%s: MPI_Comm_rank call failed\n", progname);
 
         if (ret == MPI_ERR_COMM)
-            fprintf(stderr, "invalid MPI communicator\n");
+            HDfprintf(stderr, "invalid MPI communicator\n");
         else
-            fprintf(stderr, "invalid argument\n");
+            HDfprintf(stderr, "invalid argument\n");
 
         exit_value = EXIT_FAILURE;
         goto finish;
@@ -376,8 +376,8 @@ main(int argc, char **argv)
 
     if (opts->output_file) {
         if ((output = HDfopen(opts->output_file, "w")) == NULL) {
-            fprintf(stderr, "%s: cannot open output file\n", progname);
-            perror(opts->output_file);
+            HDfprintf(stderr, "%s: cannot open output file\n", progname);
+            HDperror(opts->output_file);
             goto finish;
         }
     }
@@ -389,7 +389,7 @@ main(int argc, char **argv)
 
 finish:
     MPI_Finalize();
-    free(opts);
+    HDfree(opts);
     return exit_value;
 }
 
@@ -446,8 +446,8 @@ run_test_loop(struct options *opts)
             /* do something harsh */
         }
 
-    /* only processes doing PIO will run the tests */
-    if (doing_pio){
+        /* only processes doing PIO will run the tests */
+        if (doing_pio){
             output_report("Number of processors = %ld\n", parms.num_procs);
 
             /* multiply the xfer buffer size by 2 for each loop iteration */
@@ -455,33 +455,33 @@ run_test_loop(struct options *opts)
                     buf_size <= opts->max_xfer_size; buf_size <<= 1) {
                 parms.buf_size = buf_size;
 
-        if (parms.dim2d){
-            parms.num_bytes = (off_t)pow((double)(opts->num_bpp*parms.num_procs),2);
-            if (parms.interleaved)
-            output_report("Transfer Buffer Size: %ldx%ld bytes, File size: %.2f MB\n",
-                buf_size, opts->blk_size,
-                ((double)parms.num_dsets * (double)parms.num_bytes)
-                / ONE_MB);
-            else
-            output_report("Transfer Buffer Size: %ldx%ld bytes, File size: %.2f MB\n",
-                opts->blk_size, buf_size,
-                ((double)parms.num_dsets * (double)parms.num_bytes)
-                / ONE_MB);
-
-            print_indent(1);
-            output_report("  # of files: %ld, # of datasets: %ld, dataset size: %.2fx%.2f KB\n",
-                parms.num_files, parms.num_dsets, (double)(opts->num_bpp*parms.num_procs)/ONE_KB,
-                (double)(opts->num_bpp*parms.num_procs)/ONE_KB);
-        }
-        else{
-            parms.num_bytes = (off_t)opts->num_bpp*parms.num_procs;
-            output_report("Transfer Buffer Size: %ld bytes, File size: %.2f MB\n",
-                buf_size,((double)parms.num_dsets * (double)parms.num_bytes) / ONE_MB);
-
-            print_indent(1);
-            output_report("  # of files: %ld, # of datasets: %ld, dataset size: %.2f MB\n",
-                parms.num_files, parms.num_dsets, (double)(opts->num_bpp*parms.num_procs)/ONE_MB);
-        }
+                if (parms.dim2d){
+                    parms.num_bytes = (off_t)pow((double)(opts->num_bpp*parms.num_procs),2);
+                    if (parms.interleaved)
+                        output_report("Transfer Buffer Size: %ldx%ld bytes, File size: %.2f MB\n",
+                                buf_size, opts->blk_size,
+                                ((double)parms.num_dsets * (double)parms.num_bytes)
+                                / ONE_MB);
+                    else
+                        output_report("Transfer Buffer Size: %ldx%ld bytes, File size: %.2f MB\n",
+                                opts->blk_size, buf_size,
+                                ((double)parms.num_dsets * (double)parms.num_bytes)
+                                / ONE_MB);
+
+                    print_indent(1);
+                    output_report("  # of files: %ld, # of datasets: %ld, dataset size: %.2fx%.2f KB\n",
+                            parms.num_files, parms.num_dsets, (double)(opts->num_bpp*parms.num_procs)/ONE_KB,
+                            (double)(opts->num_bpp*parms.num_procs)/ONE_KB);
+                }
+                else{
+                    parms.num_bytes = (off_t)opts->num_bpp*parms.num_procs;
+                    output_report("Transfer Buffer Size: %ld bytes, File size: %.2f MB\n",
+                            buf_size,((double)parms.num_dsets * (double)parms.num_bytes) / ONE_MB);
+
+                    print_indent(1);
+                    output_report("  # of files: %ld, # of datasets: %ld, dataset size: %.2f MB\n",
+                            parms.num_files, parms.num_dsets, (double)(opts->num_bpp*parms.num_procs)/ONE_MB);
+                }
 
                 if (opts->io_types & PIO_POSIX)
                     run_test(POSIXIO, parms, opts);
@@ -500,7 +500,7 @@ run_test_loop(struct options *opts)
             if (destroy_comm_world() != SUCCESS) {
                 /* do something harsh */
             }
-    }
+        }
     }
 }
 
@@ -549,15 +549,15 @@ run_test(iotype iot, parameters parms, struct options *opts)
     output_report("IO API = ");
 
     switch (iot) {
-        case POSIXIO:
-            output_report("POSIX\n");
-            break;
-        case MPIO:
-            output_report("MPIO\n");
-            break;
-        case PHDF5:
-            output_report("PHDF5 (w/MPI-IO driver)\n");
-            break;
+    case POSIXIO:
+        output_report("POSIX\n");
+        break;
+    case MPIO:
+        output_report("MPIO\n");
+        break;
+    case PHDF5:
+        output_report("PHDF5 (w/MPI-IO driver)\n");
+        break;
     }
 
     MPI_Comm_size(pio_comm_g, &comm_size);
@@ -659,15 +659,15 @@ run_test(iotype iot, parameters parms, struct options *opts)
 
             read_close_mm_table[i] = read_close_mm;
 
-         }
+        }
 
-         io_time_destroy(res.timers);
+        io_time_destroy(res.timers);
     }
 
     /*
-     * Show various statistics
-     */
-    /* Write statistics	*/
+    * Show various statistics
+    */
+    /* Write statistics    */
     /* Print the raw data throughput if desired */
     if (opts->print_raw) {
         /* accumulate and output the max, min, and average "raw write" times */
@@ -718,22 +718,22 @@ run_test(iotype iot, parameters parms, struct options *opts)
 
     /* Print out time from open to first write */
     if (pio_debug_level >= 3) {
-       /* output all of the times for all iterations */
-       print_indent(3);
-       output_report("Write file open details:\n");
-       output_all_info(write_open_mm_table, parms.num_iters, 4);
+        /* output all of the times for all iterations */
+        print_indent(3);
+        output_report("Write file open details:\n");
+        output_all_info(write_open_mm_table, parms.num_iters, 4);
     }
 
     /* Print out time from last write to close */
     if (pio_debug_level >= 3) {
-       /* output all of the times for all iterations */
-       print_indent(3);
-       output_report("Write file close details:\n");
-       output_all_info(write_close_mm_table, parms.num_iters, 4);
+        /* output all of the times for all iterations */
+        print_indent(3);
+        output_report("Write file close details:\n");
+        output_all_info(write_close_mm_table, parms.num_iters, 4);
     }
 
     if (!parms.h5_write_only) {
-        /* Read statistics	*/
+        /* Read statistics    */
         /* Print the raw data throughput if desired */
         if (opts->print_raw) {
             /* accumulate and output the max, min, and average "raw read" times */
@@ -745,7 +745,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
             }
 
             output_results(opts, "Raw Data Read", read_raw_mm_table,
-                           parms.num_iters, raw_size);
+                    parms.num_iters, raw_size);
         } /* end if */
 
         /* show mpi read statics */
@@ -802,20 +802,20 @@ run_test(iotype iot, parameters parms, struct options *opts)
     }
 
     /* clean up our mess */
-    free(write_mpi_mm_table);
-    free(write_mm_table);
-    free(write_gross_mm_table);
-    free(write_raw_mm_table);
-    free(write_open_mm_table);
-    free(write_close_mm_table);
+    HDfree(write_mpi_mm_table);
+    HDfree(write_mm_table);
+    HDfree(write_gross_mm_table);
+    HDfree(write_raw_mm_table);
+    HDfree(write_open_mm_table);
+    HDfree(write_close_mm_table);
 
     if (!parms.h5_write_only) {
-        free(read_mpi_mm_table);
-        free(read_mm_table);
-        free(read_gross_mm_table);
-        free(read_raw_mm_table);
-        free(read_open_mm_table);
-        free(read_close_mm_table);
+        HDfree(read_mpi_mm_table);
+        HDfree(read_mm_table);
+        HDfree(read_gross_mm_table);
+        HDfree(read_raw_mm_table);
+        HDfree(read_open_mm_table);
+        HDfree(read_close_mm_table);
     }
 
     return ret_value;
@@ -919,13 +919,13 @@ create_comm_world(int num_procs, int *doing_pio)
     pio_comm_g = MPI_COMM_NULL;
 
     /*
-     * Create a sub communicator for this PIO run. Easier to use the first N
-     * processes.
-     */
+    * Create a sub communicator for this PIO run. Easier to use the first N
+    * processes.
+    */
     MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
 
     if (num_procs > nprocs) {
-        fprintf(stderr,
+        HDfprintf(stderr,
                 "number of process(%d) must be <= number of processes in MPI_COMM_WORLD(%d)\n",
                 num_procs, nprocs);
         goto error_done;
@@ -936,7 +936,7 @@ create_comm_world(int num_procs, int *doing_pio)
     mrc = MPI_Comm_split(MPI_COMM_WORLD, color, myrank, &pio_comm_g);
 
     if (mrc != MPI_SUCCESS) {
-        fprintf(stderr, "MPI_Comm_split failed\n");
+        HDfprintf(stderr, "MPI_Comm_split failed\n");
         goto error_done;
     }
 
@@ -950,11 +950,11 @@ create_comm_world(int num_procs, int *doing_pio)
     MPI_Comm_size(pio_comm_g, &pio_mpi_nprocs_g);
     MPI_Comm_rank(pio_comm_g, &pio_mpi_rank_g);
 
-done:
+    done:
     *doing_pio = color;
     return SUCCESS;
 
-error_done:
+    error_done:
     destroy_comm_world();
     return FAIL;
 }
@@ -990,7 +990,7 @@ destroy_comm_world(void)
  */
 static void
 output_results(const struct options *opts, const char *name, minmax *table,
-    int table_size,off_t data_size)
+        int table_size,off_t data_size)
 {
     minmax          total_mm;
 
@@ -1010,7 +1010,7 @@ output_results(const struct options *opts, const char *name, minmax *table,
 
     print_indent(4);
     output_report("Average Throughput: %6.2f MB/s",
-                  MB_PER_SEC(data_size,total_mm.sum / total_mm.num));
+            MB_PER_SEC(data_size,total_mm.sum / total_mm.num));
     if(opts->print_times)
         output_report(" (%7.3f s)\n", (total_mm.sum / total_mm.num));
     else
@@ -1027,7 +1027,7 @@ output_results(const struct options *opts, const char *name, minmax *table,
 
 static void
 output_times(const struct options *opts, const char *name, minmax *table,
-    int table_size)
+        int table_size)
 {
     minmax          total_mm;
 
@@ -1039,13 +1039,13 @@ output_times(const struct options *opts, const char *name, minmax *table,
     /* Note: The maximum throughput uses the minimum amount of time & vice versa */
 
     print_indent(4);
-        output_report("Minimum Accumulated Time using %d file(s): %7.5f s\n", opts->num_files,(total_mm.min));
+    output_report("Minimum Accumulated Time using %d file(s): %7.5f s\n", opts->num_files,(total_mm.min));
 
     print_indent(4);
-        output_report("Average Accumulated Time using %d file(s): %7.5f s\n", opts->num_files,(total_mm.sum / total_mm.num));
+    output_report("Average Accumulated Time using %d file(s): %7.5f s\n", opts->num_files,(total_mm.sum / total_mm.num));
 
     print_indent(4);
-        output_report("Maximum Accumulated Time using %d file(s): %7.5f s\n", opts->num_files,(total_mm.max));
+    output_report("Maximum Accumulated Time using %d file(s): %7.5f s\n", opts->num_files,(total_mm.max));
 }
 
 /*
@@ -1065,9 +1065,9 @@ output_report(const char *fmt, ...)
     if (myrank == 0) {
         va_list ap;
 
-        va_start(ap, fmt);
-        vfprintf(output, fmt, ap);
-        va_end(ap);
+        HDva_start(ap, fmt);
+        HDvfprintf(output, fmt, ap);
+        HDva_end(ap);
     }
 }
 
@@ -1087,10 +1087,10 @@ print_indent(register int indent)
     MPI_Comm_rank(pio_comm_g, &myrank);
 
     if (myrank == 0) {
-	indent *= TAB_SPACE;
+        indent *= TAB_SPACE;
 
-	for (; indent > 0; --indent)
-	    fputc(' ', output);
+        for (; indent > 0; --indent)
+            HDfputc(' ', output);
     }
 }
 
@@ -1115,11 +1115,11 @@ static void
 print_io_api(long io_types)
 {
     if (io_types & PIO_POSIX)
-	HDfprintf(output, "posix ");
+        HDfprintf(output, "posix ");
     if (io_types & PIO_MPI)
-	HDfprintf(output, "mpiio ");
+        HDfprintf(output, "mpiio ");
     if (io_types & PIO_HDF5)
-	HDfprintf(output, "phdf5 ");
+        HDfprintf(output, "phdf5 ");
     HDfprintf(output, "\n");
 }
 
@@ -1128,74 +1128,74 @@ report_parameters(struct options *opts)
 {
     int rank = comm_world_rank_g;
 
-    print_version("HDF5 Library");	/* print library version */
+    print_version("HDF5 Library");    /* print library version */
     HDfprintf(output, "rank %d: ==== Parameters ====\n", rank);
 
     HDfprintf(output, "rank %d: IO API=", rank);
     print_io_api(opts->io_types);
 
     HDfprintf(output, "rank %d: Number of files=%ld\n", rank,
-              opts->num_files);
+            opts->num_files);
     HDfprintf(output, "rank %d: Number of datasets=%ld\n", rank,
-              opts->num_dsets);
+            opts->num_dsets);
     HDfprintf(output, "rank %d: Number of iterations=%d\n", rank,
-              opts->num_iters);
+            opts->num_iters);
     HDfprintf(output, "rank %d: Number of processes=%d:%d\n", rank,
-              opts->min_num_procs, opts->max_num_procs);
+            opts->min_num_procs, opts->max_num_procs);
 
     if (opts->dim2d){
-    HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
-    recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->min_num_procs), ":");
-    recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->max_num_procs), "\n");
-
-    HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
-    recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), "x");
-    recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
-    recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "x");
-    recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
-
-    HDfprintf(output, "rank %d: File size=", rank);
-    recover_size_and_print((long long)(pow(opts->num_bpp * opts->min_num_procs,2)
-            * opts->num_dsets), ":");
-    recover_size_and_print((long long)(pow(opts->num_bpp * opts->max_num_procs,2)
-            * opts->num_dsets), "\n");
-
-    HDfprintf(output, "rank %d: Transfer buffer size=", rank);
-    if(opts->interleaved){
-        recover_size_and_print((long long)opts->min_xfer_size, "x");
-        recover_size_and_print((long long)opts->blk_size, ":");
-        recover_size_and_print((long long)opts->max_xfer_size, "x");
+        HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
+        recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->min_num_procs), ":");
+        recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->max_num_procs), "\n");
+
+        HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
+        recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), "x");
+        recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
+        recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "x");
+        recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
+
+        HDfprintf(output, "rank %d: File size=", rank);
+        recover_size_and_print((long long)(pow(opts->num_bpp * opts->min_num_procs,2)
+                * opts->num_dsets), ":");
+        recover_size_and_print((long long)(pow(opts->num_bpp * opts->max_num_procs,2)
+                * opts->num_dsets), "\n");
+
+        HDfprintf(output, "rank %d: Transfer buffer size=", rank);
+        if(opts->interleaved){
+            recover_size_and_print((long long)opts->min_xfer_size, "x");
+            recover_size_and_print((long long)opts->blk_size, ":");
+            recover_size_and_print((long long)opts->max_xfer_size, "x");
+            recover_size_and_print((long long)opts->blk_size, "\n");
+        }
+        else{
+            recover_size_and_print((long long)opts->blk_size, "x");
+            recover_size_and_print((long long)opts->min_xfer_size, ":");
+            recover_size_and_print((long long)opts->blk_size, "x");
+            recover_size_and_print((long long)opts->max_xfer_size, "\n");
+        }
+        HDfprintf(output, "rank %d: Block size=", rank);
+        recover_size_and_print((long long)opts->blk_size, "x");
         recover_size_and_print((long long)opts->blk_size, "\n");
     }
     else{
-        recover_size_and_print((long long)opts->blk_size, "x");
+        HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
+        recover_size_and_print((long long)opts->num_bpp, "\n");
+
+        HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
+        recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
+        recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
+
+        HDfprintf(output, "rank %d: File size=", rank);
+        recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs
+                * opts->num_dsets), ":");
+        recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs
+                * opts->num_dsets), "\n");
+
+        HDfprintf(output, "rank %d: Transfer buffer size=", rank);
         recover_size_and_print((long long)opts->min_xfer_size, ":");
-        recover_size_and_print((long long)opts->blk_size, "x");
         recover_size_and_print((long long)opts->max_xfer_size, "\n");
-    }
-    HDfprintf(output, "rank %d: Block size=", rank);
-    recover_size_and_print((long long)opts->blk_size, "x");
-    recover_size_and_print((long long)opts->blk_size, "\n");
-    }
-    else{
-    HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
-    recover_size_and_print((long long)opts->num_bpp, "\n");
-
-    HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
-    recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
-    recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
-
-    HDfprintf(output, "rank %d: File size=", rank);
-    recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs
-            * opts->num_dsets), ":");
-    recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs
-            * opts->num_dsets), "\n");
-
-    HDfprintf(output, "rank %d: Transfer buffer size=", rank);
-    recover_size_and_print((long long)opts->min_xfer_size, ":");
-    recover_size_and_print((long long)opts->max_xfer_size, "\n");
-    HDfprintf(output, "rank %d: Block size=", rank);
-    recover_size_and_print((long long)opts->blk_size, "\n");
+        HDfprintf(output, "rank %d: Block size=", rank);
+        recover_size_and_print((long long)opts->blk_size, "\n");
     }
 
     HDfprintf(output, "rank %d: Block Pattern in Dataset=", rank);
@@ -1228,7 +1228,7 @@ report_parameters(struct options *opts)
         char *prefix = HDgetenv("HDF5_PARAPREFIX");
 
         HDfprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank,
-                  (prefix ? prefix : "not set"));
+                (prefix ? prefix : "not set"));
     }
 
     HDfprintf(output, "rank %d: ", rank);
@@ -1283,39 +1283,39 @@ parse_command_line(int argc, char *argv[])
             cl_opts->h5_alignment = parse_size_directive(opt_arg);
             break;
         case 'A':
-            {
-                const char *end = opt_arg;
-
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    HDmemset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    if (!HDstrcasecmp(buf, "phdf5")) {
-                        cl_opts->io_types |= PIO_HDF5;
-                    } else if (!HDstrcasecmp(buf, "mpiio")) {
-                        cl_opts->io_types |= PIO_MPI;
-                    } else if (!HDstrcasecmp(buf, "posix")) {
-                        cl_opts->io_types |= PIO_POSIX;
-                    } else {
-                        fprintf(stderr, "pio_perf: invalid --api option %s\n",
-                                buf);
-                        exit(EXIT_FAILURE);
-                    }
+        {
+            const char *end = opt_arg;
+
+            while (end && *end != '\0') {
+                char buf[10];
+                int i;
+
+                HDmemset(buf, '\0', sizeof(buf));
+
+                for (i = 0; *end != '\0' && *end != ','; ++end)
+                    if (HDisalnum(*end) && i < 10)
+                        buf[i++] = *end;
+
+                if (!HDstrcasecmp(buf, "phdf5")) {
+                    cl_opts->io_types |= PIO_HDF5;
+                } else if (!HDstrcasecmp(buf, "mpiio")) {
+                    cl_opts->io_types |= PIO_MPI;
+                } else if (!HDstrcasecmp(buf, "posix")) {
+                    cl_opts->io_types |= PIO_POSIX;
+                } else {
+                    HDfprintf(stderr, "pio_perf: invalid --api option %s\n",
+                            buf);
+                    HDexit(EXIT_FAILURE);
+                }
 
-                    if (*end == '\0')
-                        break;
+                if (*end == '\0')
+                    break;
 
-                    end++;
-                }
+                end++;
             }
+        }
 
-            break;
+        break;
 #if 0
         case 'b':
             /* the future "binary" option */
@@ -1335,63 +1335,63 @@ parse_command_line(int argc, char *argv[])
             cl_opts->num_dsets = atoi(opt_arg);
             break;
         case 'D':
-            {
-                const char *end = opt_arg;
-
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    HDmemset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    if (strlen(buf) > 1 || isdigit(buf[0])) {
-                        size_t j;
-
-                        for (j = 0; j < 10 && buf[j] != '\0'; ++j)
-                            if (!isdigit(buf[j])) {
-                                fprintf(stderr, "pio_perf: invalid --debug option %s\n",
-                                        buf);
-                                exit(EXIT_FAILURE);
-                            }
-
-                        pio_debug_level = atoi(buf);
-
-                        if (pio_debug_level > 4)
-                            pio_debug_level = 4;
-                        else if (pio_debug_level < 0)
-                            pio_debug_level = 0;
-                    } else {
-                        switch (*buf) {
-                        case 'r':
-                            /* Turn on raw data throughput info */
-                            cl_opts->print_raw = TRUE;
-                            break;
-                        case 't':
-                            /* Turn on time printing */
-                            cl_opts->print_times = TRUE;
-                            break;
-            case 'v':
-                            /* Turn on verify data correctness*/
-                cl_opts->verify = TRUE;
-                break;
-                        default:
-                            fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
-                            exit(EXIT_FAILURE);
+        {
+            const char *end = opt_arg;
+
+            while (end && *end != '\0') {
+                char buf[10];
+                int i;
+
+                HDmemset(buf, '\0', sizeof(buf));
+
+                for (i = 0; *end != '\0' && *end != ','; ++end)
+                    if (isalnum(*end) && i < 10)
+                        buf[i++] = *end;
+
+                if (strlen(buf) > 1 || isdigit(buf[0])) {
+                    size_t j;
+
+                    for (j = 0; j < 10 && buf[j] != '\0'; ++j)
+                        if (!isdigit(buf[j])) {
+                            fprintf(stderr, "pio_perf: invalid --debug option %s\n",
+                                    buf);
+                            HDexit(EXIT_FAILURE);
                         }
-                    }
 
-                    if (*end == '\0')
+                    pio_debug_level = atoi(buf);
+
+                    if (pio_debug_level > 4)
+                        pio_debug_level = 4;
+                    else if (pio_debug_level < 0)
+                        pio_debug_level = 0;
+                } else {
+                    switch (*buf) {
+                    case 'r':
+                    /* Turn on raw data throughput info */
+                        cl_opts->print_raw = TRUE;
                         break;
-
-                    end++;
+                    case 't':
+                        /* Turn on time printing */
+                        cl_opts->print_times = TRUE;
+                        break;
+                    case 'v':
+                        /* Turn on verify data correctness*/
+                        cl_opts->verify = TRUE;
+                        break;
+                    default:
+                        HDfprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
+                        HDexit(EXIT_FAILURE);
+                    }
                 }
+
+                if (*end == '\0')
+                    break;
+
+                end++;
             }
+        }
 
-            break;
+        break;
         case 'e':
             cl_opts->num_bpp = parse_size_directive(opt_arg);
             break;
@@ -1432,7 +1432,7 @@ parse_command_line(int argc, char *argv[])
         case '?':
         default:
             usage(progname);
-            free(cl_opts);
+            HDfree(cl_opts);
             return NULL;
         }
     }
@@ -1457,30 +1457,30 @@ parse_command_line(int argc, char *argv[])
 
     /* set default if none specified yet */
     if (!cl_opts->io_types)
-    cl_opts->io_types = PIO_HDF5 | PIO_MPI | PIO_POSIX; /* run all API */
+        cl_opts->io_types = PIO_HDF5 | PIO_MPI | PIO_POSIX; /* run all API */
 
     /* verify parameters sanity.  Adjust if needed. */
     /* cap xfer_size with bytes per process */
     if (!cl_opts->dim2d) {
         if (cl_opts->min_xfer_size > cl_opts->num_bpp)
-        cl_opts->min_xfer_size = cl_opts->num_bpp;
+            cl_opts->min_xfer_size = cl_opts->num_bpp;
         if (cl_opts->max_xfer_size > cl_opts->num_bpp)
-        cl_opts->max_xfer_size = cl_opts->num_bpp;
+            cl_opts->max_xfer_size = cl_opts->num_bpp;
     }
     if (cl_opts->min_xfer_size > cl_opts->max_xfer_size)
-    cl_opts->min_xfer_size = cl_opts->max_xfer_size;
+        cl_opts->min_xfer_size = cl_opts->max_xfer_size;
     if (cl_opts->blk_size > cl_opts->num_bpp )
         cl_opts->blk_size = cl_opts->num_bpp;
     /* check range of number of processes */
     if (cl_opts->min_num_procs <= 0)
-    cl_opts->min_num_procs = 1;
+        cl_opts->min_num_procs = 1;
     if (cl_opts->max_num_procs <= 0)
-    cl_opts->max_num_procs = 1;
+        cl_opts->max_num_procs = 1;
     if (cl_opts->min_num_procs > cl_opts->max_num_procs)
-    cl_opts->min_num_procs = cl_opts->max_num_procs;
+        cl_opts->min_num_procs = cl_opts->max_num_procs;
     /* check iteration */
     if (cl_opts->num_iters <= 0)
-    cl_opts->num_iters = 1;
+        cl_opts->num_iters = 1;
 
     return cl_opts;
 }
@@ -1513,21 +1513,21 @@ parse_size_directive(const char *size)
             ++endptr;
 
         switch (*endptr) {
-            case 'K':
-            case 'k':
-                s *= ONE_KB;
-                break;
-            case 'M':
-            case 'm':
-                s *= ONE_MB;
-                break;
-            case 'G':
-            case 'g':
-                s *= ONE_GB;
-                break;
-            default:
-                fprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
-                exit(EXIT_FAILURE);
+        case 'K':
+        case 'k':
+            s *= ONE_KB;
+            break;
+        case 'M':
+        case 'm':
+            s *= ONE_MB;
+            break;
+        case 'G':
+        case 'g':
+            s *= ONE_GB;
+            break;
+        default:
+            HDfprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
+            HDexit(EXIT_FAILURE);
         }
     }
 
@@ -1540,7 +1540,7 @@ parse_size_directive(const char *size)
  * Return:      Nothing
  * Programmer:  Bill Wendling, 31. October 2001
  * Modifications:
- * 	Added 2D testing (Christian Chilan, 10. August 2005)
+ *     Added 2D testing (Christian Chilan, 10. August 2005)
  */
 static void
 usage(const char *prog)
@@ -1550,126 +1550,126 @@ usage(const char *prog)
     MPI_Comm_rank(pio_comm_g, &myrank);
 
     if (myrank == 0) {
-	print_version(prog);
-        printf("usage: %s [OPTIONS]\n", prog);
-        printf("  OPTIONS\n");
-        printf("     -h, --help                  Print a usage message and exit\n");
-        printf("     -a S, --align=S             Alignment of objects in HDF5 file [default: 1]\n");
-        printf("     -A AL, --api=AL             Which APIs to test [default: all of them]\n");
+        print_version(prog);
+        HDprintf("usage: %s [OPTIONS]\n", prog);
+        HDprintf("  OPTIONS\n");
+        HDprintf("     -h, --help                  Print a usage message and exit\n");
+        HDprintf("     -a S, --align=S             Alignment of objects in HDF5 file [default: 1]\n");
+        HDprintf("     -A AL, --api=AL             Which APIs to test [default: all of them]\n");
 #if 0
-        printf("     -b, --binary                The elusive binary option\n");
+        HDprintf("     -b, --binary                The elusive binary option\n");
 #endif  /* 0 */
-        printf("     -B S, --block-size=S        Block size within transfer buffer\n");
-        printf("                                 (see below for description)\n");
-        printf("                                 [default: half the number of bytes per process\n");
-        printf("                                           per dataset]\n");
-        printf("     -c, --chunk                 Create HDF5 datasets using chunked storage\n");
-        printf("                                 [default: contiguous storage]\n");
-        printf("     -C, --collective            Use collective I/O for MPI and HDF5 APIs\n");
-        printf("                                 [default: independent I/O)\n");
-        printf("     -d N, --num-dsets=N         Number of datasets per file [default: 1]\n");
-        printf("     -D DL, --debug=DL           Indicate the debugging level\n");
-        printf("                                 [default: no debugging]\n");
-        printf("     -e S, --num-bytes=S         Number of bytes per process per dataset\n");
-        printf("                                 (see below for description)\n");
-        printf("                                 [default: 256K for 1D, 8K for 2D]\n");
-        printf("     -F N, --num-files=N         Number of files [default: 1]\n");
-        printf("     -g, --geometry              Use 2D geometry [default: 1D geometry]\n");
-        printf("     -i N, --num-iterations=N    Number of iterations to perform [default: 1]\n");
-        printf("     -I, --interleaved           Interleaved access pattern\n");
-        printf("                                 (see below for example)\n");
-        printf("                                 [default: Contiguous access pattern]\n");
-        printf("     -o F, --output=F            Output raw data into file F [default: none]\n");
-        printf("     -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n");
-        printf("     -P N, --max-num-processes=N Maximum number of processes to use\n");
-        printf("                                 [default: all MPI_COMM_WORLD processes ]\n");
-        printf("     -T S, --threshold=S         Threshold for alignment of objects in HDF5 file\n");
-        printf("                                 [default: 1]\n");
-        printf("     -w, --write-only            Perform write tests not the read tests\n");
-        printf("     -x S, --min-xfer-size=S     Minimum transfer buffer size\n");
-        printf("                                 (see below for description)\n");
-        printf("                                 [default: half the number of bytes per process\n");
-        printf("                                           per dataset]\n");
-        printf("     -X S, --max-xfer-size=S     Maximum transfer buffer size\n");
-        printf("                                 [default: the number of bytes per process per\n");
-        printf("                                           dataset]\n");
-        printf("\n");
-        printf("  F  - is a filename.\n");
-        printf("  N  - is an integer >=0.\n");
-        printf("  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
-        printf("          K - Kilobyte (%d)\n", ONE_KB);
-        printf("          M - Megabyte (%d)\n", ONE_MB);
-        printf("          G - Gigabyte (%d)\n", ONE_GB);
-        printf("\n");
-        printf("      Example: '37M' is 37 megabytes or %d bytes\n", 37*ONE_MB);
-        printf("\n");
-        printf("  AL - is an API list. Valid values are:\n");
-        printf("          phdf5 - Parallel HDF5\n");
-        printf("          mpiio - MPI-I/O\n");
-        printf("          posix - POSIX\n");
-        printf("\n");
-        printf("      Example: --api=mpiio,phdf5\n");
-        printf("\n");
-        printf("  Dataset size:\n");
-        printf("      Depending on the selected geometry, each test dataset is either a linear\n");
-        printf("      array of size bytes-per-process * num-processes, or a square array of size\n");
-        printf("      (bytes-per-process * num-processes) x (bytes-per-process * num-processes).\n");
-        printf("\n");
-        printf("  Block size vs. Transfer buffer size:\n");
-        printf("      buffer-size controls the size of the memory buffer, which is broken into\n");
-        printf("      blocks and written to the file. Depending on the selected geometry, each\n");
-        printf("      block can be a linear array of size block-size or a square array of size\n");
-        printf("      block-size x block-size. The arrangement in which blocks are written is\n");
-        printf("      determined by the access pattern.\n");
-        printf("\n");
-        printf("      In 1D geometry, the transfer buffer is a linear array of size buffer-size.\n");
-        printf("      In 2D geometry, it is a rectangular array of size block-size x buffer-size\n");
-        printf("      or buffer-size x block-size if interleaved pattern is selected.\n");
-        printf("\n");
-        printf("  Interleaved and Contiguous patterns in 1D geometry:\n");
-        printf("      When contiguous access pattern is chosen, the dataset is evenly divided\n");
-        printf("      into num-processes regions and each process writes data to its own region.\n");
-        printf("      When interleaved blocks are written to a dataset, space for the first\n");
-        printf("      block of the first process is allocated in the dataset, then space is\n");
-        printf("      allocated for the first block of the second process, etc. until space is\n");
-        printf("      allocated for the first block of each process, then space is allocated for\n");
-        printf("      the second block of the first process, the second block of the second\n");
-        printf("      process, etc.\n");
-        printf("\n");
-        printf("      For example, with a 3 process run, 512KB bytes-per-process, 256KB transfer\n");
-        printf("        buffer size, and 64KB block size, each process must issue 2 transfer\n");
-        printf("        requests to complete access to the dataset.\n");
-        printf("          Contiguous blocks of the first transfer request are written like so:\n");
-        printf("              1111----2222----3333----\n");
-        printf("          Interleaved blocks of the first transfer request are written like so:\n");
-        printf("              123123123123------------\n");
-        printf("        The actual number of I/O operations involved in a transfer request\n");
-        printf("        depends on the access pattern and communication mode.\n");
-        printf("        When using independent I/O with interleaved pattern, each process\n");
-        printf("        performs 4 small non-contiguous I/O operations per transfer request.\n");
-        printf("        If collective I/O is turned on, the combined content of the buffers of\n");
-        printf("        the 3 processes will be written using one collective I/O operation\n");
-        printf("        per transfer request.\n");
-        printf("\n");
-        printf("      For information about access patterns in 2D geometry, please refer to the\n");
-        printf("      HDF5 Reference Manual.\n");
-        printf("\n");
-        printf("  DL - is a list of debugging flags. Valid values are:\n");
-        printf("          1 - Minimal\n");
-        printf("          2 - Not quite everything\n");
-        printf("          3 - Everything\n");
-        printf("          4 - The kitchen sink\n");
-        printf("          r - Raw data I/O throughput information\n");
-        printf("          t - Times as well as throughputs\n");
-        printf("          v - Verify data correctness\n");
-        printf("\n");
-        printf("      Example: --debug=2,r,t\n");
-        printf("\n");
-        printf("  Environment variables:\n");
-        printf("  HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
-        printf("  HDF5_MPI_INFO    MPI INFO object key=value separated by ;\n");
-        printf("  HDF5_PARAPREFIX  Paralllel data files prefix\n");
-        fflush(stdout);
+        HDprintf("     -B S, --block-size=S        Block size within transfer buffer\n");
+        HDprintf("                                 (see below for description)\n");
+        HDprintf("                                 [default: half the number of bytes per process\n");
+        HDprintf("                                           per dataset]\n");
+        HDprintf("     -c, --chunk                 Create HDF5 datasets using chunked storage\n");
+        HDprintf("                                 [default: contiguous storage]\n");
+        HDprintf("     -C, --collective            Use collective I/O for MPI and HDF5 APIs\n");
+        HDprintf("                                 [default: independent I/O)\n");
+        HDprintf("     -d N, --num-dsets=N         Number of datasets per file [default: 1]\n");
+        HDprintf("     -D DL, --debug=DL           Indicate the debugging level\n");
+        HDprintf("                                 [default: no debugging]\n");
+        HDprintf("     -e S, --num-bytes=S         Number of bytes per process per dataset\n");
+        HDprintf("                                 (see below for description)\n");
+        HDprintf("                                 [default: 256K for 1D, 8K for 2D]\n");
+        HDprintf("     -F N, --num-files=N         Number of files [default: 1]\n");
+        HDprintf("     -g, --geometry              Use 2D geometry [default: 1D geometry]\n");
+        HDprintf("     -i N, --num-iterations=N    Number of iterations to perform [default: 1]\n");
+        HDprintf("     -I, --interleaved           Interleaved access pattern\n");
+        HDprintf("                                 (see below for example)\n");
+        HDprintf("                                 [default: Contiguous access pattern]\n");
+        HDprintf("     -o F, --output=F            Output raw data into file F [default: none]\n");
+        HDprintf("     -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n");
+        HDprintf("     -P N, --max-num-processes=N Maximum number of processes to use\n");
+        HDprintf("                                 [default: all MPI_COMM_WORLD processes ]\n");
+        HDprintf("     -T S, --threshold=S         Threshold for alignment of objects in HDF5 file\n");
+        HDprintf("                                 [default: 1]\n");
+        HDprintf("     -w, --write-only            Perform write tests not the read tests\n");
+        HDprintf("     -x S, --min-xfer-size=S     Minimum transfer buffer size\n");
+        HDprintf("                                 (see below for description)\n");
+        HDprintf("                                 [default: half the number of bytes per process\n");
+        HDprintf("                                           per dataset]\n");
+        HDprintf("     -X S, --max-xfer-size=S     Maximum transfer buffer size\n");
+        HDprintf("                                 [default: the number of bytes per process per\n");
+        HDprintf("                                           dataset]\n");
+        HDprintf("\n");
+        HDprintf("  F  - is a filename.\n");
+        HDprintf("  N  - is an integer >=0.\n");
+        HDprintf("  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
+        HDprintf("          K - Kilobyte (%d)\n", ONE_KB);
+        HDprintf("          M - Megabyte (%d)\n", ONE_MB);
+        HDprintf("          G - Gigabyte (%d)\n", ONE_GB);
+        HDprintf("\n");
+        HDprintf("      Example: '37M' is 37 megabytes or %d bytes\n", 37*ONE_MB);
+        HDprintf("\n");
+        HDprintf("  AL - is an API list. Valid values are:\n");
+        HDprintf("          phdf5 - Parallel HDF5\n");
+        HDprintf("          mpiio - MPI-I/O\n");
+        HDprintf("          posix - POSIX\n");
+        HDprintf("\n");
+        HDprintf("      Example: --api=mpiio,phdf5\n");
+        HDprintf("\n");
+        HDprintf("  Dataset size:\n");
+        HDprintf("      Depending on the selected geometry, each test dataset is either a linear\n");
+        HDprintf("      array of size bytes-per-process * num-processes, or a square array of size\n");
+        HDprintf("      (bytes-per-process * num-processes) x (bytes-per-process * num-processes).\n");
+        HDprintf("\n");
+        HDprintf("  Block size vs. Transfer buffer size:\n");
+        HDprintf("      buffer-size controls the size of the memory buffer, which is broken into\n");
+        HDprintf("      blocks and written to the file. Depending on the selected geometry, each\n");
+        HDprintf("      block can be a linear array of size block-size or a square array of size\n");
+        HDprintf("      block-size x block-size. The arrangement in which blocks are written is\n");
+        HDprintf("      determined by the access pattern.\n");
+        HDprintf("\n");
+        HDprintf("      In 1D geometry, the transfer buffer is a linear array of size buffer-size.\n");
+        HDprintf("      In 2D geometry, it is a rectangular array of size block-size x buffer-size\n");
+        HDprintf("      or buffer-size x block-size if interleaved pattern is selected.\n");
+        HDprintf("\n");
+        HDprintf("  Interleaved and Contiguous patterns in 1D geometry:\n");
+        HDprintf("      When contiguous access pattern is chosen, the dataset is evenly divided\n");
+        HDprintf("      into num-processes regions and each process writes data to its own region.\n");
+        HDprintf("      When interleaved blocks are written to a dataset, space for the first\n");
+        HDprintf("      block of the first process is allocated in the dataset, then space is\n");
+        HDprintf("      allocated for the first block of the second process, etc. until space is\n");
+        HDprintf("      allocated for the first block of each process, then space is allocated for\n");
+        HDprintf("      the second block of the first process, the second block of the second\n");
+        HDprintf("      process, etc.\n");
+        HDprintf("\n");
+        HDprintf("      For example, with a 3 process run, 512KB bytes-per-process, 256KB transfer\n");
+        HDprintf("        buffer size, and 64KB block size, each process must issue 2 transfer\n");
+        HDprintf("        requests to complete access to the dataset.\n");
+        HDprintf("          Contiguous blocks of the first transfer request are written like so:\n");
+        HDprintf("              1111----2222----3333----\n");
+        HDprintf("          Interleaved blocks of the first transfer request are written like so:\n");
+        HDprintf("              123123123123------------\n");
+        HDprintf("        The actual number of I/O operations involved in a transfer request\n");
+        HDprintf("        depends on the access pattern and communication mode.\n");
+        HDprintf("        When using independent I/O with interleaved pattern, each process\n");
+        HDprintf("        performs 4 small non-contiguous I/O operations per transfer request.\n");
+        HDprintf("        If collective I/O is turned on, the combined content of the buffers of\n");
+        HDprintf("        the 3 processes will be written using one collective I/O operation\n");
+        HDprintf("        per transfer request.\n");
+        HDprintf("\n");
+        HDprintf("      For information about access patterns in 2D geometry, please refer to the\n");
+        HDprintf("      HDF5 Reference Manual.\n");
+        HDprintf("\n");
+        HDprintf("  DL - is a list of debugging flags. Valid values are:\n");
+        HDprintf("          1 - Minimal\n");
+        HDprintf("          2 - Not quite everything\n");
+        HDprintf("          3 - Everything\n");
+        HDprintf("          4 - The kitchen sink\n");
+        HDprintf("          r - Raw data I/O throughput information\n");
+        HDprintf("          t - Times as well as throughputs\n");
+        HDprintf("          v - Verify data correctness\n");
+        HDprintf("\n");
+        HDprintf("      Example: --debug=2,r,t\n");
+        HDprintf("\n");
+        HDprintf("  Environment variables:\n");
+        HDprintf("  HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
+        HDprintf("  HDF5_MPI_INFO    MPI INFO object key=value separated by ;\n");
+        HDprintf("  HDF5_PARAPREFIX  Paralllel data files prefix\n");
+        HDfflush(stdout);
     } /* end if */
 } /* end usage() */
 
@@ -1685,7 +1685,7 @@ usage(const char *prog)
 int
 main(void)
 {
-    printf("No parallel IO performance because parallel is not configured\n");
+    HDprintf("No parallel IO performance because parallel is not configured\n");
     return EXIT_SUCCESS;
 } /* end main */
 
diff --git a/tools/perform/pio_standalone.h b/tools/perform/pio_standalone.h
index 0330ef2..2a065ad 100644
--- a/tools/perform/pio_standalone.h
+++ b/tools/perform/pio_standalone.h
@@ -303,6 +303,7 @@ typedef off_t               h5_stat_size_t;
 #define HDpipe(F)               pipe(F)
 #define HDpow(X,Y)              pow(X,Y)
 /* printf() variable arguments */
+#define HDprintf(...)           printf /*varargs*/
 #define HDputc(C,F)             putc(C,F)
 #define HDputchar(C)            putchar(C)
 #define HDputs(S)               puts(S)
@@ -357,6 +358,7 @@ H5_DLL int HDrand(void);
 #define HDsin(X)                sin(X)
 #define HDsinh(X)               sinh(X)
 #define HDsleep(N)              sleep(N)
+#define HDsprintf               sprintf /*varargs*/
 #ifdef H5_HAVE_WIN32_API
 H5_DLL int c99_snprintf(char* str, size_t size, const char* format, ...);
 #define HDsnprintf          c99_snprintf /*varargs*/
diff --git a/tools/perform/sio_engine.c b/tools/perform/sio_engine.c
index 38d95b4..70460f6 100644
--- a/tools/perform/sio_engine.c
+++ b/tools/perform/sio_engine.c
@@ -41,7 +41,7 @@
 
 #define GOTOERROR(errcode)  { ret_code = errcode; goto done; }
 #define ERRMSG(mesg) {                                                  \
-    fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n",    \
+    HDfprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n",    \
         mesg, (int)__LINE__, __FILE__);                             \
 }
 
@@ -199,7 +199,7 @@ do_sio(parameters param)
     if (sio_debug_level >= 4)
 
     /* output all of the times for all iterations */
-        fprintf(output, "Timer details:\n");
+        HDfprintf(output, "Timer details:\n");
 
     /*
      * Write performance measurement
@@ -492,7 +492,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
         /* Create the dataset transfer property list */
         h5dxpl = H5Pcreate(H5P_DATASET_XFER);
         if (h5dxpl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
+            HDfprintf(stderr, "HDF5 Property List Create failed\n");
             GOTOERROR(FAIL);
         }
 
@@ -514,7 +514,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
             h5dcpl = H5Pcreate(H5P_DATASET_CREATE);
 
         if (h5dcpl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
+            HDfprintf(stderr, "HDF5 Property List Create failed\n");
             GOTOERROR(FAIL);
         }
 
@@ -522,12 +522,12 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
         /* Set the chunk size to be the same as the buffer size */
             hrc = H5Pset_chunk(h5dcpl, rank, h5chunk);
             if (hrc < 0) {
-                fprintf(stderr, "HDF5 Property List Set failed\n");
+                HDfprintf(stderr, "HDF5 Property List Set failed\n");
                 GOTOERROR(FAIL);
             } /* end if */
         } /* end if */
 
-        sprintf(dname, "Dataset_%ld", (unsigned long)parms->num_bytes);
+        HDsprintf(dname, "Dataset_%ld", (unsigned long)parms->num_bytes);
         h5ds_id = H5Dcreate2(fd->h5fd, dname, ELMT_H5_TYPE,
             h5dset_space_id, H5P_DEFAULT, h5dcpl, H5P_DEFAULT);
 
@@ -558,7 +558,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
     hrc = dset_write(rank-1, fd, parms, buffer);
 
     if (hrc < 0) {
-        fprintf(stderr, "Error in dataset write\n");
+        HDfprintf(stderr, "Error in dataset write\n");
         GOTOERROR(FAIL);
     }
 
@@ -573,7 +573,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
         hrc = H5Dclose(h5ds_id);
 
         if (hrc < 0) {
-            fprintf(stderr, "HDF5 Dataset Close failed\n");
+            HDfprintf(stderr, "HDF5 Dataset Close failed\n");
             GOTOERROR(FAIL);
         }
 
@@ -586,7 +586,7 @@ done:
     if (h5dset_space_id != -1) {
         hrc = H5Sclose(h5dset_space_id);
         if (hrc < 0){
-            fprintf(stderr, "HDF5 Dataset Space Close failed\n");
+            HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
             ret_code = FAIL;
         } else {
             h5dset_space_id = -1;
@@ -596,7 +596,7 @@ done:
     if (h5mem_space_id != -1) {
         hrc = H5Sclose(h5mem_space_id);
         if (hrc < 0) {
-            fprintf(stderr, "HDF5 Memory Space Close failed\n");
+            HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
             ret_code = FAIL;
         } else {
             h5mem_space_id = -1;
@@ -606,7 +606,7 @@ done:
     if (h5dxpl != -1) {
         hrc = H5Pclose(h5dxpl);
         if (hrc < 0) {
-            fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+            HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
             ret_code = FAIL;
         } else {
             h5dxpl = -1;
@@ -839,7 +839,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
         /* Create the dataset transfer property list */
         h5dxpl = H5Pcreate(H5P_DATASET_XFER);
         if (h5dxpl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
+            HDfprintf(stderr, "HDF5 Property List Create failed\n");
             GOTOERROR(FAIL);
         }
         break;
@@ -858,7 +858,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
         break;
 
         case HDF5:
-        sprintf(dname, "Dataset_%ld", (long)parms->num_bytes);
+        HDsprintf(dname, "Dataset_%ld", (long)parms->num_bytes);
         h5ds_id = H5Dopen2(fd->h5fd, dname, H5P_DEFAULT);
         if (h5ds_id < 0) {
             HDfprintf(stderr, "HDF5 Dataset open failed\n");
@@ -878,7 +878,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
     hrc = dset_read(rank-1, fd, parms, buffer, buffer2);
 
     if (hrc < 0) {
-        fprintf(stderr, "Error in dataset read\n");
+        HDfprintf(stderr, "Error in dataset read\n");
         GOTOERROR(FAIL);
     }
 
@@ -892,7 +892,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
         hrc = H5Dclose(h5ds_id);
 
         if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Close failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -905,7 +905,7 @@ done:
     if (h5dset_space_id != -1) {
     hrc = H5Sclose(h5dset_space_id);
     if (hrc < 0){
-        fprintf(stderr, "HDF5 Dataset Space Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
         ret_code = FAIL;
     } else {
         h5dset_space_id = -1;
@@ -915,7 +915,7 @@ done:
     if (h5mem_space_id != -1) {
     hrc = H5Sclose(h5mem_space_id);
     if (hrc < 0) {
-        fprintf(stderr, "HDF5 Memory Space Close failed\n");
+        HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
         ret_code = FAIL;
     } else {
         h5mem_space_id = -1;
@@ -925,7 +925,7 @@ done:
     if (h5dxpl != -1) {
     hrc = H5Pclose(h5dxpl);
     if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+        HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
         ret_code = FAIL;
     } else {
         h5dxpl = -1;
@@ -1090,7 +1090,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
         fapl = set_vfd(param);
 
         if (fapl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
+            HDfprintf(stderr, "HDF5 Property List Create failed\n");
             GOTOERROR(FAIL);
         }
 
@@ -1103,7 +1103,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
 
 
         if (fd->h5fd < 0) {
-            fprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
+            HDfprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
             GOTOERROR(FAIL);
         }
         break;
@@ -1169,7 +1169,7 @@ set_vfd(parameters *param)
         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;
-            sprintf(sv[mt], "%%s-%c.h5", multi_letters[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);
         }
@@ -1218,7 +1218,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
         rc = POSIXCLOSE(fd->posixfd);
 
         if (rc != 0){
-        fprintf(stderr, "POSIX File Close failed\n");
+        HDfprintf(stderr, "POSIX File Close failed\n");
         GOTOERROR(FAIL);
         }
 
@@ -1229,7 +1229,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
         hrc = H5Fclose(fd->h5fd);
 
         if (hrc < 0) {
-        fprintf(stderr, "HDF5 File Close failed\n");
+        HDfprintf(stderr, "HDF5 File Close failed\n");
         GOTOERROR(FAIL);
         }
 
diff --git a/tools/perform/sio_perf.c b/tools/perform/sio_perf.c
index 2e6510f..c4958cd 100644
--- a/tools/perform/sio_perf.c
+++ b/tools/perform/sio_perf.c
@@ -285,14 +285,14 @@ struct options {
     int buf_rank;               /* Rank                   */
     int order_rank;             /* Rank                   */
     int chk_rank;               /* Rank                   */
-    int print_times;       	/* print times as well as throughputs   */
-    int print_raw;         	/* print raw data throughput info       */
+    int print_times;           /* print times as well as throughputs   */
+    int print_raw;             /* print raw data throughput info       */
     off_t h5_alignment;         /* alignment in HDF5 file               */
     off_t h5_threshold;         /* threshold for alignment in HDF5 file */
-    int h5_use_chunks;     	/* Make HDF5 dataset chunked            */
-    int h5_write_only;        	/* Perform the write tests only         */
-    int h5_extendable;        	/* Perform the write tests only         */
-    int verify;        		/* Verify data correctness              */
+    int h5_use_chunks;         /* Make HDF5 dataset chunked            */
+    int h5_write_only;            /* Perform the write tests only         */
+    int h5_extendable;            /* Perform the write tests only         */
+    int verify;                /* Verify data correctness              */
     vfdtype     vfd;            /* File driver */
 
 };
@@ -336,7 +336,7 @@ main(int argc, char **argv)
     /* Initialize h5tools lib */
     h5tools_init();
 #endif
-    
+
     output = stdout;
 
     opts = parse_command_line(argc, argv);
@@ -348,8 +348,8 @@ main(int argc, char **argv)
 
     if (opts->output_file) {
         if ((output = HDfopen(opts->output_file, "w")) == NULL) {
-            fprintf(stderr, "%s: cannot open output file\n", progname);
-            perror(opts->output_file);
+            HDfprintf(stderr, "%s: cannot open output file\n", progname);
+            HDperror(opts->output_file);
             goto finish;
         }
     }
@@ -359,7 +359,7 @@ main(int argc, char **argv)
     run_test_loop(opts);
 
 finish:
-    free(opts);
+    HDfree(opts);
     return exit_value;
 }
 
@@ -553,7 +553,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
     /*
      * Show various statistics
      */
-    /* Write statistics	*/
+    /* Write statistics    */
     /* Print the raw data throughput if desired */
     if (opts->print_raw) {
         /* accumulate and output the max, min, and average "raw write" times */
@@ -599,7 +599,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
     output_results(opts,"Write Open-Close",write_gross_mm_table,parms.num_iters,raw_size);
 
     if (!parms.h5_write_only) {
-        /* Read statistics	*/
+        /* Read statistics    */
         /* Print the raw data throughput if desired */
         if (opts->print_raw) {
             /* accumulate and output the max, min, and average "raw read" times */
@@ -648,16 +648,16 @@ run_test(iotype iot, parameters parms, struct options *opts)
     }
 
     /* clean up our mess */
-    free(write_sys_mm_table);
-    free(write_mm_table);
-    free(write_gross_mm_table);
-    free(write_raw_mm_table);
+    HDfree(write_sys_mm_table);
+    HDfree(write_mm_table);
+    HDfree(write_gross_mm_table);
+    HDfree(write_raw_mm_table);
 
     if (!parms.h5_write_only) {
-        free(read_sys_mm_table);
-        free(read_mm_table);
-        free(read_gross_mm_table);
-        free(read_raw_mm_table);
+        HDfree(read_sys_mm_table);
+        HDfree(read_mm_table);
+        HDfree(read_gross_mm_table);
+        HDfree(read_raw_mm_table);
     }
 
     return ret_value;
@@ -794,9 +794,9 @@ output_report(const char *fmt, ...)
 {
         va_list ap;
 
-        va_start(ap, fmt);
-        vfprintf(output, fmt, ap);
-        va_end(ap);
+        HDva_start(ap, fmt);
+        HDvfprintf(output, fmt, ap);
+        HDva_end(ap);
 }
 
 /*
@@ -810,10 +810,10 @@ output_report(const char *fmt, ...)
 static void
 print_indent(register int indent)
 {
-	indent *= TAB_SPACE;
+    indent *= TAB_SPACE;
 
-	for (; indent > 0; --indent)
-	    fputc(' ', output);
+    for (; indent > 0; --indent)
+        HDfputc(' ', output);
 }
 
 static void
@@ -837,9 +837,9 @@ static void
 print_io_api(long io_types)
 {
     if (io_types & SIO_POSIX)
-	HDfprintf(output, "posix ");
+    HDfprintf(output, "posix ");
     if (io_types & SIO_HDF5)
-	HDfprintf(output, "hdf5 ");
+    HDfprintf(output, "hdf5 ");
     HDfprintf(output, "\n");
 }
 
@@ -849,7 +849,7 @@ report_parameters(struct options *opts)
     int i, rank;
     rank = opts->dset_rank;
 
-    print_version("HDF5 Library");	/* print library version */
+    print_version("HDF5 Library");    /* print library version */
     HDfprintf(output, "==== Parameters ====\n");
 
     HDfprintf(output, "IO API=");
@@ -989,7 +989,7 @@ parse_command_line(int argc, char *argv[])
                     HDmemset(buf, '\0', sizeof(buf));
 
                     for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
+                        if (HDisalnum(*end) && i < 10)
                             buf[i++] = *end;
 
                     if (!HDstrcasecmp(buf, "hdf5")) {
@@ -997,9 +997,9 @@ parse_command_line(int argc, char *argv[])
                     } else if (!HDstrcasecmp(buf, "posix")) {
                         cl_opts->io_types |= SIO_POSIX;
                     } else {
-                        fprintf(stderr, "sio_perf: invalid --api option %s\n",
+                        HDfprintf(stderr, "sio_perf: invalid --api option %s\n",
                                 buf);
-                        exit(EXIT_FAILURE);
+                        HDexit(EXIT_FAILURE);
                     }
 
                     if (*end == '\0')
@@ -1028,7 +1028,7 @@ parse_command_line(int argc, char *argv[])
                     HDmemset(buf, '\0', sizeof(buf));
 
                     for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
+                        if (HDisalnum(*end) && i < 10)
                             buf[i++] = *end;
 
                     cl_opts->chk_size[j] = parse_size_directive(buf);
@@ -1056,17 +1056,17 @@ parse_command_line(int argc, char *argv[])
                     HDmemset(buf, '\0', sizeof(buf));
 
                     for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
+                        if (HDisalnum(*end) && i < 10)
                             buf[i++] = *end;
 
-                    if (strlen(buf) > 1 || isdigit(buf[0])) {
+                    if (HDstrlen(buf) > 1 || HDisdigit(buf[0])) {
                         size_t j;
 
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
-                            if (!isdigit(buf[j])) {
-                                fprintf(stderr, "sio_perf: invalid --debug option %s\n",
+                            if (!HDisdigit(buf[j])) {
+                                HDfprintf(stderr, "sio_perf: invalid --debug option %s\n",
                                         buf);
-                                exit(EXIT_FAILURE);
+                                HDexit(EXIT_FAILURE);
                             }
 
                         sio_debug_level = atoi(buf);
@@ -1090,8 +1090,8 @@ parse_command_line(int argc, char *argv[])
                 cl_opts->verify = TRUE;
                 break;
                         default:
-                            fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
-                            exit(EXIT_FAILURE);
+                            HDfprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
+                            HDexit(EXIT_FAILURE);
                         }
                     }
 
@@ -1114,7 +1114,7 @@ parse_command_line(int argc, char *argv[])
                     HDmemset(buf, '\0', sizeof(buf));
 
                     for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
+                        if (HDisalnum(*end) && i < 10)
                             buf[i++] = *end;
 
                     cl_opts->dset_size[j] = parse_size_directive(buf);
@@ -1132,7 +1132,7 @@ parse_command_line(int argc, char *argv[])
             break;
 
         case 'i':
-            cl_opts->num_iters = atoi(opt_arg);
+            cl_opts->num_iters = HDatoi(opt_arg);
             break;
         case 'o':
             cl_opts->output_file = opt_arg;
@@ -1156,9 +1156,9 @@ parse_command_line(int argc, char *argv[])
             } else if (!HDstrcasecmp(opt_arg, "direct")) {
                 cl_opts->vfd=direct;
             } else {
-                fprintf(stderr, "sio_perf: invalid --api option %s\n",
+                HDfprintf(stderr, "sio_perf: invalid --api option %s\n",
                                 opt_arg);
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
         case 'w':
@@ -1178,7 +1178,7 @@ parse_command_line(int argc, char *argv[])
                     HDmemset(buf, '\0', sizeof(buf));
 
                     for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
+                        if (HDisalnum(*end) && i < 10)
                             buf[i++] = *end;
 
                     cl_opts->buf_size[j] = parse_size_directive(buf);
@@ -1206,7 +1206,7 @@ parse_command_line(int argc, char *argv[])
                     HDmemset(buf, '\0', sizeof(buf));
 
                     for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
+                        if (HDisalnum(*end) && i < 10)
                             buf[i++] = *end;
 
                     cl_opts->order[j] = (int)parse_size_directive(buf);
@@ -1228,7 +1228,7 @@ parse_command_line(int argc, char *argv[])
         case '?':
         default:
             usage(progname);
-            free(cl_opts);
+            HDfree(cl_opts);
             return NULL;
         }
     }
@@ -1324,8 +1324,8 @@ parse_size_directive(const char *size)
                 break;
 
             default:
-                fprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
-                exit(EXIT_FAILURE);
+                HDfprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
+                HDexit(EXIT_FAILURE);
         }
     }
 
@@ -1342,73 +1342,73 @@ parse_size_directive(const char *size)
 static void
 usage(const char *prog)
 {
-	print_version(prog);
-        printf("usage: %s [OPTIONS]\n", prog);
-        printf("  OPTIONS\n");
-        printf("     -h                Print an usage message and exit\n");
-        printf("     -A AL             Which APIs to test\n");
-        printf("                       [default: all of them]\n");
-        printf("     -c SL             Selects chunked storage and defines chunks dimensions\n");
-        printf("                       and sizes\n");
-        printf("                       [default: Off]\n");
-        printf("     -e SL             Dimensions and sizes of dataset\n");
-        printf("                       [default: 100,200]\n");
-        printf("     -i N              Number of iterations to perform\n");
-        printf("                       [default: 1]\n");
-        printf("     -r NL             Dimension access order (see below for description)\n");
-        printf("                       [default: 1,2]\n");
-        printf("     -t                Selects extendable dimensions for HDF5 dataset\n");
-        printf("                       [default: Off]\n");
-        printf("     -v VFD            Selects file driver for HDF5 access\n");
-        printf("                       [default: sec2]\n");
-        printf("     -w                Perform write tests, not the read tests\n");
-        printf("                       [default: Off]\n");
-        printf("     -x SL             Dimensions and sizes of the transfer buffer\n");
-        printf("                       [default: 10,20]\n");
-        printf("\n");
-        printf("  N  - is an integer > 0.\n");
-        printf("\n");
-        printf("  S  - is a size specifier, an integer > 0 followed by a size indicator:\n");
-        printf("          K - Kilobyte (%d)\n", ONE_KB);
-        printf("          M - Megabyte (%d)\n", ONE_MB);
-        printf("          G - Gigabyte (%d)\n", ONE_GB);
-        printf("\n");
-        printf("      Example: '37M' is 37 megabytes or %d bytes\n", 37*ONE_MB);
-        printf("\n");
-        printf("  AL - is an API list. Valid values are:\n");
-        printf("          hdf5 - HDF5\n");
-        printf("          posix - POSIX\n");
-        printf("\n");
-        printf("      Example: -A posix,hdf5\n");
-        printf("\n");
-        printf("  NL - is list of integers (N) separated by commas.\n");
-        printf("\n");
-        printf("      Example: 1,2,3\n");
-        printf("\n");
-        printf("  SL - is list of size specifiers (S) separated by commas.\n");
-        printf("\n");
-        printf("      Example: 2K,2K,3K\n");
-        printf("\n");
-        printf("      The example defines an object (dataset, tranfer buffer) with three\n");
-        printf("      dimensions. Be aware that as the number of dimensions increases, the\n");
-        printf("      the total size of the object increases exponentially.\n");
-        printf("\n");
-        printf("  VFD  - is an HDF5 file driver specifier. Valid values are:\n");
-        printf("          sec2, stdio, core, split, multi, family, direct\n");
-        printf("\n");
-        printf("  Dimension access order:\n");
-        printf("      Data access starts at the cardinal origin of the dataset using the\n");
-        printf("      transfer buffer. The next access occurs on a dataset region next to\n");
-        printf("      the previous one. For a multidimensional dataset, there are several\n");
-        printf("      directions as to where to proceed. This can be specified in the dimension\n");
-        printf("      access order. For example, -r 1,2 states that the tool should traverse\n");
-        printf("      dimension 1 first, and then dimension 2.\n");
-        printf("\n");
-        printf("  Environment variables:\n");
-        printf("      HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
-        printf("      HDF5_PREFIX      Data file prefix\n");
-        printf("\n");
-        fflush(stdout);
+    print_version(prog);
+        HDprintf("usage: %s [OPTIONS]\n", prog);
+        HDprintf("  OPTIONS\n");
+        HDprintf("     -h                Print an usage message and exit\n");
+        HDprintf("     -A AL             Which APIs to test\n");
+        HDprintf("                       [default: all of them]\n");
+        HDprintf("     -c SL             Selects chunked storage and defines chunks dimensions\n");
+        HDprintf("                       and sizes\n");
+        HDprintf("                       [default: Off]\n");
+        HDprintf("     -e SL             Dimensions and sizes of dataset\n");
+        HDprintf("                       [default: 100,200]\n");
+        HDprintf("     -i N              Number of iterations to perform\n");
+        HDprintf("                       [default: 1]\n");
+        HDprintf("     -r NL             Dimension access order (see below for description)\n");
+        HDprintf("                       [default: 1,2]\n");
+        HDprintf("     -t                Selects extendable dimensions for HDF5 dataset\n");
+        HDprintf("                       [default: Off]\n");
+        HDprintf("     -v VFD            Selects file driver for HDF5 access\n");
+        HDprintf("                       [default: sec2]\n");
+        HDprintf("     -w                Perform write tests, not the read tests\n");
+        HDprintf("                       [default: Off]\n");
+        HDprintf("     -x SL             Dimensions and sizes of the transfer buffer\n");
+        HDprintf("                       [default: 10,20]\n");
+        HDprintf("\n");
+        HDprintf("  N  - is an integer > 0.\n");
+        HDprintf("\n");
+        HDprintf("  S  - is a size specifier, an integer > 0 followed by a size indicator:\n");
+        HDprintf("          K - Kilobyte (%d)\n", ONE_KB);
+        HDprintf("          M - Megabyte (%d)\n", ONE_MB);
+        HDprintf("          G - Gigabyte (%d)\n", ONE_GB);
+        HDprintf("\n");
+        HDprintf("      Example: '37M' is 37 megabytes or %d bytes\n", 37*ONE_MB);
+        HDprintf("\n");
+        HDprintf("  AL - is an API list. Valid values are:\n");
+        HDprintf("          hdf5 - HDF5\n");
+        HDprintf("          posix - POSIX\n");
+        HDprintf("\n");
+        HDprintf("      Example: -A posix,hdf5\n");
+        HDprintf("\n");
+        HDprintf("  NL - is list of integers (N) separated by commas.\n");
+        HDprintf("\n");
+        HDprintf("      Example: 1,2,3\n");
+        HDprintf("\n");
+        HDprintf("  SL - is list of size specifiers (S) separated by commas.\n");
+        HDprintf("\n");
+        HDprintf("      Example: 2K,2K,3K\n");
+        HDprintf("\n");
+        HDprintf("      The example defines an object (dataset, tranfer buffer) with three\n");
+        HDprintf("      dimensions. Be aware that as the number of dimensions increases, the\n");
+        HDprintf("      the total size of the object increases exponentially.\n");
+        HDprintf("\n");
+        HDprintf("  VFD  - is an HDF5 file driver specifier. Valid values are:\n");
+        HDprintf("          sec2, stdio, core, split, multi, family, direct\n");
+        HDprintf("\n");
+        HDprintf("  Dimension access order:\n");
+        HDprintf("      Data access starts at the cardinal origin of the dataset using the\n");
+        HDprintf("      transfer buffer. The next access occurs on a dataset region next to\n");
+        HDprintf("      the previous one. For a multidimensional dataset, there are several\n");
+        HDprintf("      directions as to where to proceed. This can be specified in the dimension\n");
+        HDprintf("      access order. For example, -r 1,2 states that the tool should traverse\n");
+        HDprintf("      dimension 1 first, and then dimension 2.\n");
+        HDprintf("\n");
+        HDprintf("  Environment variables:\n");
+        HDprintf("      HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
+        HDprintf("      HDF5_PREFIX      Data file prefix\n");
+        HDprintf("\n");
+        HDfflush(stdout);
 }
 
 void debug_start_stop_time(io_time_t *pt, timer_type t, int start_stop)
@@ -1452,7 +1452,7 @@ void debug_start_stop_time(io_time_t *pt, timer_type t, int start_stop)
                 break;
             }
 
-            fprintf(output, "    %s %s: %.2f\n", msg,
+            HDfprintf(output, "    %s %s: %.2f\n", msg,
                     (start_stop == TSTART ? "Start" : "Stop"),
                     pt->total_time[t]);
         }
diff --git a/tools/perform/sio_standalone.h b/tools/perform/sio_standalone.h
index a106fd9..5fa968f 100644
--- a/tools/perform/sio_standalone.h
+++ b/tools/perform/sio_standalone.h
@@ -325,6 +325,7 @@ typedef off_t               h5_stat_size_t;
 #define HDpipe(F)               pipe(F)
 #define HDpow(X,Y)              pow(X,Y)
 /* printf() variable arguments */
+#define HDprintf(...)           printf /*varargs*/
 #define HDputc(C,F)             putc(C,F)
 #define HDputchar(C)            putchar(C)
 #define HDputs(S)               puts(S)
@@ -379,6 +380,7 @@ H5_DLL int HDrand(void);
 #define HDsin(X)                sin(X)
 #define HDsinh(X)               sinh(X)
 #define HDsleep(N)              sleep(N)
+#define HDsprintf               sprintf /*varargs*/
 #ifdef H5_HAVE_WIN32_API
 H5_DLL int c99_snprintf(char* str, size_t size, const char* format, ...);
 #define HDsnprintf          c99_snprintf /*varargs*/