Merge HD prefix and whitespace changes from develop

122 files changed, 18811 insertions, 19174 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58e1c85..a611b71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -677,6 +677,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
     endif ()
   endif ()
 endif ()
+
 #-----------------------------------------------------------------------------
 # Option to use threadsafe
 #-----------------------------------------------------------------------------
diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp
index 142e70f..03e2855 100644
--- a/c++/examples/chunks.cpp
+++ b/c++/examples/chunks.cpp
@@ -37,194 +37,194 @@ const int      RANKC = 1;
 
 int main (void)
 {
-    hsize_t	i, j;
+    hsize_t     i, j;
 
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	/*
-	 * Turn off the auto-printing when failure occurs so that we can
-	 * handle the errors appropriately
-	 */
-	Exception::dontPrint();
-
-	/*
-	 * Open the file and the dataset.
-	 */
-	H5File file( FILE_NAME, H5F_ACC_RDONLY );
-	DataSet dataset = file.openDataSet( DATASET_NAME );
-
-	/*
-	 * Get filespace for rank and dimension
-	 */
-	DataSpace filespace = dataset.getSpace();
-
-	/*
-	 * Get number of dimensions in the file dataspace
-	 */
-	int rank = filespace.getSimpleExtentNdims();
-
-	/*
-	 * Get and print the dimension sizes of the file dataspace
-	 */
-	hsize_t dims[2]; 	// dataset dimensions
-	rank = filespace.getSimpleExtentDims( dims );
-	cout << "dataset rank = " << rank << ", dimensions "
-	     << (unsigned long)(dims[0]) << " x "
-	     << (unsigned long)(dims[1]) << endl;
-
-	/*
-	 * Define the memory space to read dataset.
-	 */
-	DataSpace mspace1(RANK, dims);
-
-	/*
-	 * Read dataset back and display.
-	 */
-	int data_out[NX][NY];  // buffer for dataset to be read
-	dataset.read( data_out, PredType::NATIVE_INT, mspace1, filespace );
-
-	cout << "\n";
-	cout << "Dataset: \n";
-	for (j = 0; j < dims[0]; j++)
-	{
-	    for (i = 0; i < dims[1]; i++)
-		cout << data_out[j][i] << " ";
-	    cout << endl;
-	}
-
-	/*
-	 *	    dataset rank 2, dimensions 10 x 5
-	 *	    chunk rank 2, dimensions 2 x 5
-
-	 *	    Dataset:
-	 *	    1 1 1 3 3
-	 *	    1 1 1 3 3
-	 *	    1 1 1 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 *	    2 0 0 0 0
-	 */
-
-	/*
-	 * Read the third column from the dataset.
-	 * First define memory dataspace, then define hyperslab
-	 * and read it into column array.
-	 */
-	hsize_t col_dims[1];
-	col_dims[0] = 10;
-	DataSpace mspace2( RANKC, col_dims );
-
-	/*
-	 * Define the column (hyperslab) to read.
-	 */
-	hsize_t offset[2] = { 0, 2 };
-	hsize_t  count[2] = { 10, 1 };
-	int column[10];  // buffer for column to be read
-
-	/*
-	 * Define hyperslab and read.
-	 */
-	filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
-	dataset.read( column, PredType::NATIVE_INT, mspace2, filespace );
-
-	cout << endl;
-	cout << "Third column: " << endl;
-	for (i = 0; i < 10; i++)
-	    cout << column[i] << endl;
-
-	/*
-	 *	    Third column:
-	 *	    1
-	 *	    1
-	 *	    1
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 *	    0
-	 */
-
-	/*
-	 * Get creation properties list.
-	 */
-	DSetCreatPropList cparms = dataset.getCreatePlist();
-
-	/*
-	 * Check if dataset is chunked.
-	 */
-	hsize_t chunk_dims[2];
-	int     rank_chunk;
-	if( H5D_CHUNKED == cparms.getLayout() )
-	{
-	    /*
-	     * Get chunking information: rank and dimensions
-	     */
-	    rank_chunk = cparms.getChunk( 2, chunk_dims);
-	    cout << "chunk rank " << rank_chunk << "dimensions "
-		<< (unsigned long)(chunk_dims[0]) << " x "
-		<< (unsigned long)(chunk_dims[1]) << endl;
-
-	    /*
-	     * Define the memory space to read a chunk.
-	     */
-	    DataSpace mspace3( rank_chunk, chunk_dims );
-
-	    /*
-	     * Define chunk in the file (hyperslab) to read.
-	     */
-	    offset[0] = 2;
-	    offset[1] = 0;
-	    count[0]  = chunk_dims[0];
-	    count[1]  = chunk_dims[1];
-	    filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
-
-	    /*
-	     * Read chunk back and display.
-	     */
-	    int chunk_out[2][5];   // buffer for chunk to be read
-	    dataset.read( chunk_out, PredType::NATIVE_INT, mspace3, filespace );
-	    cout << endl;
-	    cout << "Chunk:" << endl;
-	    for (j = 0; j < chunk_dims[0]; j++)
-	    {
-		for (i = 0; i < chunk_dims[1]; i++)
-		    cout << chunk_out[j][i] << " ";
-		cout << endl;
-	    }
-	    /*
-	     *	 Chunk:
-	     *	 1 1 1 0 0
-	     *	 2 0 0 0 0
-	     */
-	}
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Open the file and the dataset.
+         */
+        H5File file( FILE_NAME, H5F_ACC_RDONLY );
+        DataSet dataset = file.openDataSet( DATASET_NAME );
+
+        /*
+         * Get filespace for rank and dimension
+         */
+        DataSpace filespace = dataset.getSpace();
+
+        /*
+         * Get number of dimensions in the file dataspace
+         */
+        int rank = filespace.getSimpleExtentNdims();
+
+        /*
+         * Get and print the dimension sizes of the file dataspace
+         */
+        hsize_t dims[2];        // dataset dimensions
+        rank = filespace.getSimpleExtentDims( dims );
+        cout << "dataset rank = " << rank << ", dimensions "
+             << (unsigned long)(dims[0]) << " x "
+             << (unsigned long)(dims[1]) << endl;
+
+        /*
+         * Define the memory space to read dataset.
+         */
+        DataSpace mspace1(RANK, dims);
+
+        /*
+         * Read dataset back and display.
+         */
+        int data_out[NX][NY];  // buffer for dataset to be read
+        dataset.read( data_out, PredType::NATIVE_INT, mspace1, filespace );
+
+        cout << "\n";
+        cout << "Dataset: \n";
+        for (j = 0; j < dims[0]; j++)
+        {
+            for (i = 0; i < dims[1]; i++)
+                cout << data_out[j][i] << " ";
+            cout << endl;
+        }
+
+        /*
+         *          dataset rank 2, dimensions 10 x 5
+         *          chunk rank 2, dimensions 2 x 5
+
+         *          Dataset:
+         *          1 1 1 3 3
+         *          1 1 1 3 3
+         *          1 1 1 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         *          2 0 0 0 0
+         */
+
+        /*
+         * Read the third column from the dataset.
+         * First define memory dataspace, then define hyperslab
+         * and read it into column array.
+         */
+        hsize_t col_dims[1];
+        col_dims[0] = 10;
+        DataSpace mspace2( RANKC, col_dims );
+
+        /*
+         * Define the column (hyperslab) to read.
+         */
+        hsize_t offset[2] = { 0, 2 };
+        hsize_t  count[2] = { 10, 1 };
+        int column[10];  // buffer for column to be read
+
+        /*
+         * Define hyperslab and read.
+         */
+        filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
+        dataset.read( column, PredType::NATIVE_INT, mspace2, filespace );
+
+        cout << endl;
+        cout << "Third column: " << endl;
+        for (i = 0; i < 10; i++)
+            cout << column[i] << endl;
+
+        /*
+         *          Third column:
+         *          1
+         *          1
+         *          1
+         *          0
+         *          0
+         *          0
+         *          0
+         *          0
+         *          0
+         *          0
+         */
+
+        /*
+         * Get creation properties list.
+         */
+        DSetCreatPropList cparms = dataset.getCreatePlist();
+
+        /*
+         * Check if dataset is chunked.
+         */
+        hsize_t chunk_dims[2];
+        int     rank_chunk;
+        if( H5D_CHUNKED == cparms.getLayout() )
+        {
+            /*
+             * Get chunking information: rank and dimensions
+             */
+            rank_chunk = cparms.getChunk( 2, chunk_dims);
+            cout << "chunk rank " << rank_chunk << "dimensions "
+                << (unsigned long)(chunk_dims[0]) << " x "
+                << (unsigned long)(chunk_dims[1]) << endl;
+
+            /*
+             * Define the memory space to read a chunk.
+             */
+            DataSpace mspace3( rank_chunk, chunk_dims );
+
+            /*
+             * Define chunk in the file (hyperslab) to read.
+             */
+            offset[0] = 2;
+            offset[1] = 0;
+            count[0]  = chunk_dims[0];
+            count[1]  = chunk_dims[1];
+            filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
+
+            /*
+             * Read chunk back and display.
+             */
+            int chunk_out[2][5];   // buffer for chunk to be read
+            dataset.read( chunk_out, PredType::NATIVE_INT, mspace3, filespace );
+            cout << endl;
+            cout << "Chunk:" << endl;
+            for (j = 0; j < chunk_dims[0]; j++)
+            {
+                for (i = 0; i < chunk_dims[1]; i++)
+                    cout << chunk_out[j][i] << " ";
+                cout << endl;
+            }
+            /*
+             *   Chunk:
+             *   1 1 1 0 0
+             *   2 0 0 0 0
+             */
+        }
     }  // end of try block
 
     // catch failure caused by the H5File operations
     catch( FileIException error )
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
     catch( DataSetIException error )
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
     catch( DataSpaceIException error )
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
     return 0;
 }
diff --git a/c++/examples/compound.cpp b/c++/examples/compound.cpp
index 192a1cf..4b116e0 100644
--- a/c++/examples/compound.cpp
+++ b/c++/examples/compound.cpp
@@ -41,15 +41,15 @@ int main(void)
 {
    /* First structure  and dataset*/
    typedef struct s1_t {
-	int    a;
-	float  b;
-	double c;
+        int    a;
+        float  b;
+        double c;
    } s1_t;
 
    /* Second structure (subset of s1_t)  and dataset*/
    typedef struct s2_t {
-	double c;
-	int    a;
+        double c;
+        int    a;
    } s2_t;
 
    // Try block to detect exceptions raised by any of the calls inside it
@@ -135,12 +135,12 @@ int main(void)
        */
       cout << endl << "Field c : " << endl;
       for( i = 0; i < LENGTH; i++)
-	 cout << s2[i].c << " ";
+         cout << s2[i].c << " ";
       cout << endl;
 
       cout << endl << "Field a : " << endl;
       for( i = 0; i < LENGTH; i++)
-	 cout << s2[i].a << " ";
+         cout << s2[i].a << " ";
       cout << endl;
 
       /*
@@ -161,7 +161,7 @@ int main(void)
        */
       cout << endl << "Field b : " << endl;
       for( i = 0; i < LENGTH; i++)
-	 cout << s3[i] << " ";
+         cout << s3[i] << " ";
       cout << endl;
 
       /*
diff --git a/c++/examples/create.cpp b/c++/examples/create.cpp
index 890fb03..06b981b 100644
--- a/c++/examples/create.cpp
+++ b/c++/examples/create.cpp
@@ -25,11 +25,11 @@
 #include "H5Cpp.h"
 using namespace H5;
 
-const H5std_string	FILE_NAME( "SDS.h5" );
-const H5std_string	DATASET_NAME( "IntArray" );
-const int 	NX = 5;                    // dataset dimensions
-const int 	NY = 6;
-const int 	RANK = 2;
+const H5std_string      FILE_NAME( "SDS.h5" );
+const H5std_string      DATASET_NAME( "IntArray" );
+const int       NX = 5;                    // dataset dimensions
+const int       NY = 6;
+const int       RANK = 2;
 
 int main (void)
 {
@@ -41,7 +41,7 @@ int main (void)
    for (j = 0; j < NX; j++)
    {
       for (i = 0; i < NY; i++)
-	 data[j][i] = i + j;
+         data[j][i] = i + j;
    }
    /*
     * 0 1 2 3 4 5
diff --git a/c++/examples/extend_ds.cpp b/c++/examples/extend_ds.cpp
index 271100e..9e005c6 100644
--- a/c++/examples/extend_ds.cpp
+++ b/c++/examples/extend_ds.cpp
@@ -105,8 +105,8 @@ int main (void)
        * Write the data to the hyperslab.
        */
       int       data1[3][3] = { {1, 1, 1},       /* data to write */
-				{1, 1, 1},
-				{1, 1, 1} };
+                                {1, 1, 1},
+                                {1, 1, 1} };
       dataset.write( data1, PredType::NATIVE_INT, mspace1, fspace1 );
 
       /*
@@ -179,16 +179,16 @@ int main (void)
       /*
        * Resulting dataset
        *
-       *	 1 1 1 3 3
-       *	 1 1 1 3 3
-       *	 1 1 1 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
-       *	 2 0 0 0 0
+       *         1 1 1 3 3
+       *         1 1 1 3 3
+       *         1 1 1 0 0
+       *         2 0 0 0 0
+       *         2 0 0 0 0
+       *         2 0 0 0 0
+       *         2 0 0 0 0
+       *         2 0 0 0 0
+       *         2 0 0 0 0
+       *         2 0 0 0 0
        */
       /*
        * Display the result.
diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp
index a8c9953..fab54cd 100644
--- a/c++/examples/h5group.cpp
+++ b/c++/examples/h5group.cpp
@@ -33,7 +33,7 @@ using std::endl;
 using namespace H5;
 
 const H5std_string FILE_NAME( "Group.h5" );
-const int	   RANK = 2;
+const int          RANK = 2;
 
 // Operator function
 extern "C" herr_t file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo,
@@ -48,169 +48,169 @@ int main(void)
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	/*
-	 * Turn off the auto-printing when failure occurs so that we can
-	 * handle the errors appropriately
-	 */
-	Exception::dontPrint();
-
-	/*
-	 * Create the named file, truncating the existing one if any,
-	 * using default create and access property lists.
-	 */
-	H5File *file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
-
-	/*
-	 * Create a group in the file
-	 */
-	Group* group = new Group( file->createGroup( "/Data" ));
-
-	/*
-	 * Create dataset "Compressed Data" in the group using absolute
-	 * name. Dataset creation property list is modified to use
-	 * GZIP compression with the compression effort set to 6.
-	 * Note that compression can be used only when dataset is chunked.
-	 */
-	dims[0] = 1000;
-	dims[1] = 20;
-	cdims[0] = 20;
-	cdims[1] = 20;
-	DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace
-	DSetCreatPropList ds_creatplist;  // create dataset creation prop list
-	ds_creatplist.setChunk( 2, cdims );  // then modify it for compression
-	ds_creatplist.setDeflate( 6 );
-
-	/*
-	 * Create the first dataset.
-	 */
-	DataSet* dataset = new DataSet(file->createDataSet(
-		"/Data/Compressed_Data", PredType::NATIVE_INT,
-		*dataspace, ds_creatplist ));
-
-	/*
-	 * Close the first dataset.
-	 */
-	delete dataset;
-	delete dataspace;
-
-	/*
-	 * Create the second dataset.
-	 */
-	dims[0] = 500;
-	dims[1] = 20;
-	dataspace = new DataSpace(RANK, dims); // create second dspace
-	dataset = new DataSet(file->createDataSet("/Data/Float_Data",
-			PredType::NATIVE_FLOAT, *dataspace));
-
-	delete dataset;
-	delete dataspace;
-	delete group;
-	delete file;
-
-	/*
-	 * Now reopen the file and group in the file.
-	 */
-	file = new H5File(FILE_NAME, H5F_ACC_RDWR);
-	group = new Group(file->openGroup("Data"));
-
-	/*
-	 * Access "Compressed_Data" dataset in the group.
-	 */
-	try {  // to determine if the dataset exists in the group
-	    dataset = new DataSet( group->openDataSet( "Compressed_Data" ));
-	}
-	catch( GroupIException not_found_error ) {
-	    cout << " Dataset is not found." << endl;
-	}
-	cout << "dataset \"/Data/Compressed_Data\" is open" << endl;
-
-	/*
-	 * Close the dataset.
-	 */
-	delete dataset;
-
-	/*
-	 * Create hard link to the Data group.
-	 */
-	file->link( H5L_TYPE_HARD, "Data", "Data_new" );
-
-	/*
-	 * We can access "Compressed_Data" dataset using created
-	 * hard link "Data_new".
-	 */
-	try {  // to determine if the dataset exists in the file
-	    dataset = new DataSet(file->openDataSet( "/Data_new/Compressed_Data" ));
-	}
-	catch( FileIException not_found_error )
-	{
-	    cout << " Dataset is not found." << endl;
-	}
-	cout << "dataset \"/Data_new/Compressed_Data\" is open" << endl;
-
-	/*
-	 * Close the dataset.
-	 */
-	delete dataset;
-
-	/*
-	 * Use iterator to see the names of the objects in the file
-	 * root directory.
-	 */
-	cout << endl << "Iterating over elements in the file" << endl;
-	herr_t idx = H5Literate(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
-	cout << endl;
-
-	/*
-	 * Unlink  name "Data" and use iterator to see the names
-	 * of the objects in the file root direvtory.
-	 */
-	cout << "Unlinking..." << endl;
-	try {  // attempt to unlink the dataset
-	    file->unlink( "Data" );
-	}
-	catch( FileIException unlink_error )
-	{
-	    cout << " unlink failed." << endl;
-	}
-	cout << "\"Data\" is unlinked" << endl;
-
-	cout << endl << "Iterating over elements in the file again" << endl;
-	idx = H5Literate(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
-	cout << endl;
-
-	/*
-	 * Close the group and file.
-	 */
-	delete group;
-	delete file;
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create the named file, truncating the existing one if any,
+         * using default create and access property lists.
+         */
+        H5File *file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
+
+        /*
+         * Create a group in the file
+         */
+        Group* group = new Group( file->createGroup( "/Data" ));
+
+        /*
+         * Create dataset "Compressed Data" in the group using absolute
+         * name. Dataset creation property list is modified to use
+         * GZIP compression with the compression effort set to 6.
+         * Note that compression can be used only when dataset is chunked.
+         */
+        dims[0] = 1000;
+        dims[1] = 20;
+        cdims[0] = 20;
+        cdims[1] = 20;
+        DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace
+        DSetCreatPropList ds_creatplist;  // create dataset creation prop list
+        ds_creatplist.setChunk( 2, cdims );  // then modify it for compression
+        ds_creatplist.setDeflate( 6 );
+
+        /*
+         * Create the first dataset.
+         */
+        DataSet* dataset = new DataSet(file->createDataSet(
+                "/Data/Compressed_Data", PredType::NATIVE_INT,
+                *dataspace, ds_creatplist ));
+
+        /*
+         * Close the first dataset.
+         */
+        delete dataset;
+        delete dataspace;
+
+        /*
+         * Create the second dataset.
+         */
+        dims[0] = 500;
+        dims[1] = 20;
+        dataspace = new DataSpace(RANK, dims); // create second dspace
+        dataset = new DataSet(file->createDataSet("/Data/Float_Data",
+                        PredType::NATIVE_FLOAT, *dataspace));
+
+        delete dataset;
+        delete dataspace;
+        delete group;
+        delete file;
+
+        /*
+         * Now reopen the file and group in the file.
+         */
+        file = new H5File(FILE_NAME, H5F_ACC_RDWR);
+        group = new Group(file->openGroup("Data"));
+
+        /*
+         * Access "Compressed_Data" dataset in the group.
+         */
+        try {  // to determine if the dataset exists in the group
+            dataset = new DataSet( group->openDataSet( "Compressed_Data" ));
+        }
+        catch( GroupIException not_found_error ) {
+            cout << " Dataset is not found." << endl;
+        }
+        cout << "dataset \"/Data/Compressed_Data\" is open" << endl;
+
+        /*
+         * Close the dataset.
+         */
+        delete dataset;
+
+        /*
+         * Create hard link to the Data group.
+         */
+        file->link( H5L_TYPE_HARD, "Data", "Data_new" );
+
+        /*
+         * We can access "Compressed_Data" dataset using created
+         * hard link "Data_new".
+         */
+        try {  // to determine if the dataset exists in the file
+            dataset = new DataSet(file->openDataSet( "/Data_new/Compressed_Data" ));
+        }
+        catch( FileIException not_found_error )
+        {
+            cout << " Dataset is not found." << endl;
+        }
+        cout << "dataset \"/Data_new/Compressed_Data\" is open" << endl;
+
+        /*
+         * Close the dataset.
+         */
+        delete dataset;
+
+        /*
+         * Use iterator to see the names of the objects in the file
+         * root directory.
+         */
+        cout << endl << "Iterating over elements in the file" << endl;
+        herr_t idx = H5Literate(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
+        cout << endl;
+
+        /*
+         * Unlink  name "Data" and use iterator to see the names
+         * of the objects in the file root direvtory.
+         */
+        cout << "Unlinking..." << endl;
+        try {  // attempt to unlink the dataset
+            file->unlink( "Data" );
+        }
+        catch( FileIException unlink_error )
+        {
+            cout << " unlink failed." << endl;
+        }
+        cout << "\"Data\" is unlinked" << endl;
+
+        cout << endl << "Iterating over elements in the file again" << endl;
+        idx = H5Literate(file->getId(), H5_INDEX_NAME, H5_ITER_INC, NULL, file_info, NULL);
+        cout << endl;
+
+        /*
+         * Close the group and file.
+         */
+        delete group;
+        delete file;
     }  // end of try block
 
     // catch failure caused by the H5File operations
     catch( FileIException error )
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
     catch( DataSetIException error )
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
     catch( DataSpaceIException error )
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the Attribute operations
     catch( AttributeIException error )
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
     return 0;
 }
diff --git a/c++/examples/h5tutr_cmprss.cpp b/c++/examples/h5tutr_cmprss.cpp
index 9b1d2bc..9531bdd 100644
--- a/c++/examples/h5tutr_cmprss.cpp
+++ b/c++/examples/h5tutr_cmprss.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -24,130 +24,130 @@ using std::endl;
 #include "H5Cpp.h"
 using namespace H5;
 
-const H5std_string	FILE_NAME("h5tutr_cmprss.h5");
-const H5std_string	DATASET_NAME("Compressed_Data");
-const int	DIM0 = 100;
-const int	DIM1 = 20;
+const H5std_string      FILE_NAME("h5tutr_cmprss.h5");
+const H5std_string      DATASET_NAME("Compressed_Data");
+const int       DIM0 = 100;
+const int       DIM1 = 20;
 
 int main (void)
 {
-    hsize_t dims[2] = { DIM0, DIM1 };	// dataset dimensions
-    hsize_t chunk_dims[2] = { 20, 20 };	// chunk dimensions
+    hsize_t dims[2] = { DIM0, DIM1 };   // dataset dimensions
+    hsize_t chunk_dims[2] = { 20, 20 }; // chunk dimensions
     int     i,j, buf[DIM0][DIM1];
 
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Create a new file using the default property lists. 
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
+        // Create a new file using the default property lists. 
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
-	// Create the data space for the dataset.
-	DataSpace *dataspace = new DataSpace(2, dims);
+        // Create the data space for the dataset.
+        DataSpace *dataspace = new DataSpace(2, dims);
 
-	// Modify dataset creation property to enable chunking
-	DSetCreatPropList  *plist = new  DSetCreatPropList;
-	plist->setChunk(2, chunk_dims);
+        // Modify dataset creation property to enable chunking
+        DSetCreatPropList  *plist = new  DSetCreatPropList;
+        plist->setChunk(2, chunk_dims);
 
-	// Set ZLIB (DEFLATE) Compression using level 6.
-	// To use SZIP compression comment out this line.
-	plist->setDeflate(6);
+        // Set ZLIB (DEFLATE) Compression using level 6.
+        // To use SZIP compression comment out this line.
+        plist->setDeflate(6);
 
-	// Uncomment these lines to set SZIP Compression
-	// unsigned szip_options_mask = H5_SZIP_NN_OPTION_MASK;
-	// unsigned szip_pixels_per_block = 16;
-	// plist->setSzip(szip_options_mask, szip_pixels_per_block);
+        // Uncomment these lines to set SZIP Compression
+        // unsigned szip_options_mask = H5_SZIP_NN_OPTION_MASK;
+        // unsigned szip_pixels_per_block = 16;
+        // plist->setSzip(szip_options_mask, szip_pixels_per_block);
      
-	// Create the dataset.      
-	DataSet *dataset = new DataSet(file.createDataSet( DATASET_NAME, 
-	                        PredType::STD_I32BE, *dataspace, *plist) );
-
-	for (i = 0; i< DIM0; i++)
-	  for (j=0; j<DIM1; j++)
-	      buf[i][j] = i+j;
-
-	// Write data to dataset.
-	dataset->write(buf, PredType::NATIVE_INT);
-
-	// Close objects and file.  Either approach will close the HDF5 item.
-	delete dataspace;
-	delete dataset;
-	delete plist;
-	file.close();
-
-	// -----------------------------------------------
-	// Re-open the file and dataset, retrieve filter 
-	// information for dataset and read the data back.
-	// -----------------------------------------------
-	
-	int        rbuf[DIM0][DIM1];
-	int        numfilt;
-	size_t     nelmts={1}, namelen={1};
-	unsigned  flags, filter_info, cd_values[1], idx;
-	char       name[1];
-	H5Z_filter_t filter_type;
-
-	// Open the file and the dataset in the file.
-	file.openFile(FILE_NAME, H5F_ACC_RDONLY);
-	dataset = new DataSet(file.openDataSet( DATASET_NAME));
-
-	// Get the create property list of the dataset.
-	plist = new DSetCreatPropList(dataset->getCreatePlist ());
-
-	// Get the number of filters associated with the dataset.
-	numfilt = plist->getNfilters();
-	cout << "Number of filters associated with dataset: " << numfilt << endl;
-
-	for (idx=0; idx < numfilt; idx++) {
-	    nelmts = 0;
-
-	    filter_type = plist->getFilter(idx, flags, nelmts, cd_values, namelen, name , filter_info);
-
-	    cout << "Filter Type: ";
-
-	    switch (filter_type) {
-	      case H5Z_FILTER_DEFLATE:
-	           cout << "H5Z_FILTER_DEFLATE" << endl;
-	           break;
-	      case H5Z_FILTER_SZIP:
-	           cout << "H5Z_FILTER_SZIP" << endl; 
-	           break;
-	      default:
-	           cout << "Other filter type included." << endl;
-	      }
-	}
-
-	// Read data.
-	dataset->read(rbuf, PredType::NATIVE_INT);
-
-	delete plist; 
-	delete dataset;
-	file.close();	// can be skipped
+        // Create the dataset.      
+        DataSet *dataset = new DataSet(file.createDataSet( DATASET_NAME, 
+                                PredType::STD_I32BE, *dataspace, *plist) );
+
+        for (i = 0; i< DIM0; i++)
+          for (j=0; j<DIM1; j++)
+              buf[i][j] = i+j;
+
+        // Write data to dataset.
+        dataset->write(buf, PredType::NATIVE_INT);
+
+        // Close objects and file.  Either approach will close the HDF5 item.
+        delete dataspace;
+        delete dataset;
+        delete plist;
+        file.close();
+
+        // -----------------------------------------------
+        // Re-open the file and dataset, retrieve filter 
+        // information for dataset and read the data back.
+        // -----------------------------------------------
+        
+        int        rbuf[DIM0][DIM1];
+        int        numfilt;
+        size_t     nelmts={1}, namelen={1};
+        unsigned  flags, filter_info, cd_values[1], idx;
+        char       name[1];
+        H5Z_filter_t filter_type;
+
+        // Open the file and the dataset in the file.
+        file.openFile(FILE_NAME, H5F_ACC_RDONLY);
+        dataset = new DataSet(file.openDataSet( DATASET_NAME));
+
+        // Get the create property list of the dataset.
+        plist = new DSetCreatPropList(dataset->getCreatePlist ());
+
+        // Get the number of filters associated with the dataset.
+        numfilt = plist->getNfilters();
+        cout << "Number of filters associated with dataset: " << numfilt << endl;
+
+        for (idx=0; idx < numfilt; idx++) {
+            nelmts = 0;
+
+            filter_type = plist->getFilter(idx, flags, nelmts, cd_values, namelen, name , filter_info);
+
+            cout << "Filter Type: ";
+
+            switch (filter_type) {
+              case H5Z_FILTER_DEFLATE:
+                   cout << "H5Z_FILTER_DEFLATE" << endl;
+                   break;
+              case H5Z_FILTER_SZIP:
+                   cout << "H5Z_FILTER_SZIP" << endl; 
+                   break;
+              default:
+                   cout << "Other filter type included." << endl;
+              }
+        }
+
+        // Read data.
+        dataset->read(rbuf, PredType::NATIVE_INT);
+
+        delete plist; 
+        delete dataset;
+        file.close();   // can be skipped
 
     }  // end of try block
 
     // catch failure caused by the H5File operations
     catch(FileIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
     catch(DataSetIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
     catch(DataSpaceIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     return 0;  // successfully terminated
diff --git a/c++/examples/h5tutr_crtatt.cpp b/c++/examples/h5tutr_crtatt.cpp
index f865501..fcf6c27 100644
--- a/c++/examples/h5tutr_crtatt.cpp
+++ b/c++/examples/h5tutr_crtatt.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -21,11 +21,11 @@
 #include "H5Cpp.h"
 using namespace H5;
 
-const H5std_string	FILE_NAME( "h5tutr_dset.h5" );
-const H5std_string	DATASET_NAME( "dset" );
-const H5std_string	ATTR_NAME( "Units" );
+const H5std_string      FILE_NAME( "h5tutr_dset.h5" );
+const H5std_string      DATASET_NAME( "dset" );
+const H5std_string      ATTR_NAME( "Units" );
 
-const int	DIM1 = 2;
+const int       DIM1 = 2;
 
 int main (void)
 {
@@ -36,52 +36,52 @@ int main (void)
    // Try block to detect exceptions raised by any of the calls inside it
    try
    {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Open an existing file and dataset.
-	H5File file( FILE_NAME, H5F_ACC_RDWR );
-	DataSet dataset = file.openDataSet( DATASET_NAME );
+        // Open an existing file and dataset.
+        H5File file( FILE_NAME, H5F_ACC_RDWR );
+        DataSet dataset = file.openDataSet( DATASET_NAME );
 
-	// Create the data space for the attribute.
-	DataSpace attr_dataspace = DataSpace (1, dims );
+        // Create the data space for the attribute.
+        DataSpace attr_dataspace = DataSpace (1, dims );
 
-	// Create a dataset attribute. 
-	Attribute attribute = dataset.createAttribute( ATTR_NAME, PredType::STD_I32BE, 
-	                                          attr_dataspace);
+        // Create a dataset attribute. 
+        Attribute attribute = dataset.createAttribute( ATTR_NAME, PredType::STD_I32BE, 
+                                                  attr_dataspace);
      
-	// Write the attribute data. 
-	attribute.write( PredType::NATIVE_INT, attr_data);
+        // Write the attribute data. 
+        attribute.write( PredType::NATIVE_INT, attr_data);
 
    }  // end of try block
 
    // catch failure caused by the H5File operations
    catch( DataSpaceIException error )
    {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
    }
 
    // catch failure caused by the H5File operations
    catch( AttributeIException error )
    {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
    }
 
    // catch failure caused by the H5File operations
    catch( FileIException error )
    {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
    }
 
    // catch failure caused by the DataSet operations
    catch( DataSetIException error )
    {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
    }
 
    return 0;  // successfully terminated
diff --git a/c++/examples/h5tutr_crtdat.cpp b/c++/examples/h5tutr_crtdat.cpp
index 7cd49f8..985f6ac 100644
--- a/c++/examples/h5tutr_crtdat.cpp
+++ b/c++/examples/h5tutr_crtdat.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -18,57 +18,58 @@
 
 #include <iostream>
 #include <string>
+
 #include "H5Cpp.h"
 using namespace H5;
 
-const H5std_string	FILE_NAME("h5tutr_dset.h5");
-const H5std_string	DATASET_NAME("dset");
-const int	 NX = 4;                     // dataset dimensions
-const int	 NY = 6;
-const int	 RANK = 2;
+const H5std_string      FILE_NAME("h5tutr_dset.h5");
+const H5std_string      DATASET_NAME("dset");
+const int        NX = 4;                     // dataset dimensions
+const int        NY = 6;
+const int        RANK = 2;
 
 int main (void)
 {
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Create a new file using the default property lists. 
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
+        // Create a new file using the default property lists. 
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
-	// Create the data space for the dataset.
-	hsize_t dims[2];               // dataset dimensions
-	dims[0] = NX;
-	dims[1] = NY;
-	DataSpace dataspace(RANK, dims);
+        // Create the data space for the dataset.
+        hsize_t dims[2];               // dataset dimensions
+        dims[0] = NX;
+        dims[1] = NY;
+        DataSpace dataspace(RANK, dims);
 
-	// Create the dataset.      
-	DataSet dataset = file.createDataSet(DATASET_NAME, PredType::STD_I32BE, dataspace);
+        // Create the dataset.      
+        DataSet dataset = file.createDataSet(DATASET_NAME, PredType::STD_I32BE, dataspace);
 
     }  // end of try block
 
     // catch failure caused by the H5File operations
     catch(FileIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
     catch(DataSetIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
     catch(DataSpaceIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     return 0;  // successfully terminated
diff --git a/c++/examples/h5tutr_crtgrp.cpp b/c++/examples/h5tutr_crtgrp.cpp
index 4bdb02c..e35cb46 100644
--- a/c++/examples/h5tutr_crtgrp.cpp
+++ b/c++/examples/h5tutr_crtgrp.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -31,31 +31,31 @@ int main(void)
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Create a new file using default property lists.
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
-	
-	// Create a group named "/MygGroup" in the file
-	Group group(file.createGroup("/MyGroup"));
+        // Create a new file using default property lists.
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+        
+        // Create a group named "/MygGroup" in the file
+        Group group(file.createGroup("/MyGroup"));
 
-	// File and group will be closed as their instances go out of scope.
+        // File and group will be closed as their instances go out of scope.
    
     } // end of try block
 
     // catch failure caused by the H5File operations
     catch(FileIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
     // catch failure caused by the Group operations
     catch(GroupIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
  
     return 0;
diff --git a/c++/examples/h5tutr_crtgrpar.cpp b/c++/examples/h5tutr_crtgrpar.cpp
index 3e175d6..76ec9e5 100644
--- a/c++/examples/h5tutr_crtgrpar.cpp
+++ b/c++/examples/h5tutr_crtgrpar.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -33,50 +33,50 @@ int main(void)
     try
     {
       
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately.
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately.
 
-	Exception::dontPrint();
+        Exception::dontPrint();
 
-	// Create a new file using default properties.
+        // Create a new file using default properties.
 
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
-	// Create group "MyGroup" in the root group using an absolute name.
-	 
-	Group group1(file.createGroup( "/MyGroup"));
+        // Create group "MyGroup" in the root group using an absolute name.
+         
+        Group group1(file.createGroup( "/MyGroup"));
  
-	// Create group "Group_A" in group "MyGroup" using an
-	// absolute name.
+        // Create group "Group_A" in group "MyGroup" using an
+        // absolute name.
 
-	Group group2(file.createGroup("/MyGroup/Group_A"));   
+        Group group2(file.createGroup("/MyGroup/Group_A"));   
 
-	// Create group "Group_B" in group "MyGroup" using a
-	// relative name.
+        // Create group "Group_B" in group "MyGroup" using a
+        // relative name.
   
-	Group group3(group1.createGroup ("Group_B"));
+        Group group3(group1.createGroup ("Group_B"));
  
-	// Close the groups and file.
+        // Close the groups and file.
 
-	group1.close();
-	group2.close();
-	group3.close();
-	file.close();
+        group1.close();
+        group2.close();
+        group3.close();
+        file.close();
     
     } // end of try block
 
     // catch failure caused by the File operations
     catch(FileIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the Group operations
     catch(GroupIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     return 0;
diff --git a/c++/examples/h5tutr_crtgrpd.cpp b/c++/examples/h5tutr_crtgrpd.cpp
index 318ab1c..e3bb1b1 100644
--- a/c++/examples/h5tutr_crtgrpd.cpp
+++ b/c++/examples/h5tutr_crtgrpd.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -27,11 +27,11 @@ using namespace H5;
 const H5std_string FILE_NAME("h5tutr_groups.h5");
 const H5std_string DATASET_NAME1("/MyGroup/dset1");
 const H5std_string DATASET_NAME2("dset2");
-const int	RANK = 2;
-const int	D1DIM1 = 3;
-const int	D1DIM2 = 3;
-const int	D2DIM1 = 2;
-const int	D2DIM2 = 10;
+const int       RANK = 2;
+const int       D1DIM1 = 3;
+const int       D1DIM2 = 3;
+const int       D2DIM1 = 2;
+const int       D2DIM2 = 10;
 
 int main(void)
 {
@@ -41,93 +41,93 @@ int main(void)
     // Try block to catch exceptions raised by any of the calls inside it
     try
     {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Initialize the first dataset. 
-	for (i = 0; i < D1DIM1; i++)
-	    for (j = 0; j < D1DIM2; j++)
-	       dset1_data[i][j] = j + 1;
+        // Initialize the first dataset. 
+        for (i = 0; i < D1DIM1; i++)
+            for (j = 0; j < D1DIM2; j++)
+               dset1_data[i][j] = j + 1;
 
-	//  Initialize the second dataset. 
-	for (i = 0; i < D2DIM1; i++)
-	  for (j = 0; j < D2DIM2; j++)
-	      dset2_data[i][j] = j + 1;
+        //  Initialize the second dataset. 
+        for (i = 0; i < D2DIM1; i++)
+          for (j = 0; j < D2DIM2; j++)
+              dset2_data[i][j] = j + 1;
 
-	// Open an existing file and dataset.
-	H5File file(FILE_NAME, H5F_ACC_RDWR);
+        // Open an existing file and dataset.
+        H5File file(FILE_NAME, H5F_ACC_RDWR);
 
         // Create the data space for the first dataset.  Note the use of
         // pointer for the instance 'dataspace'.  It can be deleted and
         // used again later for another data space.  An HDF5 identifier is
         // closed by the destructor or the method 'close()'.
-	hsize_t dims[RANK];               // dataset dimensions
-	dims[0] = D1DIM1;
-	dims[1] = D1DIM2;
-	DataSpace *dataspace = new DataSpace (RANK, dims);
-
-	// Create the dataset in group "MyGroup".  Same note as for the
-	// dataspace above.
-	DataSet *dataset = new DataSet (file.createDataSet(DATASET_NAME1, 
-	                                 PredType::STD_I32BE, *dataspace));
-
-	// Write the data to the dataset using default memory space, file
-	// space, and transfer properties.
-	dataset->write(dset1_data, PredType::NATIVE_INT);
-
-	// Close the current dataset and data space.
-	delete dataset;
-	delete dataspace;
-
-	// Create the data space for the second dataset.
-	dims[0] = D2DIM1;
-	dims[1] = D2DIM2;
-	dataspace = new DataSpace (RANK, dims);
-
-	// Create group "Group_A" in group "MyGroup".
-	Group group(file.openGroup("/MyGroup/Group_A"));
-
-	// Create the second dataset in group "Group_A".
-	dataset = new DataSet (group.createDataSet(DATASET_NAME2, 
-	                                 PredType::STD_I32BE, *dataspace));
-
-	// Write the data to the dataset using default memory space, file
-	// space, and transfer properties.
-	dataset->write(dset2_data, PredType::NATIVE_INT);
-
-	// Close all objects.
-	delete dataspace;
-	delete dataset;
-	group.close();
+        hsize_t dims[RANK];               // dataset dimensions
+        dims[0] = D1DIM1;
+        dims[1] = D1DIM2;
+        DataSpace *dataspace = new DataSpace (RANK, dims);
+
+        // Create the dataset in group "MyGroup".  Same note as for the
+        // dataspace above.
+        DataSet *dataset = new DataSet (file.createDataSet(DATASET_NAME1, 
+                                         PredType::STD_I32BE, *dataspace));
+
+        // Write the data to the dataset using default memory space, file
+        // space, and transfer properties.
+        dataset->write(dset1_data, PredType::NATIVE_INT);
+
+        // Close the current dataset and data space.
+        delete dataset;
+        delete dataspace;
+
+        // Create the data space for the second dataset.
+        dims[0] = D2DIM1;
+        dims[1] = D2DIM2;
+        dataspace = new DataSpace (RANK, dims);
+
+        // Create group "Group_A" in group "MyGroup".
+        Group group(file.openGroup("/MyGroup/Group_A"));
+
+        // Create the second dataset in group "Group_A".
+        dataset = new DataSet (group.createDataSet(DATASET_NAME2, 
+                                         PredType::STD_I32BE, *dataspace));
+
+        // Write the data to the dataset using default memory space, file
+        // space, and transfer properties.
+        dataset->write(dset2_data, PredType::NATIVE_INT);
+
+        // Close all objects.
+        delete dataspace;
+        delete dataset;
+        group.close();
     
     } // end of try block
 
     // catch failure caused by the H5File operations
     catch(FileIException error)
     {
-	 error.printErrorStack();
-	 return -1;
+         error.printErrorStack();
+         return -1;
     }
     // catch failure caused by the DataSet operations
     catch(DataSetIException error)
     {
-	 error.printErrorStack();
-	 return -1;
+         error.printErrorStack();
+         return -1;
     }
 
     // catch failure caused by the DataSpace operations
     catch(DataSpaceIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the Group operations
     catch(GroupIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
  
      return 0;
diff --git a/c++/examples/h5tutr_extend.cpp b/c++/examples/h5tutr_extend.cpp
index 8c1bc03..b6927ea 100644
--- a/c++/examples/h5tutr_extend.cpp
+++ b/c++/examples/h5tutr_extend.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -24,17 +24,17 @@ using std::endl;
 #include "H5Cpp.h"
 using namespace H5;
 
-const H5std_string	FILE_NAME("h5tutr_extend.h5");
-const H5std_string	DATASETNAME("ExtendibleArray");
+const H5std_string      FILE_NAME("h5tutr_extend.h5");
+const H5std_string      DATASETNAME("ExtendibleArray");
 
 int main (void)
 {
-     hsize_t dims[2] = {3,3};	        // dataset dimensions at creation
+     hsize_t dims[2] = {3,3};           // dataset dimensions at creation
      hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; 
      hsize_t chunk_dims[2] ={2, 5};
-     int	   data[3][3] = { {1, 1, 1},    // data to write 
-	                          {1, 1, 1},
-	                          {1, 1, 1} };
+     int           data[3][3] = { {1, 1, 1},    // data to write 
+                                  {1, 1, 1},
+                                  {1, 1, 1} };
 
      // Variables used in extending and writing to the extended portion of dataset 
 
@@ -42,127 +42,127 @@ int main (void)
      hsize_t offset[2];
      hsize_t dimsext[2] = {7, 3};         // extend dimensions 
      int     dataext[7][3] = { {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4},
-	                              {2, 3, 4} };
+                                      {2, 3, 4},
+                                      {2, 3, 4},
+                                      {2, 3, 4},
+                                      {2, 3, 4},
+                                      {2, 3, 4},
+                                      {2, 3, 4} };
 
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
-
-	// Create a new file using the default property lists. 
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
-
-	// Create the data space for the dataset.  Note the use of pointer
-	// for the instance 'dataspace'.  It can be deleted and used again
-	// later for another dataspace.  An HDF5 identifier can be closed
-	// by the destructor or the method 'close()'.
-	DataSpace *dataspace = new DataSpace (2, dims, maxdims);
-
-	// Modify dataset creation property to enable chunking
-	DSetCreatPropList prop;
-	prop.setChunk(2, chunk_dims);
-
-	// Create the chunked dataset.  Note the use of pointer.
-	DataSet *dataset = new DataSet(file.createDataSet( DATASETNAME, 
-	                         PredType::STD_I32BE, *dataspace, prop) );
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
+
+        // Create a new file using the default property lists. 
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        // Create the data space for the dataset.  Note the use of pointer
+        // for the instance 'dataspace'.  It can be deleted and used again
+        // later for another dataspace.  An HDF5 identifier can be closed
+        // by the destructor or the method 'close()'.
+        DataSpace *dataspace = new DataSpace (2, dims, maxdims);
+
+        // Modify dataset creation property to enable chunking
+        DSetCreatPropList prop;
+        prop.setChunk(2, chunk_dims);
+
+        // Create the chunked dataset.  Note the use of pointer.
+        DataSet *dataset = new DataSet(file.createDataSet( DATASETNAME, 
+                                 PredType::STD_I32BE, *dataspace, prop) );
  
-	// Write data to dataset.
-	dataset->write(data, PredType::NATIVE_INT);
-
-	// Extend the dataset. Dataset becomes 10 x 3.
-	size[0] = dims[0] + dimsext[0];
-	size[1] = dims[1];
-	dataset->extend(size); 
-
-	// Select a hyperslab in extended portion of the dataset.
-	DataSpace *filespace = new DataSpace(dataset->getSpace ());
-	offset[0] = 3;
-	offset[1] = 0;
-	filespace->selectHyperslab(H5S_SELECT_SET, dimsext, offset);
-	
-	// Define memory space.
-	DataSpace *memspace = new DataSpace(2, dimsext, NULL);
-
-	// Write data to the extended portion of the dataset.
-	dataset->write(dataext, PredType::NATIVE_INT, *memspace, *filespace);
-
-	// Close all objects and file.
-	prop.close();
-	delete filespace;
-	delete memspace;
-	delete dataspace;
-	delete dataset;
-	file.close();
-
-	// --------------------------------------- 
-	// Re-open the file and read the data back
-	// --------------------------------------- 
-
-	int        rdata[10][3];
-	int        i,j, rank, rank_chunk;
-	hsize_t    chunk_dimsr[2], dimsr[2];
-
-	// Open the file and dataset.
-	file.openFile(FILE_NAME, H5F_ACC_RDONLY);
-	dataset = new DataSet(file.openDataSet( DATASETNAME)); 
-
-	// Get the dataset's dataspace and creation property list.
-	filespace = new DataSpace(dataset->getSpace());
-	prop = dataset->getCreatePlist();
-
-	// Get information to obtain memory dataspace.
-	rank = filespace->getSimpleExtentNdims();
-	herr_t status_n = filespace->getSimpleExtentDims(dimsr);
-
-	if (H5D_CHUNKED == prop.getLayout())
-	     rank_chunk = prop.getChunk(rank, chunk_dimsr);
-	cout << "rank chunk = " << rank_chunk << endl;;
-
-	memspace = new DataSpace(rank, dimsr, NULL);
-	dataset->read(rdata, PredType::NATIVE_INT, *memspace, *filespace);
+        // Write data to dataset.
+        dataset->write(data, PredType::NATIVE_INT);
+
+        // Extend the dataset. Dataset becomes 10 x 3.
+        size[0] = dims[0] + dimsext[0];
+        size[1] = dims[1];
+        dataset->extend(size); 
+
+        // Select a hyperslab in extended portion of the dataset.
+        DataSpace *filespace = new DataSpace(dataset->getSpace ());
+        offset[0] = 3;
+        offset[1] = 0;
+        filespace->selectHyperslab(H5S_SELECT_SET, dimsext, offset);
+        
+        // Define memory space.
+        DataSpace *memspace = new DataSpace(2, dimsext, NULL);
+
+        // Write data to the extended portion of the dataset.
+        dataset->write(dataext, PredType::NATIVE_INT, *memspace, *filespace);
+
+        // Close all objects and file.
+        prop.close();
+        delete filespace;
+        delete memspace;
+        delete dataspace;
+        delete dataset;
+        file.close();
+
+        // --------------------------------------- 
+        // Re-open the file and read the data back
+        // --------------------------------------- 
+
+        int        rdata[10][3];
+        int        i,j, rank, rank_chunk;
+        hsize_t    chunk_dimsr[2], dimsr[2];
+
+        // Open the file and dataset.
+        file.openFile(FILE_NAME, H5F_ACC_RDONLY);
+        dataset = new DataSet(file.openDataSet( DATASETNAME)); 
+
+        // Get the dataset's dataspace and creation property list.
+        filespace = new DataSpace(dataset->getSpace());
+        prop = dataset->getCreatePlist();
+
+        // Get information to obtain memory dataspace.
+        rank = filespace->getSimpleExtentNdims();
+        herr_t status_n = filespace->getSimpleExtentDims(dimsr);
+
+        if (H5D_CHUNKED == prop.getLayout())
+             rank_chunk = prop.getChunk(rank, chunk_dimsr);
+        cout << "rank chunk = " << rank_chunk << endl;;
+
+        memspace = new DataSpace(rank, dimsr, NULL);
+        dataset->read(rdata, PredType::NATIVE_INT, *memspace, *filespace);
       
-	cout << endl;
-	for (j = 0; j < dimsr[0]; j++) {
-	    for (i = 0; i < dimsr[1]; i++)
-	       cout << " " <<  rdata[j][i];
-	    cout << endl;
-	}
-
-	// Close all objects and file.
-	prop.close();
-	delete filespace;
-	delete memspace;
-	delete dataset;
-	file.close();
+        cout << endl;
+        for (j = 0; j < dimsr[0]; j++) {
+            for (i = 0; i < dimsr[1]; i++)
+               cout << " " <<  rdata[j][i];
+            cout << endl;
+        }
+
+        // Close all objects and file.
+        prop.close();
+        delete filespace;
+        delete memspace;
+        delete dataset;
+        file.close();
       
     }  // end of try block
 
     // catch failure caused by the H5File operations
     catch(FileIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
     catch(DataSetIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
     catch(DataSpaceIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     return 0;  // successfully terminated
diff --git a/c++/examples/h5tutr_rdwt.cpp b/c++/examples/h5tutr_rdwt.cpp
index 4c9d49e..f17e6a5 100644
--- a/c++/examples/h5tutr_rdwt.cpp
+++ b/c++/examples/h5tutr_rdwt.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -21,10 +21,10 @@
 #include "H5Cpp.h"
 using namespace H5;
 
-const H5std_string	FILE_NAME("h5tutr_dset.h5");
-const H5std_string	DATASET_NAME("dset");
-const int 	DIM0 = 4;	               // dataset dimensions
-const int 	DIM1 = 6;
+const H5std_string      FILE_NAME("h5tutr_dset.h5");
+const H5std_string      DATASET_NAME("dset");
+const int       DIM0 = 4;                      // dataset dimensions
+const int       DIM1 = 6;
 
 int main (void)
 {
@@ -32,41 +32,41 @@ int main (void)
     // Data initialization.
      
     int i, j;
-    int data[DIM0][DIM1];	    // buffer for data to write
+    int data[DIM0][DIM1];           // buffer for data to write
 
     for (j = 0; j < DIM0; j++)
-	for (i = 0; i < DIM1; i++)
-	 data[j][i] = i * 6 + j + 1;
+        for (i = 0; i < DIM1; i++)
+         data[j][i] = i * 6 + j + 1;
 
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
 
-	// Open an existing file and dataset.
-	H5File file(FILE_NAME, H5F_ACC_RDWR);
-	DataSet dataset = file.openDataSet(DATASET_NAME);
+        // Open an existing file and dataset.
+        H5File file(FILE_NAME, H5F_ACC_RDWR);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
 
-	// Write the data to the dataset using default memory space, file
-	// space, and transfer properties.
-	dataset.write(data, PredType::NATIVE_INT);
+        // Write the data to the dataset using default memory space, file
+        // space, and transfer properties.
+        dataset.write(data, PredType::NATIVE_INT);
 
     }  // end of try block
 
     // catch failure caused by the H5File operations
     catch(FileIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
     catch(DataSetIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     return 0;  // successfully terminated
diff --git a/c++/examples/h5tutr_subset.cpp b/c++/examples/h5tutr_subset.cpp
index 14a9ced..0747880 100644
--- a/c++/examples/h5tutr_subset.cpp
+++ b/c++/examples/h5tutr_subset.cpp
@@ -1,8 +1,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.						     *
- * Copyright by the Board of Trustees of the University of Illinois.	     *
- * All rights reserved.							     *
- *	                                                                     *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
@@ -24,13 +24,13 @@ using std::endl;
 #include "H5Cpp.h"
 using namespace H5;
 
-const H5std_string	FILE_NAME("h5tutr_subset.h5");
-const H5std_string	DATASET_NAME("IntArray");
+const H5std_string      FILE_NAME("h5tutr_subset.h5");
+const H5std_string      DATASET_NAME("IntArray");
 
 const int     RANK = 2;
-const int     DIM0_SUB = 3;	// subset dimensions
+const int     DIM0_SUB = 3;     // subset dimensions
 const int     DIM1_SUB = 4;
-const int     DIM0 = 8;		// size of dataset
+const int     DIM0 = 8;         // size of dataset
 const int     DIM1 = 10;
 
 int main (void)
@@ -41,134 +41,134 @@ int main (void)
     // Try block to detect exceptions raised by any of the calls inside it
     try
     {
-	// Turn off the auto-printing when failure occurs so that we can
-	// handle the errors appropriately
-	Exception::dontPrint();
-
-	// ---------------------------------------------------
-	// Create a new file using the default property lists. 
-	// Then create a dataset and write data to it. 
-	// Close the file and dataset.
-	// ---------------------------------------------------
+        // Turn off the auto-printing when failure occurs so that we can
+        // handle the errors appropriately
+        Exception::dontPrint();
+
+        // ---------------------------------------------------
+        // Create a new file using the default property lists. 
+        // Then create a dataset and write data to it. 
+        // Close the file and dataset.
+        // ---------------------------------------------------
       
-	H5File file(FILE_NAME, H5F_ACC_TRUNC);
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
-	hsize_t dims[2];              
-	dims[0] = DIM0;
-	dims[1] = DIM1;
-	DataSpace dataspace = DataSpace (RANK, dims);
+        hsize_t dims[2];              
+        dims[0] = DIM0;
+        dims[1] = DIM1;
+        DataSpace dataspace = DataSpace (RANK, dims);
 
-	DataSet dataset(file.createDataSet( DATASET_NAME, 
-	                                 PredType::STD_I32BE, dataspace) );
+        DataSet dataset(file.createDataSet( DATASET_NAME, 
+                                         PredType::STD_I32BE, dataspace) );
 
 
-	for (j = 0; j < DIM0; j++) {
-	     for (i = 0; i < DIM1; i++)
-	         if (i< (DIM1/2))
-	            data[j][i] = 1;
-	         else
-	            data[j][i] = 2;
-	      }
+        for (j = 0; j < DIM0; j++) {
+             for (i = 0; i < DIM1; i++)
+                 if (i< (DIM1/2))
+                    data[j][i] = 1;
+                 else
+                    data[j][i] = 2;
+              }
 
-	dataset.write(data, PredType::NATIVE_INT);
+        dataset.write(data, PredType::NATIVE_INT);
 
-	cout << endl << "Data Written to File:" << endl;
-	for (j = 0; j < DIM0; j++) {
-	    for (i = 0; i < DIM1; i++)
-	       cout << " " <<  data[j][i];
-	    cout << endl;
-	}
+        cout << endl << "Data Written to File:" << endl;
+        for (j = 0; j < DIM0; j++) {
+            for (i = 0; i < DIM1; i++)
+               cout << " " <<  data[j][i];
+            cout << endl;
+        }
 
-	dataspace.close();
-	dataset.close();
-	file.close();
+        dataspace.close();
+        dataset.close();
+        file.close();
 
-	// ---------------------------------------------------
-	// Reopen the file and dataset and write a subset of
-	// values to the dataset.
-	// ---------------------------------------------------
+        // ---------------------------------------------------
+        // Reopen the file and dataset and write a subset of
+        // values to the dataset.
+        // ---------------------------------------------------
 
-	hsize_t offset[2], count[2], stride[2], block[2];
-	hsize_t dimsm[2];
+        hsize_t offset[2], count[2], stride[2], block[2];
+        hsize_t dimsm[2];
 
-	file.openFile(FILE_NAME, H5F_ACC_RDWR);
-	dataset = file.openDataSet(DATASET_NAME);
+        file.openFile(FILE_NAME, H5F_ACC_RDWR);
+        dataset = file.openDataSet(DATASET_NAME);
 
-	// Specify size and shape of subset to write. 
+        // Specify size and shape of subset to write. 
 
-	offset[0] = 1;
-	offset[1] = 2;
+        offset[0] = 1;
+        offset[1] = 2;
 
-	count[0]  = DIM0_SUB;
-	count[1]  = DIM1_SUB;
+        count[0]  = DIM0_SUB;
+        count[1]  = DIM1_SUB;
 
-	stride[0] = 1;
-	stride[1] = 1;
+        stride[0] = 1;
+        stride[1] = 1;
 
-	block[0] = 1;
-	block[1] = 1;
+        block[0] = 1;
+        block[1] = 1;
   
-	// Define Memory Dataspace. Get file dataspace and select
-	// a subset from the file dataspace.
+        // Define Memory Dataspace. Get file dataspace and select
+        // a subset from the file dataspace.
 
-	dimsm[0] = DIM0_SUB;
-	dimsm[1] = DIM1_SUB;
+        dimsm[0] = DIM0_SUB;
+        dimsm[1] = DIM1_SUB;
 
-	DataSpace memspace(RANK, dimsm, NULL);
+        DataSpace memspace(RANK, dimsm, NULL);
 
-	dataspace = dataset.getSpace();
-	dataspace.selectHyperslab(H5S_SELECT_SET, count, offset, stride, block); 
+        dataspace = dataset.getSpace();
+        dataspace.selectHyperslab(H5S_SELECT_SET, count, offset, stride, block); 
 
-	// Write a subset of data to the dataset, then read the
-	// entire dataset back from the file.
+        // Write a subset of data to the dataset, then read the
+        // entire dataset back from the file.
 
-	cout << endl << "Write subset to file specifying: " << endl;
-	cout << "  offset=1x2 stride=1x1 count=3x4 block=1x1" << endl;
-	for (j = 0; j < DIM0_SUB; j++) {
-	    for (i = 0; i < DIM1_SUB; i++)
-	       sdata[j][i] = 5;
-	} 
-	
-	dataset.write(sdata, PredType::NATIVE_INT, memspace, dataspace);
-	dataset.read(rdata, PredType::NATIVE_INT);
+        cout << endl << "Write subset to file specifying: " << endl;
+        cout << "  offset=1x2 stride=1x1 count=3x4 block=1x1" << endl;
+        for (j = 0; j < DIM0_SUB; j++) {
+            for (i = 0; i < DIM1_SUB; i++)
+               sdata[j][i] = 5;
+        } 
+        
+        dataset.write(sdata, PredType::NATIVE_INT, memspace, dataspace);
+        dataset.read(rdata, PredType::NATIVE_INT);
 
  
-	cout << endl << "Data in File after Subset is Written:" << endl;
-	for (i = 0; i < DIM0; i++) {
-	    for (j = 0; j < DIM1; j++) 
-	       cout << " " <<  rdata[i][j];
-	    cout << endl;
-	}
-	cout << endl;
-
-	// It is not necessary to close these objects because close() will
-	// be called when the object instances are going out of scope.
-	dataspace.close();
-	memspace.close();
-	dataset.close();
-	file.close();
+        cout << endl << "Data in File after Subset is Written:" << endl;
+        for (i = 0; i < DIM0; i++) {
+            for (j = 0; j < DIM1; j++) 
+               cout << " " <<  rdata[i][j];
+            cout << endl;
+        }
+        cout << endl;
+
+        // It is not necessary to close these objects because close() will
+        // be called when the object instances are going out of scope.
+        dataspace.close();
+        memspace.close();
+        dataset.close();
+        file.close();
 
     }  // end of try block
 
     // catch failure caused by the H5File operations
     catch(FileIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSet operations
     catch(DataSetIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
     catch(DataSpaceIException error)
     {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
     }
 
     return 0;  // successfully terminated
diff --git a/c++/examples/readdata.cpp b/c++/examples/readdata.cpp
index 5a2f3bc..3df8191 100644
--- a/c++/examples/readdata.cpp
+++ b/c++/examples/readdata.cpp
@@ -31,9 +31,9 @@ using namespace H5;
 
 const H5std_string FILE_NAME( "SDS.h5" );
 const H5std_string DATASET_NAME( "IntArray" );
-const int    NX_SUB = 3;	// hyperslab dimensions
+const int    NX_SUB = 3;        // hyperslab dimensions
 const int    NY_SUB = 4;
-const int    NX = 7;		// output buffer dimensions
+const int    NX = 7;            // output buffer dimensions
 const int    NY = 7;
 const int    NZ = 3;
 const int    RANK_OUT = 3;
@@ -49,8 +49,8 @@ int main (void)
    {
       for (i = 0; i < NY; i++)
       {
- 	 for (k = 0; k < NZ ; k++)
-	    data_out[j][i][k] = 0;
+         for (k = 0; k < NZ ; k++)
+            data_out[j][i][k] = 0;
       }
    }
 
@@ -81,19 +81,19 @@ int main (void)
        */
       if( type_class == H5T_INTEGER )
       {
-	 cout << "Data set has INTEGER type" << endl;
+         cout << "Data set has INTEGER type" << endl;
 
          /*
-	  * Get the integer datatype
+          * Get the integer datatype
           */
-	 IntType intype = dataset.getIntType();
+         IntType intype = dataset.getIntType();
 
          /*
           * Get order of datatype and print message if it's a little endian.
           */
-	 H5std_string order_string;
+         H5std_string order_string;
          H5T_order_t order = intype.getOrder( order_string );
-	 cout << order_string << endl;
+         cout << order_string << endl;
 
          /*
           * Get size of the data element stored in file and print it.
@@ -119,15 +119,15 @@ int main (void)
       hsize_t dims_out[2];
       int ndims = dataspace.getSimpleExtentDims( dims_out, NULL);
       cout << "rank " << rank << ", dimensions " <<
-	      (unsigned long)(dims_out[0]) << " x " <<
-	      (unsigned long)(dims_out[1]) << endl;
+              (unsigned long)(dims_out[0]) << " x " <<
+              (unsigned long)(dims_out[1]) << endl;
 
       /*
        * Define hyperslab in the dataset; implicitly giving strike and
        * block NULL.
        */
-      hsize_t      offset[2];	// hyperslab offset in the file
-      hsize_t      count[2];	// size of the hyperslab in the file
+      hsize_t      offset[2];   // hyperslab offset in the file
+      hsize_t      count[2];    // size of the hyperslab in the file
       offset[0] = 1;
       offset[1] = 2;
       count[0]  = NX_SUB;
@@ -146,8 +146,8 @@ int main (void)
       /*
        * Define memory hyperslab.
        */
-      hsize_t      offset_out[3];	// hyperslab offset in memory
-      hsize_t      count_out[3];	// size of the hyperslab in memory
+      hsize_t      offset_out[3];       // hyperslab offset in memory
+      hsize_t      count_out[3];        // size of the hyperslab in memory
       offset_out[0] = 3;
       offset_out[1] = 0;
       offset_out[2] = 0;
@@ -164,9 +164,9 @@ int main (void)
 
       for (j = 0; j < NX; j++)
       {
-	for (i = 0; i < NY; i++)
-	   cout << data_out[j][i][0] << " ";
-	cout << endl;
+        for (i = 0; i < NY; i++)
+           cout << data_out[j][i][0] << " ";
+        cout << endl;
       }
       /*
        * 0 0 0 0 0 0 0
diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp
index f5c06cf..eada2ed 100644
--- a/c++/examples/writedata.cpp
+++ b/c++/examples/writedata.cpp
@@ -34,19 +34,19 @@ using namespace H5;
 
 const H5std_string FILE_NAME( "Select.h5" );
 const H5std_string DATASET_NAME( "Matrix in file" );
-const int   MSPACE1_RANK = 1;	// Rank of the first dataset in memory
+const int   MSPACE1_RANK = 1;   // Rank of the first dataset in memory
 const int   MSPACE1_DIM = 50;   // Dataset size in memory
-const int   MSPACE2_RANK = 1;	// Rank of the second dataset in memory
-const int   MSPACE2_DIM = 4;	// Dataset size in memory
-const int   FSPACE_RANK = 2;	// Dataset rank as it is stored in the file
-const int   FSPACE_DIM1 = 8;	// Dimension sizes of the dataset as it is
-const int   FSPACE_DIM2 = 12;	// 	stored in the file
-const int   MSPACE_RANK = 2;	// Rank of the first dataset in memory
-const int   MSPACE_DIM1 = 8;	// We will read dataset back from the file
-const int   MSPACE_DIM2 = 9;	// 	to the dataset in memory with these
-				// 	dataspace parameters
-const int   NPOINTS = 4;	// Number of points that will be selected
-				//	and overwritten
+const int   MSPACE2_RANK = 1;   // Rank of the second dataset in memory
+const int   MSPACE2_DIM = 4;    // Dataset size in memory
+const int   FSPACE_RANK = 2;    // Dataset rank as it is stored in the file
+const int   FSPACE_DIM1 = 8;    // Dimension sizes of the dataset as it is
+const int   FSPACE_DIM2 = 12;   //      stored in the file
+const int   MSPACE_RANK = 2;    // Rank of the first dataset in memory
+const int   MSPACE_DIM1 = 8;    // We will read dataset back from the file
+const int   MSPACE_DIM2 = 9;    //      to the dataset in memory with these
+                                //      dataspace parameters
+const int   NPOINTS = 4;        // Number of points that will be selected
+                                //      and overwritten
 
 int main (void)
 {
@@ -57,271 +57,271 @@ int main (void)
      */
     try
     {
-	/*
-	 * Turn off the auto-printing when failure occurs so that we can
-	 * handle the errors appropriately
-	 */
-	Exception::dontPrint();
-
-	/*
-	 * Create a file.
-	 */
-	H5File* file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
-
-	/*
-	* Create property list for a dataset and set up fill values.
-	*/
-	int fillvalue = 0;   /* Fill value for the dataset */
-	DSetCreatPropList plist;
-	plist.setFillValue(PredType::NATIVE_INT, &fillvalue);
-
-	/*
-	 * Create dataspace for the dataset in the file.
-	 */
-	hsize_t fdim[] = {FSPACE_DIM1, FSPACE_DIM2}; // dim sizes of ds (on disk)
-	DataSpace fspace( FSPACE_RANK, fdim );
-
-	/*
-	 * Create dataset and write it into the file.
-	 */
-	DataSet* dataset = new DataSet(file->createDataSet(
-		DATASET_NAME, PredType::NATIVE_INT, fspace, plist));
-
-	/*
-	 * Select hyperslab for the dataset in the file, using 3x2 blocks,
-	 * (4,3) stride and (2,4) count starting at the position (0,1).
-	 */
-	hsize_t start[2]; // Start of hyperslab
-	hsize_t stride[2]; // Stride of hyperslab
-	hsize_t count[2];  // Block count
-	hsize_t block[2];  // Block sizes
-	start[0]  = 0; start[1]  = 1;
-	stride[0] = 4; stride[1] = 3;
-	count[0]  = 2; count[1]  = 4;
-	block[0]  = 3; block[1]  = 2;
-	fspace.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
-
-	/*
-	 * Create dataspace for the first dataset.
-	 */
-	hsize_t dim1[] = {MSPACE1_DIM};  /* Dimension size of the first dataset
-	                                   (in memory) */
-	DataSpace mspace1( MSPACE1_RANK, dim1 );
-
-	/*
-	 * Select hyperslab.
-	 * We will use 48 elements of the vector buffer starting at the
-	 * second element.  Selected elements are 1 2 3 . . . 48
-	 */
-	start[0]  = 1;
-	stride[0] = 1;
-	count[0]  = 48;
-	block[0]  = 1;
-	mspace1.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
-
-	/*
-	 * Write selection from the vector buffer to the dataset in the file.
-	 *
-	 * File dataset should look like this:
-	 *                    0  1  2  0  3  4  0  5  6  0  7  8
-	 *                    0  9 10  0 11 12  0 13 14  0 15 16
-	 *                    0 17 18  0 19 20  0 21 22  0 23 24
-	 *                    0  0  0  0  0  0  0  0  0  0  0  0
-	 *                    0 25 26  0 27 28  0 29 30  0 31 32
-	 *                    0 33 34  0 35 36  0 37 38  0 39 40
-	 *                    0 41 42  0 43 44  0 45 46  0 47 48
-	 *                    0  0  0  0  0  0  0  0  0  0  0  0
-	 */
-	int    vector[MSPACE1_DIM];	// vector buffer for dset
-
-	/*
-	 * Buffer initialization.
-	 */
-	vector[0] = vector[MSPACE1_DIM - 1] = -1;
-	for (i = 1; i < MSPACE1_DIM - 1; i++)
-	    vector[i] = i;
-
-	dataset->write( vector, PredType::NATIVE_INT, mspace1, fspace );
-
-	/*
-	 * Reset the selection for the file dataspace fid.
-	 */
-	fspace.selectNone();
-
-	/*
-	 * Create dataspace for the second dataset.
-	 */
-	hsize_t dim2[] = {MSPACE2_DIM};  /* Dimension size of the second dataset
-	                                   (in memory */
-	DataSpace mspace2( MSPACE2_RANK, dim2 );
-
-	/*
-	 * Select sequence of NPOINTS points in the file dataspace.
-	 */
-	hsize_t coord[NPOINTS][FSPACE_RANK]; /* Array to store selected points
-	                                        from the file dataspace */
-	coord[0][0] = 0; coord[0][1] = 0;
-	coord[1][0] = 3; coord[1][1] = 3;
-	coord[2][0] = 3; coord[2][1] = 5;
-	coord[3][0] = 5; coord[3][1] = 6;
-
-	fspace.selectElements( H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
-
-	/*
-	 * Write new selection of points to the dataset.
-	 */
-	int    values[] = {53, 59, 61, 67};  /* New values to be written */
-	dataset->write( values, PredType::NATIVE_INT, mspace2, fspace );
-
-	/*
-	 * File dataset should look like this:
-	 *                   53  1  2  0  3  4  0  5  6  0  7  8
-	 *                    0  9 10  0 11 12  0 13 14  0 15 16
-	 *                    0 17 18  0 19 20  0 21 22  0 23 24
-	 *                    0  0  0 59  0 61  0  0  0  0  0  0
-	 *                    0 25 26  0 27 28  0 29 30  0 31 32
-	 *                    0 33 34  0 35 36 67 37 38  0 39 40
-	 *                    0 41 42  0 43 44  0 45 46  0 47 48
-	 *                    0  0  0  0  0  0  0  0  0  0  0  0
-	 *
-	 */
-
-	/*
-	 * Close the dataset and the file.
-	 */
-	delete dataset;
-	delete file;
-
-	/*
-	 * Open the file.
-	 */
-	file = new H5File( FILE_NAME, H5F_ACC_RDONLY );
-
-	/*
-	 * Open the dataset.
-	 */
-	dataset = new DataSet( file->openDataSet( DATASET_NAME ));
-
-	/*
-	 * Get dataspace of the dataset.
-	 */
-	fspace = dataset->getSpace();
-
-	/*
-	 * Select first hyperslab for the dataset in the file. The following
-	 * elements are selected:
-	 *                     10  0 11 12
-	 *                     18  0 19 20
-	 *                      0 59  0 61
-	 *
-	 */
-	start[0] = 1; start[1] = 2;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 3; count[1]  = 4;
-	fspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
-
-	/*
-	 * Add second selected hyperslab to the selection.
-	 * The following elements are selected:
-	 *                    19 20  0 21 22
-	 *                     0 61  0  0  0
-	 *                    27 28  0 29 30
-	 *                    35 36 67 37 38
-	 *                    43 44  0 45 46
-	 *                     0  0  0  0  0
-	 * Note that two hyperslabs overlap. Common elements are:
-	 *                                              19 20
-	 *                                               0 61
-	 */
-	start[0] = 2; start[1] = 4;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 6; count[1]  = 5;
-	fspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
-
-	/*
-	 * Create memory dataspace.
-	 */
-	hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create a file.
+         */
+        H5File* file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
+
+        /*
+        * Create property list for a dataset and set up fill values.
+        */
+        int fillvalue = 0;   /* Fill value for the dataset */
+        DSetCreatPropList plist;
+        plist.setFillValue(PredType::NATIVE_INT, &fillvalue);
+
+        /*
+         * Create dataspace for the dataset in the file.
+         */
+        hsize_t fdim[] = {FSPACE_DIM1, FSPACE_DIM2}; // dim sizes of ds (on disk)
+        DataSpace fspace( FSPACE_RANK, fdim );
+
+        /*
+         * Create dataset and write it into the file.
+         */
+        DataSet* dataset = new DataSet(file->createDataSet(
+                DATASET_NAME, PredType::NATIVE_INT, fspace, plist));
+
+        /*
+         * Select hyperslab for the dataset in the file, using 3x2 blocks,
+         * (4,3) stride and (2,4) count starting at the position (0,1).
+         */
+        hsize_t start[2]; // Start of hyperslab
+        hsize_t stride[2]; // Stride of hyperslab
+        hsize_t count[2];  // Block count
+        hsize_t block[2];  // Block sizes
+        start[0]  = 0; start[1]  = 1;
+        stride[0] = 4; stride[1] = 3;
+        count[0]  = 2; count[1]  = 4;
+        block[0]  = 3; block[1]  = 2;
+        fspace.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
+
+        /*
+         * Create dataspace for the first dataset.
+         */
+        hsize_t dim1[] = {MSPACE1_DIM};  /* Dimension size of the first dataset
+                                           (in memory) */
+        DataSpace mspace1( MSPACE1_RANK, dim1 );
+
+        /*
+         * Select hyperslab.
+         * We will use 48 elements of the vector buffer starting at the
+         * second element.  Selected elements are 1 2 3 . . . 48
+         */
+        start[0]  = 1;
+        stride[0] = 1;
+        count[0]  = 48;
+        block[0]  = 1;
+        mspace1.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
+
+        /*
+         * Write selection from the vector buffer to the dataset in the file.
+         *
+         * File dataset should look like this:
+         *                    0  1  2  0  3  4  0  5  6  0  7  8
+         *                    0  9 10  0 11 12  0 13 14  0 15 16
+         *                    0 17 18  0 19 20  0 21 22  0 23 24
+         *                    0  0  0  0  0  0  0  0  0  0  0  0
+         *                    0 25 26  0 27 28  0 29 30  0 31 32
+         *                    0 33 34  0 35 36  0 37 38  0 39 40
+         *                    0 41 42  0 43 44  0 45 46  0 47 48
+         *                    0  0  0  0  0  0  0  0  0  0  0  0
+         */
+        int    vector[MSPACE1_DIM];     // vector buffer for dset
+
+        /*
+         * Buffer initialization.
+         */
+        vector[0] = vector[MSPACE1_DIM - 1] = -1;
+        for (i = 1; i < MSPACE1_DIM - 1; i++)
+            vector[i] = i;
+
+        dataset->write( vector, PredType::NATIVE_INT, mspace1, fspace );
+
+        /*
+         * Reset the selection for the file dataspace fid.
+         */
+        fspace.selectNone();
+
+        /*
+         * Create dataspace for the second dataset.
+         */
+        hsize_t dim2[] = {MSPACE2_DIM};  /* Dimension size of the second dataset
+                                           (in memory */
+        DataSpace mspace2( MSPACE2_RANK, dim2 );
+
+        /*
+         * Select sequence of NPOINTS points in the file dataspace.
+         */
+        hsize_t coord[NPOINTS][FSPACE_RANK]; /* Array to store selected points
+                                                from the file dataspace */
+        coord[0][0] = 0; coord[0][1] = 0;
+        coord[1][0] = 3; coord[1][1] = 3;
+        coord[2][0] = 3; coord[2][1] = 5;
+        coord[3][0] = 5; coord[3][1] = 6;
+
+        fspace.selectElements( H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
+
+        /*
+         * Write new selection of points to the dataset.
+         */
+        int    values[] = {53, 59, 61, 67};  /* New values to be written */
+        dataset->write( values, PredType::NATIVE_INT, mspace2, fspace );
+
+        /*
+         * File dataset should look like this:
+         *                   53  1  2  0  3  4  0  5  6  0  7  8
+         *                    0  9 10  0 11 12  0 13 14  0 15 16
+         *                    0 17 18  0 19 20  0 21 22  0 23 24
+         *                    0  0  0 59  0 61  0  0  0  0  0  0
+         *                    0 25 26  0 27 28  0 29 30  0 31 32
+         *                    0 33 34  0 35 36 67 37 38  0 39 40
+         *                    0 41 42  0 43 44  0 45 46  0 47 48
+         *                    0  0  0  0  0  0  0  0  0  0  0  0
+         *
+         */
+
+        /*
+         * Close the dataset and the file.
+         */
+        delete dataset;
+        delete file;
+
+        /*
+         * Open the file.
+         */
+        file = new H5File( FILE_NAME, H5F_ACC_RDONLY );
+
+        /*
+         * Open the dataset.
+         */
+        dataset = new DataSet( file->openDataSet( DATASET_NAME ));
+
+        /*
+         * Get dataspace of the dataset.
+         */
+        fspace = dataset->getSpace();
+
+        /*
+         * Select first hyperslab for the dataset in the file. The following
+         * elements are selected:
+         *                     10  0 11 12
+         *                     18  0 19 20
+         *                      0 59  0 61
+         *
+         */
+        start[0] = 1; start[1] = 2;
+        block[0] = 1; block[1] = 1;
+        stride[0] = 1; stride[1] = 1;
+        count[0]  = 3; count[1]  = 4;
+        fspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+
+        /*
+         * Add second selected hyperslab to the selection.
+         * The following elements are selected:
+         *                    19 20  0 21 22
+         *                     0 61  0  0  0
+         *                    27 28  0 29 30
+         *                    35 36 67 37 38
+         *                    43 44  0 45 46
+         *                     0  0  0  0  0
+         * Note that two hyperslabs overlap. Common elements are:
+         *                                              19 20
+         *                                               0 61
+         */
+        start[0] = 2; start[1] = 4;
+        block[0] = 1; block[1] = 1;
+        stride[0] = 1; stride[1] = 1;
+        count[0]  = 6; count[1]  = 5;
+        fspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
+
+        /*
+         * Create memory dataspace.
+         */
+        hsize_t mdim[] = {MSPACE_DIM1, MSPACE_DIM2}; /* Dimension sizes of the
                                                    dataset in memory when we
                                                    read selection from the
                                                    dataset on the disk */
-	DataSpace mspace(MSPACE_RANK, mdim);
-
-	/*
-	 * Select two hyperslabs in memory. Hyperslabs has the same
-	 * size and shape as the selected hyperslabs for the file dataspace.
-	 */
-	start[0] = 0; start[1] = 0;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 3; count[1]  = 4;
-	mspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
-	start[0] = 1; start[1] = 2;
-	block[0] = 1; block[1] = 1;
-	stride[0] = 1; stride[1] = 1;
-	count[0]  = 6; count[1]  = 5;
-	mspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
-
-	/*
-	 * Initialize data buffer.
-	 */
-	int matrix_out[MSPACE_DIM1][MSPACE_DIM2];
-	for (i = 0; i < MSPACE_DIM1; i++)
-	    for (j = 0; j < MSPACE_DIM2; j++)
-		matrix_out[i][j] = 0;
-
-	/*
-	 * Read data back to the buffer matrix.
-	 */
-	dataset->read(matrix_out, PredType::NATIVE_INT, mspace, fspace);
-
-	/*
-	 * Display the result.  Memory dataset is:
-	 *
-	 *                    10  0 11 12  0  0  0  0  0
-	 *                    18  0 19 20  0 21 22  0  0
-	 *                     0 59  0 61  0  0  0  0  0
-	 *                     0  0 27 28  0 29 30  0  0
-	 *                     0  0 35 36 67 37 38  0  0
-	 *                     0  0 43 44  0 45 46  0  0
-	 *                     0  0  0  0  0  0  0  0  0
-	 *                     0  0  0  0  0  0  0  0  0
-	 */
-	for (i=0; i < MSPACE_DIM1; i++)
-	{
-	    for(j=0; j < MSPACE_DIM2; j++)
-		cout << matrix_out[i][j] << "  ";
-	    cout << endl;
-	}
-
-	/*
-	 * Close the dataset and the file.
-	 */
-	delete dataset;
-	delete file;
+        DataSpace mspace(MSPACE_RANK, mdim);
+
+        /*
+         * Select two hyperslabs in memory. Hyperslabs has the same
+         * size and shape as the selected hyperslabs for the file dataspace.
+         */
+        start[0] = 0; start[1] = 0;
+        block[0] = 1; block[1] = 1;
+        stride[0] = 1; stride[1] = 1;
+        count[0]  = 3; count[1]  = 4;
+        mspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
+        start[0] = 1; start[1] = 2;
+        block[0] = 1; block[1] = 1;
+        stride[0] = 1; stride[1] = 1;
+        count[0]  = 6; count[1]  = 5;
+        mspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
+
+        /*
+         * Initialize data buffer.
+         */
+        int matrix_out[MSPACE_DIM1][MSPACE_DIM2];
+        for (i = 0; i < MSPACE_DIM1; i++)
+            for (j = 0; j < MSPACE_DIM2; j++)
+                matrix_out[i][j] = 0;
+
+        /*
+         * Read data back to the buffer matrix.
+         */
+        dataset->read(matrix_out, PredType::NATIVE_INT, mspace, fspace);
+
+        /*
+         * Display the result.  Memory dataset is:
+         *
+         *                    10  0 11 12  0  0  0  0  0
+         *                    18  0 19 20  0 21 22  0  0
+         *                     0 59  0 61  0  0  0  0  0
+         *                     0  0 27 28  0 29 30  0  0
+         *                     0  0 35 36 67 37 38  0  0
+         *                     0  0 43 44  0 45 46  0  0
+         *                     0  0  0  0  0  0  0  0  0
+         *                     0  0  0  0  0  0  0  0  0
+         */
+        for (i=0; i < MSPACE_DIM1; i++)
+        {
+            for(j=0; j < MSPACE_DIM2; j++)
+                cout << matrix_out[i][j] << "  ";
+            cout << endl;
+        }
+
+        /*
+         * Close the dataset and the file.
+         */
+        delete dataset;
+        delete file;
    }  // end of try block
 
    // catch failure caused by the H5File operations
    catch( FileIException error )
    {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
    }
 
    // catch failure caused by the DataSet operations
    catch( DataSetIException error )
    {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
    }
 
    // catch failure caused by the DataSpace operations
    catch( DataSpaceIException error )
    {
-	error.printErrorStack();
-	return -1;
+        error.printErrorStack();
+        return -1;
    }
 
    return 0;
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 82d63af..aea417a 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -143,7 +143,7 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC)
       #
       # Technically, variable-length arrays are part of the C99 standard, but
       #   we should approach them a bit cautiously... -QAK
-      set (H5_CFLAGS1 "${H5_CFLAGS1} -Wlogical-op -Wlarger-than=2048 -Wvla")
+      set (H5_CFLAGS1 "${H5_CFLAGS1} -Wlogical-op -Wlarger-than=2560 -Wvla")
 
       # Append more extra warning flags that only gcc 4.4+ know about
       set (H5_CFLAGS1 "${H5_CFLAGS1} -Wsync-nand -Wframe-larger-than=16384 -Wpacked-bitfield-compat")
@@ -210,7 +210,7 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC)
 
     # Append more extra warning flags that only gcc 9.x+ know about
     if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
-      set (H5_CFLAGS4 "${H5_CFLAGS4} Wattribute-alias=2 -Wmissing-profile")
+      set (H5_CFLAGS4 "${H5_CFLAGS4} -Wattribute-alias=2 -Wmissing-profile")
     endif ()
 
 endif ()
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index 340912e..e873503 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -36,22 +36,22 @@ int main(void)
     }
     else {
 
-	num_errors += BasicTest();
+    num_errors += BasicTest();
 
-	num_errors += TestCompoundDatatype();
+    num_errors += TestCompoundDatatype();
 
-	num_errors += TestGetPacket();
+    num_errors += TestGetPacket();
 
-	num_errors += TestGetNext();
+    num_errors += TestGetNext();
 
-	num_errors += TestCompress();
+    num_errors += TestCompress();
 
-	num_errors += TestErrors();
+    num_errors += TestErrors();
 
-	num_errors += SystemTest();
+    num_errors += SystemTest();
 
-	/* Test data corruption in packed structs */
-	num_errors += TestHDFFV_9758();
+    /* Test data corruption in packed structs */
+    num_errors += TestHDFFV_9758();
 
         /* Terminate access to the file. */
         err = H5Fclose(fileID);
@@ -81,7 +81,8 @@ int BasicTest()
     hsize_t count;
     int error;
 
-    TESTING("basic functionality")
+    printf("Testing %-62s", "basic functionality");
+    HDfflush(stdout);
 
     FL_PacketTable wrapper(fileID, H5P_DEFAULT, BASICTEST_PT, H5T_NATIVE_INT, 1);
     if(! wrapper.IsValid())
@@ -137,7 +138,8 @@ int TestCompoundDatatype()
     hsize_t count;
     int error;
 
-    TESTING("compound datatypes")
+    printf("Testing %-62s", "compound datatypes");
+    HDfflush(stdout);
 
     /* Create compound datatype */
     typedef struct compoundType
@@ -206,7 +208,8 @@ int TestGetNext()
     int records[2];
     int i;
 
-    TESTING("GetNextPacket")
+    printf("Testing %-62s", "GetNextPacket");
+    HDfflush(stdout);
 
     /* Create a dataset */
     FL_PacketTable wrapper(fileID, H5P_DEFAULT, GETNEXT_PT, H5T_NATIVE_INT, 500);
@@ -268,20 +271,21 @@ int TestCompress()
     unsigned int config = 0;
     size_t cd_nelemts = 0;
 
-    TESTING("compression")
+    printf("Testing %-62s", "compression");
+    HDfflush(stdout);
 #ifdef H5_HAVE_FILTER_DEFLATE
     try {
-	/* Prepare property list to set compression, randomly use deflate */
-	DSetCreatPropList dscreatplist;
-	dscreatplist.setDeflate(6);
+    /* Prepare property list to set compression, randomly use deflate */
+    DSetCreatPropList dscreatplist;
+    dscreatplist.setDeflate(6);
 
         /* Create packet table with compression. */
         FL_PacketTable wrapper(fileID, COMPRESS_PT, H5T_NATIVE_CHAR, 100, dscreatplist.getId());
 
-	/* Close the property list */
-	dscreatplist.close();
+    /* Close the property list */
+    dscreatplist.close();
 
-	/* Verify that the deflate filter is set */
+    /* Verify that the deflate filter is set */
 
         /* Create an HDF5 C++ file object */
         H5File file;
@@ -293,10 +297,10 @@ int TestCompress()
 
         DSetCreatPropList dcpl = dset.getCreatePlist();
 
-	char filter_name[8];
+    char filter_name[8];
         dcpl.getFilterById(H5Z_FILTER_DEFLATE, flags, cd_nelemts, NULL, 8, filter_name, config);
-	if (HDstrncmp(filter_name, "deflate", 7) != 0)
-	    H5_FAILED()
+    if (HDstrncmp(filter_name, "deflate", 7) != 0)
+        H5_FAILED()
     } catch (Exception e) {
       H5_FAILED();
       return 1;
@@ -304,7 +308,7 @@ int TestCompress()
     PASSED();
 #else
     SKIPPED();
-    puts("    deflate filter not enabled");
+    HDputs("    deflate filter not enabled");
 #endif /* H5_HAVE_FILTER_DEFLATE */
     return 0;
 }
@@ -315,7 +319,8 @@ int TestGetPacket()
     int record;
     int theRecs[3];
     int i;
-    TESTING("GetPacket")
+    printf("Testing %-62s", "GetPacket");
+    HDfflush(stdout);
 
     /* Create a dataset.  Does not need to specify property list because
        there is no compression. */
@@ -353,7 +358,8 @@ const char* PT_TESTERROR = "/TestErrors";
 
 int TestErrors()
 {
-    TESTING("error conditions")
+    printf("Testing %-62s", "error conditions");
+    HDfflush(stdout);
 
     /* Create a dataset */
     FL_PacketTable wrapper(fileID, PT_TESTERROR, H5T_NATIVE_INT, 1);
@@ -464,7 +470,8 @@ const char* PT_SYSTEMTST1 = "/SystemTest1";
 const char* PT_SYSTEMTST2 = "/SystemTest2";
 int SystemTest()
 {
-    TESTING("multiple datatypes")
+    printf("Testing %-62s", "multiple datatypes");
+    HDfflush(stdout);
 
     hid_t dtypeID1, dtypeID2;
     hsize_t count;
@@ -560,16 +567,16 @@ error:
 
 /*-------------------------------------------------------------------------
  * TestHDFFV_9758(): Test that a packet table with compound datatype which
- *	contains string type can be created and written correctly. (HDFFV-9758)
+ *    contains string type can be created and written correctly. (HDFFV-9758)
  *
  * Notes:
- *	Previously, data of the field that follows the string was read back
- *	as garbage when #pragma pack(1) is used.
+ *    Previously, data of the field that follows the string was read back
+ *    as garbage when #pragma pack(1) is used.
  * 2016/10/20 -BMR
  *      Updated:
- *		#pragma pack(1) caused failure on Emu because Sparc cannot
- *		access misaligned data.  Changed it to pack() to do the
- *		default alignment.
+ *        #pragma pack(1) caused failure on Emu because Sparc cannot
+ *        access misaligned data.  Changed it to pack() to do the
+ *        default alignment.
  * 2016/10/25 -BMR
  *-------------------------------------------------------------------------
  */
@@ -592,57 +599,58 @@ int TestHDFFV_9758()
     };
 
     s1_t s1[NUM_PACKETS];
-    
+
     for (hsize_t i = 0; i < NUM_PACKETS; i++)
     {
         s1[i].a = i;
         s1[i].b = 1.f * static_cast<float>(i * i);
         s1[i].c = 1. / (i + 1);
-        sprintf(s1[i].d, "string%d", (int)i);
+        HDsprintf(s1[i].d, "string%d", (int)i);
         s1[i].e = 100+i;
     }
 
-    TESTING("data corruption in packed structs (HDFFV-9758)")
+    printf("Testing %-62s", "data corruption in packed structs (HDFFV-9758)");
+    HDfflush(stdout);
 
     // Build a compound datatype
     compound_type = H5Tcreate(H5T_COMPOUND, sizeof(s1_t));
     if (compound_type < 0)
-	goto error;
-    
+    goto error;
+
     err = H5Tinsert(compound_type, "a_name", HOFFSET(s1_t, a), H5T_NATIVE_INT);
     if (err < 0)
-	goto error;
+    goto error;
     err = H5Tinsert(compound_type, "b_name", HOFFSET(s1_t, b), H5T_NATIVE_FLOAT);
     if (err < 0)
-	goto error;
+    goto error;
     err = H5Tinsert(compound_type, "c_name", HOFFSET(s1_t, c), H5T_NATIVE_DOUBLE);
     if (err < 0)
-	goto error;
+    goto error;
 
     strtype = H5Tcopy (H5T_C_S1);
     if (compound_type < 0)
-	goto error;
+    goto error;
     err = H5Tset_size (strtype, STRING_LENGTH); /* create string */
     if (err < 0)
-	goto error;
+    goto error;
     err = H5Tinsert(compound_type, "d_name", HOFFSET(s1_t, d), strtype);
     if (err < 0)
-	goto error;
+    goto error;
     err = H5Tinsert(compound_type, "e_name", HOFFSET(s1_t, e), H5T_NATIVE_INT);
     if (err < 0)
-	goto error;
+    goto error;
 
     { // so ptable will go out of scope before PASSED
 
     // Create a packet table
     FL_PacketTable ptable(fileID, "/examplePacketTable", compound_type, 1);
     if (!ptable.IsValid())
-	goto error;
+    goto error;
 
     // Add packets to the table
     for (size_t i = 0; i < NUM_PACKETS; i++)
     {
-	/* Appends one packet at the current position */
+    /* Appends one packet at the current position */
         err = ptable.AppendPacket(s1 + i);
         if (err < 0) goto error;
     }
@@ -650,11 +658,11 @@ int TestHDFFV_9758()
     // Check packet count
     const hsize_t count = ptable.GetPacketCount(err);
     if (err < 0)
-	goto error;
-  
+    goto error;
+
     if (count != NUM_PACKETS)
     {
-	std::cerr
+    std::cerr
         << "Number of packets in packet table should be " << NUM_PACKETS
         << " but is " << count << endl;
     }
@@ -663,16 +671,16 @@ int TestHDFFV_9758()
     ptable.ResetIndex();
     for (size_t i = 0; i < NUM_PACKETS; i++)
     {
-	s1_t s2;
-	memset(&s2, 0, sizeof(s1_t));
-	err = ptable.GetNextPacket(&s2);
-	if (err < 0)
-	    goto error;
-
-	if (s2.a != s1[i].a || s2.e != s1[i].e)
-	    goto error;
-	else if (HDstrcmp(s2.d, s1[i].d))
-	    goto error;
+    s1_t s2;
+    HDmemset(&s2, 0, sizeof(s1_t));
+    err = ptable.GetNextPacket(&s2);
+    if (err < 0)
+        goto error;
+
+    if (s2.a != s1[i].a || s2.e != s1[i].e)
+        goto error;
+    else if (HDstrcmp(s2.d, s1[i].d))
+        goto error;
     }
     } // end of ptable block
 
diff --git a/hl/c++/test/ptableTest.h b/hl/c++/test/ptableTest.h
index 8af7bff..e1ba950 100644
--- a/hl/c++/test/ptableTest.h
+++ b/hl/c++/test/ptableTest.h
@@ -21,9 +21,9 @@
 #ifndef PTABLETEST
 #define PTABLETEST
 
+#include "h5hltest.h"
 #include "H5PacketTable.h"
 #include "H5Cpp.h"
-#include "h5hltest.h"
 
 static hid_t fileID;
 
diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index f8f1d39..273e393 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -281,7 +281,7 @@ static int test_long_attachscales(const char *filename)
     strcpy(dsname, DATASET_NAME);
     strcat(dsname, "al");
 
-    TESTING2("test_long_attachscales");
+    HL_TESTING2("test_long_attachscales");
 
     if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto out;
@@ -342,7 +342,7 @@ static int test_duplicatelong_attachscales(const char *filename)
     strcpy(dsname, DATASET_NAME);
     strcat(dsname, "al2");
 
-    TESTING2("test_duplicatelong_attachscales");
+    HL_TESTING2("test_duplicatelong_attachscales");
 
     if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto out;
@@ -406,7 +406,7 @@ static int test_long_scalenames(const char *filename) {
     if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto out;
 
-    TESTING2("set long scale/cmp scale name");
+    HL_TESTING2("set long scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         strcpy(scalename, DS_1_NAME);
         strcat(scalename, "al");
@@ -483,7 +483,7 @@ static int test_samelong_scalenames(const char *filename) {
     if((fid = open_test_file(filename)) < 0)
         goto out;
 
-    TESTING2("set same long scale/cmp scale name");
+    HL_TESTING2("set same long scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         strcpy(scalename, DS_1_NAME);
         strcat(scalename, "al");
@@ -554,7 +554,7 @@ static int test_foreign_scaleattached(const char *filename)
     hid_t   did = -1;
     hid_t   dsid = -1;
 
-    TESTING2("test_foreign_scaleattached");
+    HL_TESTING2("test_foreign_scaleattached");
 
     if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         goto out;
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h
index f368b8e..85f47bd 100644
--- a/hl/test/h5hltest.h
+++ b/hl/test/h5hltest.h
@@ -28,8 +28,8 @@
 #include "H5HLprivate2.h"
 
 /* Macros used in HL tests */
-#define TESTING2(WHAT)  {printf("%-70s", "Testing     " WHAT); fflush(stdout);}
-#define TESTING3(WHAT)  {printf("%-70s", "" WHAT); fflush(stdout);}
+#define HL_TESTING2(WHAT)  {HDprintf("Testing %-62s", WHAT); HDfflush(stdout);}
+#define HL_TESTING3(WHAT)  {HDprintf("Testing %-62s", WHAT); HDfflush(stdout);}
 
 /* Implements verbose 'assert' with 'goto error' exit  */
 #define VERIFY(condition, string) do { if (!(condition)) FAIL_PUTS_ERROR(string) } while(0)
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 6c75423..9389a0d 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -1146,7 +1146,7 @@ static int test_detachscales(void)
        and detach them to check that at the end there is no attributes
        REFERENCE_LIST on a dimension scale and DIMENSION_LIST on a dataset */
 
-    TESTING2("test_detachscales");
+    HL_TESTING2("test_detachscales");
 
     if((fid = H5Fcreate("test_detach.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
@@ -1280,7 +1280,7 @@ static int test_char_attachscales(const char *fileext)
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "ac");
 
-    TESTING2("test_char_attachscales");
+    HL_TESTING2("test_char_attachscales");
 
     if((fid = open_test_file(fileext)) < 0)
         goto out;
@@ -1333,7 +1333,7 @@ static int test_short_attachscales(const char *fileext)
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "as");
 
-    TESTING2("test_short_attachscales");
+    HL_TESTING2("test_short_attachscales");
 
     if((fid = open_test_file(fileext)) < 0)
         goto out;
@@ -1410,7 +1410,7 @@ static int test_int_attachscales(const char *fileext)
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "a");
 
-    TESTING2("test_int_attachscales");
+    HL_TESTING2("test_int_attachscales");
 
     if((fid = open_test_file(fileext)) < 0)
         goto out;
@@ -1471,7 +1471,7 @@ static int test_long_attachscales(const char *fileext)
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "al");
 
-    TESTING2("test_long_attachscales");
+    HL_TESTING2("test_long_attachscales");
 
     if((fid = open_test_file(fileext)) < 0)
         goto out;
@@ -1528,7 +1528,7 @@ static int test_duplicatelong_attachscales(const char *fileext)
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "al2");
 
-    TESTING2("test_duplicatelong_attachscales");
+    HL_TESTING2("test_duplicatelong_attachscales");
 
     if((fid = open_test_file(fileext)) < 0)
         goto out;
@@ -1585,7 +1585,7 @@ static int test_float_attachscales(const char *fileext)
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "af");
 
-    TESTING2("test_float_attachscales");
+    HL_TESTING2("test_float_attachscales");
 
     if((fid = open_test_file(fileext)) < 0)
         goto out;
@@ -1647,7 +1647,7 @@ static int test_numberofscales(const char *fileext)
 
     HDsnprintf(dsname, sizeof(dsname), "%s%s", DATASET_NAME, "a");
 
-    TESTING2("test_numberofscales");
+    HL_TESTING2("test_numberofscales");
 
     if((fid = open_test_file(fileext)) < 0)
         goto out;
@@ -1729,7 +1729,7 @@ static int test_char_scalenames(const char *fileext) {
     if((fid = open_test_file(fileext)) < 0)
         goto out;
 
-    TESTING2("set char scale/cmp scale name");
+    HL_TESTING2("set char scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "ac");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "ac");
@@ -1789,7 +1789,7 @@ static int test_short_scalenames(const char *fileext) {
     if((fid = open_test_file(fileext)) < 0)
         goto out;
 
-    TESTING2("set short scale/cmp scale name");
+    HL_TESTING2("set short scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "as");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "as");
@@ -1897,7 +1897,7 @@ static int test_int_scalenames(const char *fileext) {
     if((fid = open_test_file(fileext)) < 0)
         goto out;
 
-    TESTING2("set int scale/cmp scale name");
+    HL_TESTING2("set int scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "a");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "a");
@@ -1973,7 +1973,7 @@ static int test_long_scalenames(const char *fileext) {
     if((fid = open_test_file(fileext)) < 0)
         goto out;
 
-    TESTING2("set long scale/cmp scale name");
+    HL_TESTING2("set long scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "al");
@@ -2041,7 +2041,7 @@ static int test_samelong_scalenames(const char *fileext) {
     if((fid = open_test_file(fileext)) < 0)
         goto out;
 
-    TESTING2("set same long scale/cmp scale name");
+    HL_TESTING2("set same long scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "al");
         HDsnprintf(name, sizeof(name), "%s%s", DS_1_NAME, "al");
@@ -2109,7 +2109,7 @@ static int test_float_scalenames(const char *fileext) {
     if((fid = open_test_file(fileext)) < 0)
         goto out;
 
-    TESTING2("set float scale/cmp scale name");
+    HL_TESTING2("set float scale/cmp scale name");
     if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) {
         HDsnprintf(scalename, sizeof(scalename), "%s%s", DS_1_NAME, "af");
         HDsnprintf(name, sizeof(name), "%s%s", SCALE_1_NAME, "af");
@@ -2181,7 +2181,7 @@ static int test_foreign_scaleattached(const char *fileforeign)
     hid_t   dsid = -1;
     const char *filename = H5_get_srcdir_filename(fileforeign);
 
-    TESTING2("test_foreign_scaleattached");
+    HL_TESTING2("test_foreign_scaleattached");
 
     if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         goto out;
@@ -2426,7 +2426,7 @@ static int test_simple(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("detach scales ");
+    HL_TESTING2("detach scales ");
 
 
     /*-------------------------------------------------------------------------
@@ -3013,7 +3013,7 @@ static int test_simple(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("set/get label");
+    HL_TESTING2("set/get label");
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
         goto out;
 
@@ -3103,7 +3103,7 @@ static int test_simple(void)
     */
 
 
-    TESTING2("set scale/get scale name");
+    HL_TESTING2("set scale/get scale name");
     if((dsid = H5Dopen2(fid,"ds_a_1", H5P_DEFAULT)) < 0)
         goto out;
     if(H5DSset_scale(dsid,"Latitude set 0") < 0)
@@ -3205,7 +3205,7 @@ static int test_simple(void)
     */
 
 
-    TESTING2("iterate scales");
+    HL_TESTING2("iterate scales");
 
 
     /*-------------------------------------------------------------------------
@@ -3771,7 +3771,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attach a dataset to itself");
+    HL_TESTING2("attach a dataset to itself");
 
     if(H5DSattach_scale(did, did, 0) == SUCCEED)
         goto out;
@@ -3782,7 +3782,7 @@ static int test_errors(void)
     * attempt to attach a group with a dataset, it should fail
     *-------------------------------------------------------------------------
     */
-    TESTING2("attach a group with a dataset");
+    HL_TESTING2("attach a group with a dataset");
 
     if(H5DSattach_scale(gid,dsid,0)==SUCCEED)
         goto out;
@@ -3793,7 +3793,7 @@ static int test_errors(void)
     * attempt to attach a dataset with a group, it should fail
     *-------------------------------------------------------------------------
     */
-    TESTING2("attach a dataset with a group");
+    HL_TESTING2("attach a dataset with a group");
 
     if(H5DSattach_scale(did,gid,0)==SUCCEED)
         goto out;
@@ -3804,7 +3804,7 @@ static int test_errors(void)
     * attempt to set scale for a group, it should fail
     *-------------------------------------------------------------------------
     */
-    TESTING2("set scale for a group");
+    HL_TESTING2("set scale for a group");
 
     if(H5DSset_scale(gid,"scale 1")==SUCCEED)
         goto out;
@@ -3834,7 +3834,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attach a scale that has scales");
+    HL_TESTING2("attach a scale that has scales");
 
     /* create the data space for the scale */
     if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
@@ -3903,7 +3903,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attach to a dataset that is a scale");
+    HL_TESTING2("attach to a dataset that is a scale");
 
     /* open the previous written "ds_b", that is a scale */
     if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
@@ -3930,7 +3930,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attach to a dataset that is a reserved class dataset");
+    HL_TESTING2("attach to a dataset that is a reserved class dataset");
 
     /* make an image */
     if(H5IMmake_image_8bit(fid,"image",(hsize_t)100,(hsize_t)50,NULL) < 0)
@@ -3965,7 +3965,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("is scale");
+    HL_TESTING2("is scale");
 
     /* open a non scale dataset */
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
@@ -3999,7 +3999,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("detach scale from dataset it is not attached to");
+    HL_TESTING2("detach scale from dataset it is not attached to");
 
     /* open the previous written "ds_a" */
     if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
@@ -4027,7 +4027,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("detach scale from group");
+    HL_TESTING2("detach scale from group");
 
     /* open the previous written "ds_a" */
     if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
@@ -4055,7 +4055,7 @@ static int test_errors(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("detach scale when scale is group");
+    HL_TESTING2("detach scale when scale is group");
 
     /* open the previous written "dset_a" */
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
@@ -4147,7 +4147,7 @@ static int test_iterators(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("iterate when the dataset has no scales ");
+    HL_TESTING2("iterate when the dataset has no scales ");
 
     /* get the dataset id for "dset_a" */
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
@@ -4169,7 +4169,7 @@ static int test_iterators(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("iterate on dimension that is outside the rank ");
+    HL_TESTING2("iterate on dimension that is outside the rank ");
 
     /* get the dataset id for "dset_a" */
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
@@ -4190,7 +4190,7 @@ static int test_iterators(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("iterate for dimension with many scales ");
+    HL_TESTING2("iterate for dimension with many scales ");
 
     /* open the previously written "dset_a" */
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
@@ -4227,7 +4227,7 @@ static int test_iterators(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("iterate on group ");
+    HL_TESTING2("iterate on group ");
 
     /* open */
     if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
@@ -4249,7 +4249,7 @@ static int test_iterators(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("iterate in deleted scales ");
+    HL_TESTING2("iterate in deleted scales ");
 
     if(H5Ldelete(fid, "ds_0", H5P_DEFAULT) < 0)
         goto out;
@@ -4343,7 +4343,7 @@ static int test_rank(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attach");
+    HL_TESTING2("attach");
 
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
         goto out;
@@ -4371,7 +4371,7 @@ static int test_rank(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("detach");
+    HL_TESTING2("detach");
 
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
         goto out;
@@ -4397,7 +4397,7 @@ static int test_rank(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attach, set, get names, labels");
+    HL_TESTING2("attach, set, get names, labels");
 
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
         goto out;
@@ -4436,7 +4436,7 @@ static int test_rank(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attach a scalar scale");
+    HL_TESTING2("attach a scalar scale");
 
     /* create the data space for the dataset */
     if((sid = H5Screate_simple(2, dimss, NULL)) < 0)
@@ -4549,7 +4549,7 @@ static int test_types(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("floating point and short scales");
+    HL_TESTING2("floating point and short scales");
 
     /* get the dataset id for "dset_a" */
     if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
@@ -4612,7 +4612,7 @@ static int test_types(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("string scales");
+    HL_TESTING2("string scales");
 
     /* get the dataset id for "dset_b" */
     if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
@@ -4709,7 +4709,7 @@ static int test_data(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("generating scales");
+    HL_TESTING2("generating scales");
 
     /*-------------------------------------------------------------------------
     * create datasets: 1 "data" dataset and 2 dimension scales
@@ -4954,7 +4954,7 @@ static int test_errors2(void)
         goto out;
 
 
-    TESTING2("attach scales");
+    HL_TESTING2("attach scales");
 
 
     /*-------------------------------------------------------------------------
@@ -4977,7 +4977,7 @@ static int test_errors2(void)
 
     PASSED();
 
-    TESTING2("detach scales");
+    HL_TESTING2("detach scales");
 
     /*-------------------------------------------------------------------------
     * detach with invalid indices
@@ -4998,7 +4998,7 @@ static int test_errors2(void)
 
     PASSED();
 
-    TESTING2("set/get label");
+    HL_TESTING2("set/get label");
 
     /*-------------------------------------------------------------------------
     * set/get label invalid indices
@@ -5023,7 +5023,7 @@ static int test_errors2(void)
 
     PASSED();
 
-    TESTING2("iterate scales");
+    HL_TESTING2("iterate scales");
 
 
     /*-------------------------------------------------------------------------
@@ -5122,7 +5122,7 @@ static int test_attach_detach(void)
     hid_t          var1_id, var2_id, var3_id;                        /* DS component name */
     hsize_t        dims[RANK1] = {DIM1};
 
-    TESTING2("permutations of attaching and detaching");
+    HL_TESTING2("permutations of attaching and detaching");
 
     if((fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
       goto out;
diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c
index 8bb4f84..1914a08 100644
--- a/hl/test/test_dset_append.c
+++ b/hl/test/test_dset_append.c
@@ -18,7 +18,7 @@
 #include "h5hltest.h"
 #include "H5DOpublic.h"
 
-#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER) 
+#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER)
 # define H5_ZLIB_HEADER "zlib.h"
 #endif
 #if defined(H5_ZLIB_HEADER)
@@ -64,22 +64,22 @@ test_dataset_append_notset(hid_t fid)
     int i, j;                                /* Local index variables */
     h5_stat_t  sb1, sb2;                /* File info */
 
-    TESTING("Append flush with H5DOappend()--append rows with default dapl");
+    HL_TESTING2("Append flush with H5DOappend()--append rows with default dapl");
 
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_NOTSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if((did = H5Dcreate2(fid, DNAME_NOTSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR;
 
     /* Append 6 rows to the dataset */
@@ -104,7 +104,7 @@ test_dataset_append_notset(hid_t fid)
         TEST_ERROR;
 
     /* File size before flushing should be less */
-    if(sb1.st_size > sb2.st_size) 
+    if(sb1.st_size > sb2.st_size)
         TEST_ERROR;
 
     /* Closing */
@@ -183,28 +183,28 @@ test_dataset_append_rows_columns(hid_t fid)
 
     int i, j;                                /* Local index variables */
 
-    TESTING("Append flush with H5DOappend()--append rows & columns");
+    HL_TESTING2("Append flush with H5DOappend()--append rows & columns");
 
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) 
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_UNLIM, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0) 
+    if((did = H5Dcreate2(fid, DNAME_UNLIM, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
@@ -246,7 +246,7 @@ test_dataset_append_rows_columns(hid_t fid)
     /* Read the dataset */
     if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
-    
+
     /* Verify the data */
     for(i = 0; i < 6; i++)
         for(j = 0; j < 13; j++)
@@ -336,28 +336,28 @@ test_dataset_append_rows(hid_t fid)
     unsigned append_ct = 0;                /* The # of appends */
     unsigned *flush_ptr;                /* Points to the flush counter */
 
-    TESTING("Append flush with H5DOappend()--append rows");
+    HL_TESTING2("Append flush with H5DOappend()--append rows");
 
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 1 extendible dimension */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) 
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_ROW, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0) 
+    if((did = H5Dcreate2(fid, DNAME_ROW, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
@@ -380,7 +380,7 @@ test_dataset_append_rows(hid_t fid)
     /* Read the dataset */
     if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
-    
+
     /* Verify the data */
     for(i = 0; i < 6; i++)
         for(j = 0; j < 10; j++)
@@ -470,28 +470,28 @@ test_dataset_append_columns(hid_t fid)
     unsigned append_ct = 0;                /* The # of appends */
     unsigned *flush_ptr;                /* Points to the flush counter */
 
-    TESTING("Append flush with H5DOappend()--append columns");
+    HL_TESTING2("Append flush with H5DOappend()--append columns");
 
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 1 extendible dimension */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) 
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_COLUMN, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0) 
+    if((did = H5Dcreate2(fid, DNAME_COLUMN, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 3 columns to the dataset */
@@ -515,7 +515,7 @@ test_dataset_append_columns(hid_t fid)
     /* Read the dataset */
     if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
-    
+
     /* Verify the data */
     for(i = 0; i < 6; i++)
         for(j = 0; j < 3; j++)
@@ -614,28 +614,28 @@ test_dataset_append_BUG1(hid_t fid)
     unsigned append_ct = 0;                /* The # of appends */
     unsigned *flush_ptr;                /* Points to the flush counter */
 
-    TESTING("Append flush with H5DOappend()--append rows & columns--BUG1");
-    
+    HL_TESTING2("Append flush with H5DOappend()--append rows & columns--BUG1");
+
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) 
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DBUGNAME1, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0) 
+    if((did = H5Dcreate2(fid, DBUGNAME1, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
@@ -677,7 +677,7 @@ test_dataset_append_BUG1(hid_t fid)
     /* Read the dataset */
     if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
-    
+
     /* Verify the data */
     for(i = 0; i < 6; i++)
         for(j = 0; j < 13; j++)
@@ -775,28 +775,28 @@ test_dataset_append_BUG2(hid_t fid)
     unsigned append_ct = 0;                /* The # of appends */
     unsigned *flush_ptr;                /* Points to the flush counter */
 
-    TESTING("Append flush with H5DOappend()--append rows & columns--BUG2");
-    
+    HL_TESTING2("Append flush with H5DOappend()--append rows & columns--BUG2");
+
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) 
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DBUGNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0) 
+    if((did = H5Dcreate2(fid, DBUGNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset */
@@ -839,7 +839,7 @@ test_dataset_append_BUG2(hid_t fid)
     /* Read the dataset */
     if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
-    
+
     /* Verify the data */
     for(i = 0; i < 6; i++)
         for(j = 0; j < 13; j++)
@@ -930,28 +930,28 @@ test_dataset_append_less(hid_t fid)
     unsigned append_ct = 0;                /* The # of appends */
     unsigned *flush_ptr;                /* Points to the flush counter */
 
-    TESTING("Append flush with H5DOappend()--append size < boundary size");
+    HL_TESTING2("Append flush with H5DOappend()--append size < boundary size");
 
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) 
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_LESS, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0) 
+    if((did = H5Dcreate2(fid, DNAME_LESS, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append to the dataset 2 rows at a time for 3 times */
@@ -996,7 +996,7 @@ test_dataset_append_less(hid_t fid)
     /* Read the dataset */
     if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
-    
+
     /* Verify the data */
     for(i = 0; i < 6; i++)
         for(j = 0; j < 13; j++)
@@ -1057,7 +1057,7 @@ error:
  *
  * Purpose:     Verify that the object flush property and the append flush property
  *              are working properly when appending rows and columns to an
- *              extendible dataset where 
+ *              extendible dataset where
  *                  row: the append size is 3 times of the boundary size
  *                       the append callback/flush is performed on the 1st boundary hit
  *                  column: the boundary is greater than the append size
@@ -1090,28 +1090,28 @@ test_dataset_append_vary(hid_t fid)
     unsigned append_ct = 0;                /* The # of appends */
     unsigned *flush_ptr;                /* Points to the flush counter */
 
-    TESTING("Append flush with H5DOappend()--append & boundary size vary");
+    HL_TESTING2("Append flush with H5DOappend()--append & boundary size vary");
 
     /* Get the file's file access property list */
     if((ffapl = H5Fget_access_plist(fid)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to create a chunked dataset with 2 extendible dimensions */
-    if((sid = H5Screate_simple(2, dims, maxdims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, maxdims)) < 0)
         FAIL_STACK_ERROR;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         FAIL_STACK_ERROR;
 
     /* Set append flush property */
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) 
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR;
     if(H5Pset_append_flush(dapl, 2, boundary, append_func, &append_ct) < 0)
         FAIL_STACK_ERROR;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DNAME_VARY, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0) 
+    if((did = H5Dcreate2(fid, DNAME_VARY, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl)) < 0)
         TEST_ERROR;
 
     /* Append 6 rows to the dataset, once */
@@ -1151,7 +1151,7 @@ test_dataset_append_vary(hid_t fid)
     /* Read the dataset */
     if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0)
         FAIL_STACK_ERROR;
-    
+
     /* Verify the data */
     for(i = 0; i < 6; i++)
         for(j = 0; j < 13; j++)
@@ -1227,7 +1227,7 @@ int main(void)
     int   nerrors = 0;                /* The # of errors encountered */
 
     /* Get a copy of file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) 
+    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         FAIL_STACK_ERROR;
 
     /* Set to use the latest library format */
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index a98642c..ef220f9 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -44,7 +44,7 @@
    extend the image, and then performs writes that extend the images. The fifth
    loop reads the extended images and verify that the content are correct. The
    sixth and final loop closes the file images and deallocates the image
-   buffers if appropriate.                                                   */ 
+   buffers if appropriate.                                                   */
 
 /*-------------------------------------------------------------------------
 * test file image operations 
@@ -67,11 +67,11 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
     void        **buf_ptr;              /* pointer to array of pointers to image buffers */
     char        **filename;             /* pointer to array of pointers to filenames */
     unsigned    *input_flags;           /* pointer to array of flag combinations */
-    size_t      i, j, k, nrow, n_values; 
+    size_t      i, j, k, nrow, n_values;
     herr_t      status1;
     void        *handle_ptr = NULL;     /* pointers to driver buffer */
-    unsigned char **core_buf_ptr_ptr = NULL; 
- 
+    unsigned char **core_buf_ptr_ptr = NULL;
+
     VERIFY(open_images > 1 , "The number of open images must be greater than 1");
 
     VERIFY(nflags > 0, "The number of flag combinations  must be greater than 0");
@@ -100,7 +100,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
     if (NULL == (dset_id = (hid_t *)HDmalloc(sizeof(hid_t) * open_images)))
         FAIL_PUTS_ERROR("malloc() failed");
 
-    TESTING("get file images");
+    HL_TESTING2("get file images");
 
     /* create several file images */
     for (i = 0; i < open_images; i++) {
@@ -118,11 +118,11 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         if ((file_id[i] = H5Fcreate(filename[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_PUTS_ERROR("H5Fcreate() failed");
 
-        /* define dataspace for the dataset */ 
-        if ((file_space = H5Screate_simple(RANK, dims1, max_dims)) < 0) 
+        /* define dataspace for the dataset */
+        if ((file_space = H5Screate_simple(RANK, dims1, max_dims)) < 0)
             FAIL_PUTS_ERROR("H5Screate_simple() failed");
 
-        /* create dataset property list */ 
+        /* create dataset property list */
         if ((plist = H5Pcreate(H5P_DATASET_CREATE)) < 0)
             FAIL_PUTS_ERROR("H5Pcreate() failed");
 
@@ -133,8 +133,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* create and write an integer type dataset named "dset" */
         if ((dset_id[i] = H5Dcreate2(file_id[i], DSET_NAME, H5T_NATIVE_INT, file_space, H5P_DEFAULT, plist, H5P_DEFAULT)) < 0)
             FAIL_PUTS_ERROR("H5Dcreate() failed");
-     
-        /* dataset in open image 1 is written with "wrong" data */        
+
+        /* dataset in open image 1 is written with "wrong" data */
         if (i == 1) {
             if (H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2) < 0)
                 FAIL_PUTS_ERROR("H5Dwrite() failed");
@@ -144,7 +144,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             if (H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1) < 0)
                 FAIL_PUTS_ERROR("H5Dwrite() failed");
         } /* end else */
-          
+
         /* flush into the file */
         if (H5Fflush(file_id[i], H5F_SCOPE_LOCAL) < 0)
             FAIL_PUTS_ERROR("H5Fflush() failed");
@@ -152,7 +152,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* close dataset property list */
         if (H5Pclose(plist) < 0)
             FAIL_PUTS_ERROR("H5Pclose() failed");
-       
+
         /* close dataspace */
         if (H5Sclose(file_space) < 0)
             FAIL_PUTS_ERROR("H5Sclose() failed");
@@ -172,7 +172,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* buffer for file image 2 is filled with counter data (non-valid image) */
         if (i == 2) {
             for (j = 0; j < (size_t)buf_size[i]; j++)
-                ((char*)(buf_ptr[i]))[j] = (char)j; 
+                ((char*)(buf_ptr[i]))[j] = (char)j;
         } /* end if */
         /* buffers for the rest of the file images are filled with data from the respective files */
         else {
@@ -187,14 +187,14 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
 
     PASSED();
 
-    TESTING("open file images and check image copies");
- 
-    /* open the file images with the core driver for data access */ 
+    HL_TESTING2("open file images and check image copies");
+
+    /* open the file images with the core driver for data access */
     for (i = 0; i < open_images; i++) {
         /* open file image 2 filled with counter data (non-valid image) */
         if (i == 2) {
             H5E_BEGIN_TRY {
-                /* attempt to set file image in the core driver */ 
+                /* attempt to set file image in the core driver */
                 file_id[i] = H5LTopen_file_image(buf_ptr[i], (size_t)buf_size[i], input_flags[i]);
             } H5E_END_TRY
 
@@ -202,7 +202,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         } /* end if */
         /* open rest of valid file images */
         else {
-            /* set file image in the core driver */ 
+            /* set file image in the core driver */
             if ((file_id[i] = H5LTopen_file_image(buf_ptr[i], (size_t)buf_size[i], input_flags[i])) < 0)
                 FAIL_PUTS_ERROR("H5LTopen_file_image() failed");
 
@@ -218,7 +218,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             else
                 VERIFY(*core_buf_ptr_ptr != buf_ptr[i], "vfd buffer and user buffer should be different");
 
-	    /*
+        /*
              *  When the vfd and user buffers are different and H5LT_FILE_IMAGE_OPEN_RW is enabled,
              *  status_flags in the superblock needs to be cleared in the vfd buffer for
              *  the comparison to proceed as expected.  The user buffer as returned from H5Fget_file_image()
@@ -249,7 +249,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
 
     PASSED();
 
-    TESTING("read file images");
+    HL_TESTING2("read file images");
 
     /* read open file images and verify data */
     for (i = 0; i < open_images; i++) {
@@ -259,7 +259,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             continue;
         } /* end if */
 
-        /* open dataset in file image */ 
+        /* open dataset in file image */
         if ((dset_id[i] = H5Dopen2(file_id[i], DSET_NAME, H5P_DEFAULT)) < 0)
             FAIL_PUTS_ERROR("H5Dopen() failed");
 
@@ -274,8 +274,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* read dataset */
         if (H5Dread(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data3) < 0)
             FAIL_PUTS_ERROR("H5Dread() failed");
-        
-        /* compute number of elements in dataset */  
+
+        /* compute number of elements in dataset */
         n_values = (size_t)(dims3[0] * dims3[1]);
 
         /* determine the number of rows in dataset */
@@ -297,15 +297,15 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
                     if (data3[j * nrow + k ] != data1[j * nrow + k ])
                         FAIL_PUTS_ERROR("comparison of image values with original data failed");
         } /* end else */
-         
-        /* close dataspace */ 
+
+        /* close dataspace */
         if (H5Sclose (file_space) < 0)
             FAIL_PUTS_ERROR("H5Sclose() failed");
     } /* end for */
 
-    PASSED(); 
+    PASSED();
 
-    TESTING("write and extend file images");
+    HL_TESTING2("write and extend file images");
 
     /* write open file images and verify data */
     for (i = 0; i < open_images; i++) {
@@ -365,7 +365,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
                 hid_t attr_space_id = -1;
                 hid_t attr_id = -1;
                 herr_t status2;
-                size_t l; 
+                size_t l;
 
                 if ((attr_space_id = H5Screate_simple(attr_rank, attr_dims, attr_dims)) < 0)
                     FAIL_PUTS_ERROR("attr_space H5Screate_simple() failed");
@@ -396,9 +396,9 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
                     H5Aclose(attr_id);
                 } H5E_END_TRY;
 #endif
-		if (H5Dclose(dset_id[i]) < 0)
-		    FAIL_PUTS_ERROR("H5Dclose() failed");
-		dset_id[i] = -1;
+        if (H5Dclose(dset_id[i]) < 0)
+            FAIL_PUTS_ERROR("H5Dclose() failed");
+        dset_id[i] = -1;
             } /* end if */
             else {
                 /* write dataset without extending it */
@@ -422,7 +422,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
 
     PASSED();
 
-    TESTING("read extended file images");
+    HL_TESTING2("read extended file images");
 
     /* read open file images and verify data */
     for (i = 0; i < open_images; i++) {
@@ -430,7 +430,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         if ((dset_id[i] < 0) || (file_id[i] <  0) || (!(input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW )))
             continue;
 
-        /* open dataset in file image */ 
+        /* open dataset in file image */
         if ((dset_id[i] = H5Dopen2(file_id[i], DSET_NAME, H5P_DEFAULT)) < 0)
             FAIL_PUTS_ERROR("H5Dopen() failed");
 
@@ -445,8 +445,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         /* read dataset */
         if (H5Dread(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,  data3) < 0)
             FAIL_PUTS_ERROR("H5Dread() failed");
-        
-        /* compute number of elements in dataset */  
+
+        /* compute number of elements in dataset */
         n_values = (size_t)(dims3[0] * dims3[1]);
 
         /* determine the number of rows in dataset */
@@ -457,8 +457,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             for (k = 0; k < nrow; k++)
                 if (data3[j * nrow + k ] != data4[j * nrow + k ])
                     FAIL_PUTS_ERROR("comparison of image values with original data failed");
-         
-        /* close dataspace */ 
+
+        /* close dataspace */
         if (H5Sclose (file_space) < 0)
             FAIL_PUTS_ERROR("H5Sclose() failed");
 
@@ -469,7 +469,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
 
     PASSED()
 
-    TESTING("close file images");
+    HL_TESTING2("close file images");
 
     /* close file images  and release buffer if appropriate */
     for (i = 0; i < open_images; i++) {
@@ -489,7 +489,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
             VERIFY(buf_ptr[i] != NULL, "buffer pointer must be non NULL");
             HDfree(buf_ptr[i]);
         } /* end if */
-       
+
     } /* end for */
 
     /* release temporary working buffers */
@@ -521,8 +521,8 @@ int main( void )
     size_t    open_images = 10; /* number of open file images */
     size_t    nflags = 8; /* number of flag combinations */
     unsigned  flags[8]; /* array with flag combinations */
-   
-    /* set flag combinations for testing */ 
+
+    /* set flag combinations for testing */
     flags[0] = 0;
     flags[1] = H5LT_FILE_IMAGE_DONT_RELEASE;
     flags[2] = H5LT_FILE_IMAGE_DONT_COPY;
diff --git a/hl/test/test_h5do_compat.c b/hl/test/test_h5do_compat.c
index 4df5eef..75028fb 100644
--- a/hl/test/test_h5do_compat.c
+++ b/hl/test/test_h5do_compat.c
@@ -26,14 +26,14 @@
 #define NX              8
 #define CHUNK_NX        4
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_direct_chunk_write
+ * Function:    test_direct_chunk_write
  *
- * Purpose:	    Test the basic functionality of H5DOwrite_chunk
+ * Purpose:        Test the basic functionality of H5DOwrite_chunk
  *
- * Return:	    Success:    An identifer for the dataset used in the tests
- *		        Failure:	H5I_INVALID_HID
+ * Return:        Success:    An identifer for the dataset used in the tests
+ *                Failure:    H5I_INVALID_HID
  *
  *-------------------------------------------------------------------------
  */
@@ -65,7 +65,7 @@ create_dataset(hid_t fid)
 
     /* Initialize the data */
     for (i = 0; i < NX; i++)
-	    data[i] = i;
+        data[i] = i;
 
     /* Write the initialized data */
     if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
@@ -91,14 +91,14 @@ create_dataset(hid_t fid)
 } /* end create_dataset() */
 
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_direct_chunk_write
+ * Function:    test_direct_chunk_write
  *
- * Purpose:	    Test the basic functionality of H5DOwrite_chunk
+ * Purpose:        Test the basic functionality of H5DOwrite_chunk
  *
- * Return:	    Success:    0
- *		        Failure:    1
+ * Return:        Success:    0
+ *                Failure:    1
  *
  *-------------------------------------------------------------------------
  */
@@ -111,7 +111,7 @@ test_direct_chunk_write(hid_t did)
     size_t      data_size;
     int         i;
 
-    TESTING("H5DOwrite_chunk wrapper");
+    HL_TESTING2("H5DOwrite_chunk wrapper");
 
     /* Set the size of the chunk data */
     data_size = CHUNK_NX * sizeof(int);
@@ -120,9 +120,9 @@ test_direct_chunk_write(hid_t did)
     for (i = 0; i < CHUNK_NX; i++)
         chunk_data[i] = (i * 10) + i;
 
-    /* Write the direct chunk data repeatedly to cover all the chunks in the 
+    /* Write the direct chunk data repeatedly to cover all the chunks in the
      * dataset, using the direct writing function.
-     */ 
+     */
     offset[0] = 0;
     for (i = 0; i < NX/CHUNK_NX; i++) {
         if (H5DOwrite_chunk(did, H5P_DEFAULT, filter_mask, offset, data_size, chunk_data) < 0)
@@ -138,14 +138,14 @@ error:
     return 1;
 } /* test_direct_chunk_write() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_direct_chunk_read
+ * Function:    test_direct_chunk_read
  *
- * Purpose:	    Test the basic functionality of H5DOread_chunk
+ * Purpose:        Test the basic functionality of H5DOread_chunk
  *
- * Return:	    Success:    0
- *		        Failure:    1
+ * Return:        Success:    0
+ *                Failure:    1
  *
  *-------------------------------------------------------------------------
  */
@@ -169,7 +169,7 @@ test_direct_chunk_read(hid_t did)
 
     int         i,j;
 
-    TESTING("H5DOread_chunk wrapper");
+    HL_TESTING2("H5DOread_chunk wrapper");
 
     /* Create dataspaces for reading */
     if ((mem_sid = H5Screate_simple(1, chunk_dims, NULL)) < 0)
@@ -232,15 +232,15 @@ error:
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	    Test direct chunk write function H5DOwrite_chunk and
+ * Purpose:        Test direct chunk write function H5DOwrite_chunk and
  *              chunk direct read function H5DOread_chunk
  *
- * Return:	    Success:    0
- *		        Failure:    1
+ * Return:        Success:    0
+ *                Failure:    1
  *
  *-------------------------------------------------------------------------
  */
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index c30b572..e350533 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -169,7 +169,7 @@ static int test_simple(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING("indexed image");
+    HL_TESTING2("indexed image");
 
     /* Write image */
     if ( H5IMmake_image_8bit( fid, IMAGE1_NAME, width, height, buf1 ) < 0 )
@@ -205,7 +205,7 @@ static int test_simple(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING("true color image");
+    HL_TESTING2("true color image");
 
     /* Write image */
     if ( H5IMmake_image_24bit( fid, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", buf2 ) )
@@ -232,7 +232,7 @@ static int test_simple(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING("pallete functions");
+    HL_TESTING2("pallete functions");
 
     if ( H5IMget_npalettes( fid, IMAGE1_NAME, &npals ) < 0 )
         goto out;
@@ -351,7 +351,7 @@ static int test_data(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("make indexed image");
+    HL_TESTING2("make indexed image");
 
     /* read first data file */
     if (read_data(DATA_FILE1,&width,&height)<0)
@@ -364,7 +364,7 @@ static int test_data(void)
     PASSED();
 
 
-    TESTING2("attaching palettes");
+    HL_TESTING2("attaching palettes");
 
     /*-------------------------------------------------------------------------
     * palette #1. rainbow palette. data is contained in "pal_rgb.h"
@@ -464,7 +464,7 @@ static int test_data(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("make true color image with pixel interlace");
+    HL_TESTING2("make true color image with pixel interlace");
 
     /* read second data file */
     if ((read_data(DATA_FILE2,&width,&height))<0)
@@ -481,7 +481,7 @@ static int test_data(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("make true color image with plane interlace");
+    HL_TESTING2("make true color image with plane interlace");
 
     /* read third data file */
     if ((read_data(DATA_FILE3,&width,&height))<0)
@@ -627,7 +627,7 @@ static int test_generate(void)
         goto out;
     if(n_elements > INT_MAX / (int)sizeof(float))
         goto out;
-    
+
     data = (float *)HDmalloc((size_t)n_elements * sizeof(float));
     if(NULL == data)
         goto out;
@@ -652,7 +652,7 @@ static int test_generate(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("make indexed image from all the data");
+    HL_TESTING2("make indexed image from all the data");
 
     for ( i = 0; i < n_elements; i++ )
         image_data[i] = (unsigned char)(( 255 * (data[i] - xmin ) ) / (xmax - xmin ));
@@ -669,7 +669,7 @@ static int test_generate(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("make indexed image from land data");
+    HL_TESTING2("make indexed image from land data");
 
     for ( i = 0; i < n_elements; i++ )
     {
@@ -691,7 +691,7 @@ static int test_generate(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("make indexed image from sea data");
+    HL_TESTING2("make indexed image from sea data");
 
     for ( i = 0; i < n_elements; i++ )
     {
@@ -712,7 +712,7 @@ static int test_generate(void)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("attaching palettes");
+    HL_TESTING2("attaching palettes");
 
     /* make a palette */
     if ((H5IMmake_palette(fid,PAL1_NAME,pal_dims,pal_rgb))<0)
@@ -815,7 +815,7 @@ static int read_data(const char* fname, /*IN*/
         printf( "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 );
         goto out;
@@ -870,7 +870,7 @@ static int read_data(const char* fname, /*IN*/
     /* Indicate success */
     ret_val = 1;
 
-out:    
+out:
     if(f)
         HDfclose(f);
 
diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c
index 12a226a..e3cde5d 100644
--- a/hl/test/test_ld.c
+++ b/hl/test/test_ld.c
@@ -29,12 +29,12 @@
 #define DSET_ONE        "DSET_ONE"
 #define DSET_ALLOC_LATE "DSET_ALLOC_LATE"
 #define DSET_ALLOC_EARLY "DSET_ALLOC_EARLY"
-#define DSET_TWO 	"DSET_TWO"
-#define TWO_DIM_1	4
-#define TWO_DIM_2	10
-#define DSET_CMPD 	"DSET_CMPD"
-#define DSET_CMPD_ESC 	"DSET_CMPD_ESC"
-#define DSET_CMPD_TWO 	"DSET_CMPD_TWO"
+#define DSET_TWO     "DSET_TWO"
+#define TWO_DIM_1    4
+#define TWO_DIM_2    10
+#define DSET_CMPD     "DSET_CMPD"
+#define DSET_CMPD_ESC     "DSET_CMPD_ESC"
+#define DSET_CMPD_TWO     "DSET_CMPD_TWO"
 #define DSET_NULL       "DSET_NULL"
 #define DSET_SCALAR     "DSET_SCALAR"
 
@@ -53,63 +53,63 @@
 #define INVALID_ESC_FIELDS2 "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\,."
 #define INVALID_ESC_FIELDS3 "field2\\..\\,,b.a,field2\\..\\\\c,field4\\,.b\\,"
 
-/* 
+/*
  * Test variations (retained original) for one-dimensional dataset:
- *	Varies from 10->13; 10->9, 10->10, 10->1, 10->11
+ *    Varies from 10->13; 10->9, 10->10, 10->1, 10->11
  */
 #define ONE_NTESTS      5
 int one_tests[ONE_NTESTS] = {3, -1, 0, -9, 1};
 
-/* 
+/*
  * Test variations (retained original) for two-dimensional dataset:
- * 	Varies from {4,10}->{6,12}; {4,10}->{6,9}; {4,10}->{6,10};
- *		    {4,10}->{3,12}; {4,10}->{3,9}; {4,10}->{3,10};
- *		    {4,10}->{4,12}; {4,10}->{4,9}; {4,10}->{4,10}
+ *     Varies from {4,10}->{6,12}; {4,10}->{6,9}; {4,10}->{6,10};
+ *            {4,10}->{3,12}; {4,10}->{3,9}; {4,10}->{3,10};
+ *            {4,10}->{4,12}; {4,10}->{4,9}; {4,10}->{4,10}
  */
-#define TWO_NTESTS 	9
+#define TWO_NTESTS     9
 int two_tests[TWO_NTESTS][2] = { {2,2},  {2,-1},  {2,0},
-			    	  {-1,2}, {-1,-1}, {-1,0},
-			      	  {0,2},  {0,-1},  {0,0} };
+                    {-1,2}, {-1,-1}, {-1,0},
+                        {0,2},  {0,-1},  {0,0} };
 
 
 /* Verify that the two input values are the same */
-#define VERIFY_EQUAL(_x, _y)						\
-{									\
-	long __x = (long)_x, __y = (long)_y;				\
-   	if(__x != __y) TEST_ERROR					\
+#define VERIFY_EQUAL(_x, _y)                        \
+{                                    \
+    long __x = (long)_x, __y = (long)_y;                \
+    if(__x != __y) TEST_ERROR                    \
 }
 
 /* Temporary buffer for reading in the test file */
-#define TMP_BUF_SIZE		2048
+#define TMP_BUF_SIZE        2048
 char  g_tmp_buf[TMP_BUF_SIZE];
 
 /* Macros for verifying compound fields */
 /* Verify all fields */
-#define VERIFY_ELMTS_ALL(ent1, ent2)  {			\
-    VERIFY_EQUAL(ent1.field1, ent2.field1);		\
-    VERIFY_EQUAL(ent1.field2.a, ent2.field2.a);		\
-    VERIFY_EQUAL(ent1.field2.b.a, ent2.field2.b.a);	\
-    VERIFY_EQUAL(ent1.field2.b.b, ent2.field2.b.b);	\
-    VERIFY_EQUAL(ent1.field2.b.c, ent2.field2.b.c);	\
-    VERIFY_EQUAL(ent1.field2.c, ent2.field2.c);		\
-    VERIFY_EQUAL(ent1.field3, ent2.field3);		\
-    VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);		\
+#define VERIFY_ELMTS_ALL(ent1, ent2)  {            \
+    VERIFY_EQUAL(ent1.field1, ent2.field1);        \
+    VERIFY_EQUAL(ent1.field2.a, ent2.field2.a);        \
+    VERIFY_EQUAL(ent1.field2.b.a, ent2.field2.b.a);    \
+    VERIFY_EQUAL(ent1.field2.b.b, ent2.field2.b.b);    \
+    VERIFY_EQUAL(ent1.field2.b.c, ent2.field2.b.c);    \
+    VERIFY_EQUAL(ent1.field2.c, ent2.field2.c);        \
+    VERIFY_EQUAL(ent1.field3, ent2.field3);        \
+    VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);        \
 }
 
 /* Verify fields selected in VALID_FIELDS1 */
-#define VERIFY_ELMTS_VALID1(ent1, ent2)  {		\
-    VERIFY_EQUAL(ent1.field1, ent2.field1);		\
-    VERIFY_EQUAL(ent1.field2_a, ent2.field2.a);		\
-    VERIFY_EQUAL(ent1.field3, ent2.field3);		\
-    VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);		\
-    VERIFY_EQUAL(ent1.field4.b, ent2.field4.b);		\
+#define VERIFY_ELMTS_VALID1(ent1, ent2)  {        \
+    VERIFY_EQUAL(ent1.field1, ent2.field1);        \
+    VERIFY_EQUAL(ent1.field2_a, ent2.field2.a);        \
+    VERIFY_EQUAL(ent1.field3, ent2.field3);        \
+    VERIFY_EQUAL(ent1.field4.a, ent2.field4.a);        \
+    VERIFY_EQUAL(ent1.field4.b, ent2.field4.b);        \
 }
 
 /* Verify fields selected in VALID_FIELDS2 */
-#define VERIFY_ELMTS_VALID2(ent1, ent2)  {		\
-    VERIFY_EQUAL(ent1.field2_b_a, ent2.field2.b.a);	\
-    VERIFY_EQUAL(ent1.field2_c, ent2.field2.c);		\
-    VERIFY_EQUAL(ent1.field4_b, ent2.field4.b);		\
+#define VERIFY_ELMTS_VALID2(ent1, ent2)  {        \
+    VERIFY_EQUAL(ent1.field2_b_a, ent2.field2.b.a);    \
+    VERIFY_EQUAL(ent1.field2_c, ent2.field2.c);        \
+    VERIFY_EQUAL(ent1.field4_b, ent2.field4.b);        \
 }
 
 /* The types of 2-dimensional dataset: DSET_TWO or DSET_CMPD_TWO */
@@ -118,34 +118,34 @@ char  g_tmp_buf[TMP_BUF_SIZE];
 #define TWO_CMPD_VALID1         2       /* DSET_CMPD_TWO with VALID_FIELDS1 or VALID_ESC_FIELDS1 */
 #define TWO_CMPD_VALID2         3       /* DSET_CMPD_TWO with VALID_FIELDS2 or VALID_ESC_FIELDS2 */
 
-#define VERIFY_ELMTS(type, k, ind, _ldbuf, _buf) {			\
-    if(type == TWO_NONE) {						\
-	int *iib = (int *)_ldbuf;					\
-	int *ib = (int *)_buf;						\
-									\
-	VERIFY_EQUAL(iib[k], ib[ind + n])				\
-    } else if(type == TWO_CMPD_NULL) {					\
-	set_t *ccb = (set_t *)_ldbuf;					\
-	set_t *cb = (set_t *)_buf;					\
-									\
-	VERIFY_ELMTS_ALL(ccb[k], cb[ind + n])				\
-    } else if(type == TWO_CMPD_VALID1) {				\
-	test_valid_fields1 *vb1 = (test_valid_fields1 *)_ldbuf;		\
-	set_t *cb = (set_t *)_buf;					\
-									\
-	VERIFY_ELMTS_VALID1(vb1[k], cb[ind + n])			\
-    } else if(type == TWO_CMPD_VALID2) {				\
-	test_valid_fields2 *vb2 = (test_valid_fields2 *)_ldbuf;		\
-	set_t *cb = (set_t *)_buf;					\
-									\
-	VERIFY_ELMTS_VALID2(vb2[k], cb[ind + n])			\
-    }									\
+#define VERIFY_ELMTS(type, k, ind, _ldbuf, _buf) {            \
+    if(type == TWO_NONE) {                        \
+    int *iib = (int *)_ldbuf;                    \
+    int *ib = (int *)_buf;                        \
+                                    \
+    VERIFY_EQUAL(iib[k], ib[ind + n])                \
+    } else if(type == TWO_CMPD_NULL) {                    \
+    set_t *ccb = (set_t *)_ldbuf;                    \
+    set_t *cb = (set_t *)_buf;                    \
+                                    \
+    VERIFY_ELMTS_ALL(ccb[k], cb[ind + n])                \
+    } else if(type == TWO_CMPD_VALID1) {                \
+    test_valid_fields1 *vb1 = (test_valid_fields1 *)_ldbuf;        \
+    set_t *cb = (set_t *)_buf;                    \
+                                    \
+    VERIFY_ELMTS_VALID1(vb1[k], cb[ind + n])            \
+    } else if(type == TWO_CMPD_VALID2) {                \
+    test_valid_fields2 *vb2 = (test_valid_fields2 *)_ldbuf;        \
+    set_t *cb = (set_t *)_buf;                    \
+                                    \
+    VERIFY_ELMTS_VALID2(vb2[k], cb[ind + n])            \
+    }                                    \
 }
 
 /* Tests for test_LD_elmts_pipe() */
-#define ONE_TESTS	3
+#define ONE_TESTS    3
 int  onetests[ONE_TESTS] = {3, 9, 1};
-#define TWO_TESTS	5
+#define TWO_TESTS    5
 int twotests[TWO_TESTS][2] = { {2,2}, {2,-1}, {2,0}, {-1,2}, {0,2}  };
 
 
@@ -185,9 +185,9 @@ typedef struct set_t {
     sub4_t field4;
 } set_t;
 
-/* NOTE: 
- * This will fail on heiwa and amani when VALID_FIELDS1 is "field1,field3,field4" 
- * because of alignment problems: 
+/* NOTE:
+ * This will fail on heiwa and amani when VALID_FIELDS1 is "field1,field3,field4"
+ * because of alignment problems:
  *    amani and heiwa - 8 byte alignment
  *    jam - 4 byte alignemnt
  * This will need to be fixed in the library for H5Tget_native_type().
@@ -211,185 +211,185 @@ typedef struct test_valid_fields2 {
 
 
 /* Temporary buffers for tests: test_LD_elmts_one() & test_LD_elmts_two() */
-#define TEST_BUF_SIZE 		100
-int *iibuf;			/* buffer for storing retrieved elements */
-int *ibuf;			/* buffer for storing retrieved elements (integer) */
-set_t *cbuf;			/* buffer for storing retrieved elemnets (compound) */
-set_t *ccbuf;			/* buffer for storing retrieved elemnets (compound) */
-test_valid_fields1 *vbuf1;	/* buffer for storing retrieved elements (FIELDS1) */
-test_valid_fields2 *vbuf2;	/* buffer for storing retrieved elements (FIELDS2) */
-
-
-/* 
+#define TEST_BUF_SIZE         100
+int *iibuf;            /* buffer for storing retrieved elements */
+int *ibuf;            /* buffer for storing retrieved elements (integer) */
+set_t *cbuf;            /* buffer for storing retrieved elemnets (compound) */
+set_t *ccbuf;            /* buffer for storing retrieved elemnets (compound) */
+test_valid_fields1 *vbuf1;    /* buffer for storing retrieved elements (FIELDS1) */
+test_valid_fields2 *vbuf2;    /* buffer for storing retrieved elements (FIELDS2) */
+
+
+/*
  *********************************************************************************
  *
  * Testing for the High Level public routine: H5LDget_dset_dims()
- * 	1) An invalid dataset id
- *	2) "DSET_ALLOC_EARLY": NULL cur_dims
- *	3) "DSET_ALLOC_LATE": nonNULL cur_dims
- *	4) "DSET_CMPD_TWO": nonNULL cur_dims
- *	5) "DSET_NULL": nonNULL cur_dims
- *	6) "DSET_SCALAR": nonNULL cur_dims
+ *     1) An invalid dataset id
+ *    2) "DSET_ALLOC_EARLY": NULL cur_dims
+ *    3) "DSET_ALLOC_LATE": nonNULL cur_dims
+ *    4) "DSET_CMPD_TWO": nonNULL cur_dims
+ *    5) "DSET_NULL": nonNULL cur_dims
+ *    6) "DSET_SCALAR": nonNULL cur_dims
  *
  *********************************************************************************
  */
 static herr_t
 test_LD_dims_params(const char *file)
 {
-    hid_t fid=-1;		/* file identifier */
-    hid_t did=-1;		/* dataset identifier */
-    hsize_t one_cur_dims[1];	/* current dimension sizes for 1-dimensonal dataset */
-    hsize_t two_cur_dims[2];	/* current dimension sizes for 2-dimensional dataset */
+    hid_t fid=-1;        /* file identifier */
+    hid_t did=-1;        /* dataset identifier */
+    hsize_t one_cur_dims[1];    /* current dimension sizes for 1-dimensonal dataset */
+    hsize_t two_cur_dims[2];    /* current dimension sizes for 2-dimensional dataset */
     hid_t invalid_id = -1;
-    herr_t ret;			/* return value */
+    herr_t ret;            /* return value */
 
     const char *filename = H5_get_srcdir_filename(file);
 
-    TESTING("H5LDget_dset_dims");
+    HL_TESTING2("H5LDget_dset_dims");
 
     /* Open the copied file */
     if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * 1. Verify failure with negative dataset id
      */
     H5E_BEGIN_TRY {
-	ret = H5LDget_dset_dims(invalid_id, one_cur_dims);
+    ret = H5LDget_dset_dims(invalid_id, one_cur_dims);
     } H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
 
-    /* 
+    /*
      * 2. Verify failure for NULL cur_dims
      */
     if((did = H5Dopen2(fid, DSET_ALLOC_EARLY, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     H5E_BEGIN_TRY {
-	ret = H5LDget_dset_dims(did, NULL);
+    ret = H5LDget_dset_dims(did, NULL);
     } H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * 3. Verify for nonNULL cur_dims
      */
     if((did = H5Dopen2(fid, DSET_ALLOC_LATE, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     VERIFY_EQUAL(one_cur_dims[0], 10)
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * 4. Verify nonNULL cur_dims for a 2-dimensional dataset
      */
     if((did = H5Dopen2(fid, DSET_CMPD_TWO, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5LDget_dset_dims(did, two_cur_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     VERIFY_EQUAL(two_cur_dims[0], TWO_DIM_1)
     VERIFY_EQUAL(two_cur_dims[1], TWO_DIM_2)
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * 5. Verify nonNULL cur_dims for dataset with H5S_NULL dataspace
      */
     one_cur_dims[0] = 0;
 
     if((did = H5Dopen2(fid, DSET_NULL, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     VERIFY_EQUAL(one_cur_dims[0], 0)
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * 6. Verify nonNULL cur_dims for dataset with H5S_SCALAR dataspace
      */
     one_cur_dims[0] = 0;
 
     if((did = H5Dopen2(fid, DSET_SCALAR, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     VERIFY_EQUAL(one_cur_dims[0], 0)
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Close the file */
     if(H5Fclose(fid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
     H5E_BEGIN_TRY {
-	H5Dclose(did);
-	H5Fclose(fid);
+    H5Dclose(did);
+    H5Fclose(fid);
     } H5E_END_TRY;
 
     return(-1);
 } /* test_LD_dims_params() */
 
-
-/* 
+
+/*
  *********************************************************************************
  *
  * Testing for the High Level public routine: H5LDget_dset_dims()
  * Verify that the dimension sizes retrieved via H5LDget_dset_dims() are correct
  * for the following cases:
  *
- *	DSET_ONE: one-dimensional dataset
- *	  1. Increase dims[0]
- *	  2. Decrease dims[0]
- *	  3. same dims[0]
- *	  4. Decrease dims[0]
- *	  5. Increase dims[0]
+ *    DSET_ONE: one-dimensional dataset
+ *      1. Increase dims[0]
+ *      2. Decrease dims[0]
+ *      3. same dims[0]
+ *      4. Decrease dims[0]
+ *      5. Increase dims[0]
  *
- *		one_tests[ONE_NTESTS] = {3, -1, 0, -9, 1}
- *		Varies from 10->3; 10->9, 10->10, 10->1, 10->11
+ *        one_tests[ONE_NTESTS] = {3, -1, 0, -9, 1}
+ *        Varies from 10->3; 10->9, 10->10, 10->1, 10->11
  *
- *	DSET_TWO: two-dimensional dataset
- *	  1. Increase dims[0], increase dims[1]
- *	  2. Increase dims[0], decrease dims[1]
- *	  3. Increase dims[0], same dims[1]
- *	  4. Decrease dims[0], increase dims[1]
- *	  5. Decrease dims[0], decrease dims[1]
- *	  6. Decrease dims[0], same dims[1]
- *	  7. same dims[0], increase dims[1]
- *	  8. same dims[0], decrease dims[1]
- *	  9. same dims[0], same dims[1]
+ *    DSET_TWO: two-dimensional dataset
+ *      1. Increase dims[0], increase dims[1]
+ *      2. Increase dims[0], decrease dims[1]
+ *      3. Increase dims[0], same dims[1]
+ *      4. Decrease dims[0], increase dims[1]
+ *      5. Decrease dims[0], decrease dims[1]
+ *      6. Decrease dims[0], same dims[1]
+ *      7. same dims[0], increase dims[1]
+ *      8. same dims[0], decrease dims[1]
+ *      9. same dims[0], same dims[1]
  *
- *		two_tests[TWO_NTESTS][2] = { {2,2},  {2,-1},  {2,0},
- *					     {-1,2}, {-1,-1}, {-1,0},
- * 					     {0,2},  {0,-1},  {0,0} }
- *		Varies from {4,10}->{6,12}; {4,10}->{6,9}; {4,10}->{6,10};
- *                  	    {4,10}->{3,12}; {4,10}->{3,9}; {4,10}->{3,10};
- *                  	    {4,10}->{4,12}; {4,10}->{4,9}; {4,10}->{4,10}
+ *        two_tests[TWO_NTESTS][2] = { {2,2},  {2,-1},  {2,0},
+ *                         {-1,2}, {-1,-1}, {-1,0},
+ *                          {0,2},  {0,-1},  {0,0} }
+ *        Varies from {4,10}->{6,12}; {4,10}->{6,9}; {4,10}->{6,10};
+ *                          {4,10}->{3,12}; {4,10}->{3,9}; {4,10}->{3,10};
+ *                          {4,10}->{4,12}; {4,10}->{4,9}; {4,10}->{4,10}
  *
  *********************************************************************************
  */
 static herr_t
 test_LD_dims(const char *file)
 {
-    hid_t fid=-1;		/* file identifier */
-    hid_t did=-1;		/* dataset identifier */
-    hsize_t one_prev_dims[1];	/* original dimension sizes for 1-dimensonal dataset */
-    hsize_t one_cur_dims[1];	/* current dimension sizes for 1-dimensonal dataset */
-    hsize_t one_ext_dims[1];	/* extended dimension sizes for 1-dimensonal dataset */
-    hsize_t two_prev_dims[2];	/* original dimension sizes for 2-dimensional dataset */
-    hsize_t two_cur_dims[2];	/* current dimension sizes for 2-dimensional dataset */
-    hsize_t two_ext_dims[2];	/* extended dimension sizes for 2-dimensional dataset*/
-    int i;			/* local index variable */
-
-    TESTING("H5LDget_dset_dims with H5Dset_extent");
+    hid_t fid=-1;        /* file identifier */
+    hid_t did=-1;        /* dataset identifier */
+    hsize_t one_prev_dims[1];    /* original dimension sizes for 1-dimensonal dataset */
+    hsize_t one_cur_dims[1];    /* current dimension sizes for 1-dimensonal dataset */
+    hsize_t one_ext_dims[1];    /* extended dimension sizes for 1-dimensonal dataset */
+    hsize_t two_prev_dims[2];    /* original dimension sizes for 2-dimensional dataset */
+    hsize_t two_cur_dims[2];    /* current dimension sizes for 2-dimensional dataset */
+    hsize_t two_ext_dims[2];    /* extended dimension sizes for 2-dimensional dataset*/
+    int i;            /* local index variable */
+
+    HL_TESTING2("H5LDget_dset_dims with H5Dset_extent");
 
     /* Make a copy of the test file */
     if(h5_make_local_copy(file, COPY_FILENAME) < 0)
@@ -397,75 +397,75 @@ test_LD_dims(const char *file)
 
     /* Open the copied file */
     if((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * Testing with one-dimensional dataset: DSET_ONE
      */
     if((did = H5Dopen2(fid, DSET_ONE, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Retrieve dimension sizes */
     if(H5LDget_dset_dims(did, one_prev_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     for(i = 0; i < ONE_NTESTS; i++) {
 
-	/* Set up the extended dimension sizes */
-	one_ext_dims[0] = (hsize_t)((int)one_prev_dims[0] + one_tests[i]);
+    /* Set up the extended dimension sizes */
+    one_ext_dims[0] = (hsize_t)((int)one_prev_dims[0] + one_tests[i]);
 
-	/* Change the dimension size */
-	if(H5Dset_extent(did, one_ext_dims) < 0)
-	    FAIL_STACK_ERROR
+    /* Change the dimension size */
+    if(H5Dset_extent(did, one_ext_dims) < 0)
+        FAIL_STACK_ERROR
 
-	/* Retrieve the dimension size */
-	if(H5LDget_dset_dims(did, one_cur_dims) < 0)
-	    FAIL_STACK_ERROR
+    /* Retrieve the dimension size */
+    if(H5LDget_dset_dims(did, one_cur_dims) < 0)
+        FAIL_STACK_ERROR
 
-	/* Verify that the retrieved dimension size is correct as expected */
-	VERIFY_EQUAL(one_cur_dims[0], one_ext_dims[0])
+    /* Verify that the retrieved dimension size is correct as expected */
+    VERIFY_EQUAL(one_cur_dims[0], one_ext_dims[0])
     }
 
     /* Close the dataset */
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * Testing with two-dimensional dataset: DSET_TWO
      */
     if((did = H5Dopen2(fid, DSET_TWO, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Retrieve the dimension sizes */
     if(H5LDget_dset_dims(did, two_prev_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     for(i = 0; i < TWO_NTESTS; i++) {
 
-	/* Set up the extended dimension sizes */
-	two_ext_dims[0] = (hsize_t)((int)two_prev_dims[0] + two_tests[i][0]);
-	two_ext_dims[1] = (hsize_t) ((int)two_prev_dims[1] + two_tests[i][1]);
+    /* Set up the extended dimension sizes */
+    two_ext_dims[0] = (hsize_t)((int)two_prev_dims[0] + two_tests[i][0]);
+    two_ext_dims[1] = (hsize_t) ((int)two_prev_dims[1] + two_tests[i][1]);
 
-	/* Change the dimension sizes */
-	if(H5Dset_extent(did, two_ext_dims) < 0)
-	    FAIL_STACK_ERROR
+    /* Change the dimension sizes */
+    if(H5Dset_extent(did, two_ext_dims) < 0)
+        FAIL_STACK_ERROR
 
-	/* Retrieve the dimension sizes */
-	if(H5LDget_dset_dims(did, two_cur_dims) < 0)
-	    FAIL_STACK_ERROR
+    /* Retrieve the dimension sizes */
+    if(H5LDget_dset_dims(did, two_cur_dims) < 0)
+        FAIL_STACK_ERROR
 
-	/* Verify that the retrieved dimension sizes are correct as expected */
-	VERIFY_EQUAL(two_cur_dims[0], two_ext_dims[0])
-	VERIFY_EQUAL(two_cur_dims[1], two_ext_dims[1])
+    /* Verify that the retrieved dimension sizes are correct as expected */
+    VERIFY_EQUAL(two_cur_dims[0], two_ext_dims[0])
+    VERIFY_EQUAL(two_cur_dims[1], two_ext_dims[1])
     } /* end TWO_NTESTS */
 
     /* Close the dataset */
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Close the file */
     if(H5Fclose(fid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Remove the copied file */
     HDremove(COPY_FILENAME);
@@ -475,172 +475,172 @@ test_LD_dims(const char *file)
 
 error:
     H5E_BEGIN_TRY {
-	H5Dclose(did);
-	H5Fclose(fid);
+    H5Dclose(did);
+    H5Fclose(fid);
     } H5E_END_TRY;
     return(-1);
 
 } /* test_LD_dims() */
 
-
-/* 
+
+/*
  **********************************************************************************
  *
  * Testing for the High Level public routine: H5LDget_dset_type_size()
  * Verify that the data type size returned via H5LDget_dset_type_size()
  * are correct for the following cases:
  *
- *	Verify failure for an invalid dataset id
+ *    Verify failure for an invalid dataset id
  *
- *	DSET_CMPD: one-dimensional dataset with compound type
- *	  1. The whole element 
- *	  2. VALID_FIELDS1: "field1,field2.a,field3,field4"
- *	  3. VALID_FIELDS2: "field2.b.a,field2.c,field4.b"
- *	  4. INVALID_FIELDS1: "field2.k.a,field2.c,field4.k"
- *	  5. INVALID_FIELDS2: "field2.b.a,field2.c,field4.b."
- *	  6. INVALID_FIELDS3: "field2.b.a,,field2.c,field4.b"
+ *    DSET_CMPD: one-dimensional dataset with compound type
+ *      1. The whole element
+ *      2. VALID_FIELDS1: "field1,field2.a,field3,field4"
+ *      3. VALID_FIELDS2: "field2.b.a,field2.c,field4.b"
+ *      4. INVALID_FIELDS1: "field2.k.a,field2.c,field4.k"
+ *      5. INVALID_FIELDS2: "field2.b.a,field2.c,field4.b."
+ *      6. INVALID_FIELDS3: "field2.b.a,,field2.c,field4.b"
  *
- *	DSET_CMPD_ESC: one-dimensional dataset with compound type and
- *		       member names with escape/separator characters
- *	  1. The whole element
- * 	  2. VALID_ESC_FIELDS1: "field\\,1,field2\\..\\.a,field\\\\3,field4\\,"
- *	  3. VALID_ESC_FIELDS2: "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\,"
- *	  4. INVALID_ESC_FIELDS1: "field2\\..\\,k.a,field2\\..\\\\c,field4\\,.k\\,"
- *	  5. INVALID_ESC_FIELDS2: "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\,."
- * 	  6. INVALID_ESC_FIELDS3: "field2\\..\\,,b.a,field2\\..\\\\c,field4\\,.b\\,"
+ *    DSET_CMPD_ESC: one-dimensional dataset with compound type and
+ *               member names with escape/separator characters
+ *      1. The whole element
+ *       2. VALID_ESC_FIELDS1: "field\\,1,field2\\..\\.a,field\\\\3,field4\\,"
+ *      3. VALID_ESC_FIELDS2: "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\,"
+ *      4. INVALID_ESC_FIELDS1: "field2\\..\\,k.a,field2\\..\\\\c,field4\\,.k\\,"
+ *      5. INVALID_ESC_FIELDS2: "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\,."
+ *       6. INVALID_ESC_FIELDS3: "field2\\..\\,,b.a,field2\\..\\\\c,field4\\,.b\\,"
  *
  **********************************************************************************
  */
 static int
 test_LD_size(const char *file)
 {
-    hid_t fid=-1;	/* file identifier */
-    hid_t did=-1;	/* dataset identifier */
-    hid_t dtid=-1;	/* dataset's datatype identifier */
+    hid_t fid=-1;    /* file identifier */
+    hid_t did=-1;    /* dataset identifier */
+    hid_t dtid=-1;    /* dataset's datatype identifier */
     hid_t invalid_id=-1;
-    hid_t memb0_tid=-1;	/* type identifier for a member in the compound type */
-    hid_t memb1_tid=-1;	/* type identifier for a member in the compound type */
-    hid_t memb2_tid=-1;	/* type identifier for a member in the compound type */
-    hid_t memb3_tid=-1;	/* type identifier for a member in the compound type */
-    hid_t memb_tid=-1;	/* type identifier for a member in the compound type */
-    hid_t memb_tid2=-1;	/* type identifier for a member in the compound type */
-    size_t dsize;	/* size of the dataset's datatype */
-    size_t ck_dsize;	/* size of the dataset's datatype to be checked against */
+    hid_t memb0_tid=-1;    /* type identifier for a member in the compound type */
+    hid_t memb1_tid=-1;    /* type identifier for a member in the compound type */
+    hid_t memb2_tid=-1;    /* type identifier for a member in the compound type */
+    hid_t memb3_tid=-1;    /* type identifier for a member in the compound type */
+    hid_t memb_tid=-1;    /* type identifier for a member in the compound type */
+    hid_t memb_tid2=-1;    /* type identifier for a member in the compound type */
+    size_t dsize;    /* size of the dataset's datatype */
+    size_t ck_dsize;    /* size of the dataset's datatype to be checked against */
 
     const char *filename = H5_get_srcdir_filename(file);
 
-    TESTING("H5LDget_dset_type_size");
+    HL_TESTING2("H5LDget_dset_type_size");
 
     /* Open the file */
     if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * Verify failure with an invalid dataset id
      */
     H5E_BEGIN_TRY {
-	dsize = H5LDget_dset_type_size(invalid_id, NULL);
+    dsize = H5LDget_dset_type_size(invalid_id, NULL);
     } H5E_END_TRY;
     VERIFY_EQUAL(dsize, 0)
 
-    /* 
+    /*
      * Testing one-dimensional dataset with compound datatype:
-     *		DSET_CMPD
+     *        DSET_CMPD
      */
 
     /* Open dataset DSET_CMPD */
     if((did = H5Dopen2(fid, DSET_CMPD, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Return size of the whole element */
     if((dsize = H5LDget_dset_type_size(did, NULL)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the dataset's datatype and then its datatype size */
     if((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     if((ck_dsize = H5Tget_size(dtid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Verify case #1 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /* Get datatype id for each member */
     if((memb0_tid = H5Tget_member_type(dtid, 0)) < 0) /* "field1" */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb1_tid = H5Tget_member_type(dtid, 1)) < 0) /* "field2" */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb2_tid = H5Tget_member_type(dtid, 2)) < 0) /* "field3" */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb3_tid = H5Tget_member_type(dtid, 3)) < 0) /* "field4" */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Obtain size for VALID_FIELDS1: "field1,field2.a,field3,field4" */
     if((dsize = H5LDget_dset_type_size(did, VALID_FIELDS1)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the datatype size for "field1" */
     if((ck_dsize = H5Tget_size(memb0_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2.a" */
     if((memb_tid = H5Tget_member_type(memb1_tid, 0)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field3" */
     if((ck_dsize += H5Tget_size(memb2_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4" */
     if((ck_dsize += H5Tget_size(memb3_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Verify case #2 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /* Obtain datatype size for VALID_FIELDS2: "field2.b.a,field2.c,field4.b" */
     if((dsize = H5LDget_dset_type_size(did, VALID_FIELDS2)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the datatype size for "field2.b.a" */
     if((memb_tid = H5Tget_member_type(memb1_tid, 1)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb_tid2 = H5Tget_member_type(memb_tid, 0)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize = H5Tget_size(memb_tid2)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid2) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2.c" */
     if((memb_tid = H5Tget_member_type(memb1_tid, 2)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4.b" */
     if((memb_tid = H5Tget_member_type(memb3_tid, 1)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Verify case #3 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /*
-     * Verify failure for the following invalid nested fields: 
-     *	INVALID_FIELDS1: "field2.k.a,field2.c,field4.k"
+     * Verify failure for the following invalid nested fields:
+     *    INVALID_FIELDS1: "field2.k.a,field2.c,field4.k"
      *  INVALID_FIELDS2: "field2.b.a,field2.c,field4.b."
      *  INVALID_FIELDS3: "field2.b.a,,field2.c,field4.b"
      */
@@ -655,119 +655,119 @@ test_LD_size(const char *file)
     /* Verify failure for case #6 */
     dsize = H5LDget_dset_type_size(did, INVALID_FIELDS3);
     VERIFY_EQUAL(dsize, 0)
-    
+
     /* Closing */
     if(H5Tclose(memb0_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb1_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb2_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb3_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(dtid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * Testing one-dimensional dataset with compound datatype and
-     *	 member names consisting of escape/separator characters:
-     *		DSET_CMPD_ESC
+     *     member names consisting of escape/separator characters:
+     *        DSET_CMPD_ESC
      */
 
     /* Open dataset DSET_CMPD_ESC */
     if((did = H5Dopen2(fid, DSET_CMPD_ESC, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Return size of the whole element */
     if((dsize = H5LDget_dset_type_size(did, NULL)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the dataset's datatype and then its datatype size */
     if((dtid = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
         FAIL_STACK_ERROR
     if((ck_dsize = H5Tget_size(dtid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Verify case #1 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /* Get datatype id for each member */
     if((memb0_tid = H5Tget_member_type(dtid, 0)) < 0) /* "field,1" */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb1_tid = H5Tget_member_type(dtid, 1)) < 0) /* "field2." */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb2_tid = H5Tget_member_type(dtid, 2)) < 0) /* "field\3" */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb3_tid = H5Tget_member_type(dtid, 3)) < 0) /* "field4," */
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Obtain size for VALID_ESC_FIELDS1: "field\\,1,field2\\..\\.a,field\\\\3,field4\\," */
     if((dsize = H5LDget_dset_type_size(did, VALID_ESC_FIELDS1)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the datatype size for "field\\,1" */
     if((ck_dsize = H5Tget_size(memb0_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2\\..\\.a" */
     if((memb_tid = H5Tget_member_type(memb1_tid, 0)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field\\\\3" */
     if((ck_dsize += H5Tget_size(memb2_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4\\," */
     if((ck_dsize += H5Tget_size(memb3_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Verify case #2 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
-    /* Obtain datatype size for VALID_ESC_FIELDS2: 
-	    "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\," */
+    /* Obtain datatype size for VALID_ESC_FIELDS2:
+        "field2\\..\\,b.a,field2\\..\\\\c,field4\\,.b\\," */
     if((dsize = H5LDget_dset_type_size(did, VALID_ESC_FIELDS2)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the datatype size for "field2\..,b.a" */
     if((memb_tid = H5Tget_member_type(memb1_tid, 1)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((memb_tid2 = H5Tget_member_type(memb_tid, 0)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize = H5Tget_size(memb_tid2)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid2) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field2\..\\c" */
     if((memb_tid = H5Tget_member_type(memb1_tid, 2)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Add the datatype size for "field4\,.b\," */
     if((memb_tid = H5Tget_member_type(memb3_tid, 1)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if((ck_dsize += H5Tget_size(memb_tid)) == 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Verify case #3 */
     VERIFY_EQUAL(dsize, ck_dsize)
 
     /*
-     * Verify failure for the following invalid nested fields: 
+     * Verify failure for the following invalid nested fields:
      *   INVALID_ESC_FIELDS1: "field2\..\,k.a,field2\..\\c,field4\,.k\,"
      *   INVALID_ESC_FIELDS2: "field2\..\,b.a,field2\..\\c,field4\,.b\,."
      *   INVALID_ESC_FIELDS3: "field2\..\,,b.a,field2\..\\c,field4\,.b\,"
@@ -786,90 +786,90 @@ test_LD_size(const char *file)
 
     /* Closing */
     if(H5Tclose(memb0_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb1_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb2_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(memb3_tid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Tclose(dtid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     if(H5Fclose(fid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(memb0_tid);
-	H5Tclose(memb1_tid);
-	H5Tclose(memb2_tid);
-	H5Tclose(memb3_tid);
-	H5Tclose(memb_tid);
-	H5Tclose(memb_tid2);
-	H5Tclose(dtid);
-	H5Dclose(did);
-	H5Fclose(fid);
+    H5Tclose(memb0_tid);
+    H5Tclose(memb1_tid);
+    H5Tclose(memb2_tid);
+    H5Tclose(memb3_tid);
+    H5Tclose(memb_tid);
+    H5Tclose(memb_tid2);
+    H5Tclose(dtid);
+    H5Dclose(did);
+    H5Fclose(fid);
     } H5E_END_TRY;
     return(-1);
 
 } /* test_LD_size() */
 
-
-/* 
+
+/*
  **************************************************************************************
  * Testing for the High Level public routine: H5LDget_dset_elmts()
- * 	Verify failures when calling H5LDget_dset_elmts() with the following
- *   	invalid conditions: 
+ *     Verify failures when calling H5LDget_dset_elmts() with the following
+ *       invalid conditions:
  *
- *	A. DSET_TWO: two-dimensional dataset
- *		1. CUR_DIMS and PREV_DIMS are NULL
- *		2. PREV_DIMS is NULL
- *		3. CUR_DIMS is NULL
- *		4. FIELDS is nonnull but the dataset is not compound datatype
- *		5. BUF is NULL
- *		6. CUR_DIMS is not greater than PREV_DIMS
+ *    A. DSET_TWO: two-dimensional dataset
+ *        1. CUR_DIMS and PREV_DIMS are NULL
+ *        2. PREV_DIMS is NULL
+ *        3. CUR_DIMS is NULL
+ *        4. FIELDS is nonnull but the dataset is not compound datatype
+ *        5. BUF is NULL
+ *        6. CUR_DIMS is not greater than PREV_DIMS
  *
- *	B. DSET_CMPD: one-dimensional dataset with compound type
- *		1. Invalid dataset id
- *		2. FIELDS are not valid members in the compound type
+ *    B. DSET_CMPD: one-dimensional dataset with compound type
+ *        1. Invalid dataset id
+ *        2. FIELDS are not valid members in the compound type
  *
  **************************************************************************************
  */
 static int
 test_LD_elmts_invalid(const char *file)
 {
-    hid_t fid=-1;		/* file identifier */
-    hid_t did=-1;		/* dataset identifier */
-    hid_t sid=-1;		/* dataspace identifier */
+    hid_t fid=-1;        /* file identifier */
+    hid_t did=-1;        /* dataset identifier */
+    hid_t sid=-1;        /* dataspace identifier */
     hid_t invalid_id=-1;
-    int ret;			/* return value */
-    hsize_t cur_dims[2];	/* current dimension sizes of the dataset */
-    hsize_t prev_dims[2];	/* previous dimension sizes of the dataset */
-    char tbuf[2];	/* temporary buffer for testing */
-    int ndims;		/* # of dimension sizes */
-    int i;		/* local index variable */
+    int ret;            /* return value */
+    hsize_t cur_dims[2];    /* current dimension sizes of the dataset */
+    hsize_t prev_dims[2];    /* previous dimension sizes of the dataset */
+    char tbuf[2];    /* temporary buffer for testing */
+    int ndims;        /* # of dimension sizes */
+    int i;        /* local index variable */
 
     const char *filename = H5_get_srcdir_filename(file);
 
-    TESTING("H5LDget_dset_elmts on invalid conditions");
+    HL_TESTING2("H5LDget_dset_elmts on invalid conditions");
 
     /* Open the copied file */
     if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * Testing two-dimensional dataset: DSET_TWO
      */
 
     /* Open dataset: DSET_TWO */
     if((did = H5Dopen2(fid, DSET_TWO, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Verify failure from case #1: cur_dims and prev_dims are NULL */
     ret = H5LDget_dset_elmts(did, NULL, NULL, NULL, NULL);
@@ -884,15 +884,15 @@ test_LD_elmts_invalid(const char *file)
     VERIFY_EQUAL(ret, FAIL)
 
     if((sid = H5Dget_space(did)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the # of dimensions and current dimension sizes */
     if((ndims = H5Sget_simple_extent_dims(sid, cur_dims, NULL)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Set up valid cur_dims and prev_dims */
     for(i = 0; i < ndims; i++)
-	prev_dims[i] = cur_dims[i] - 1;
+    prev_dims[i] = cur_dims[i] - 1;
 
     /* Verify failure from case #4: FIELDS is nonNULL but the dataset is not compound datatype */
     ret = H5LDget_dset_elmts(did, prev_dims, cur_dims, "field1", tbuf);
@@ -910,26 +910,26 @@ test_LD_elmts_invalid(const char *file)
 
     /* Close DSET_TWO */
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
-    /* 
+    /*
      * Testing one-dimensional dataset with compound datatype:
-     *		DSET_CMPD
+     *        DSET_CMPD
      */
 
     /* Verify failure from case #1: an invalid dataset id */
     H5E_BEGIN_TRY {
-	ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf);
+    ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf);
     } H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
 
     /* Open dataset: DSET_CMPD */
     if((did = H5Dopen2(fid, DSET_CMPD, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Retrieve the current dimension sizes */
     if(H5LDget_dset_dims(did, cur_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Set up valid cur_dims, prev_dims */
     prev_dims[0] = cur_dims[0] - 1;
@@ -940,118 +940,118 @@ test_LD_elmts_invalid(const char *file)
 
     /* Close DSET_CMPD */
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Close the file */
     if(H5Fclose(fid) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
     H5E_BEGIN_TRY {
-	H5Sclose(sid);
-	H5Dclose(did);
-	H5Fclose(fid);
+    H5Sclose(sid);
+    H5Dclose(did);
+    H5Fclose(fid);
     } H5E_END_TRY;
     return(-1);
 
 } /* test_LD_elmts_invalid() */
 
-
-/* 
+
+/*
  **************************************************************************************
  * Testing for the High Level public routine: H5LDget_dset_elmts()
- * 	Verify elements retrieved via H5LDget_dset_elmts() are correct as expected
- *	when the dataset's dimension sizes are changed according to one_tests[]:
+ *     Verify elements retrieved via H5LDget_dset_elmts() are correct as expected
+ *    when the dataset's dimension sizes are changed according to one_tests[]:
  *
- *	one-dimensional dataset : 
- *		DSET_ONE with NULL fields
- *		DSET_CMPD with fields: NULL, VALID_FIELDS1, VALID_FIELDS2
- *		DSET_CMPD_ESC with fields: NULL, VALID_ESC_FIELDS1, VALID_ESC_FIELDS2
- *	
- *		case #1. increase dims[0]
- *        	case #2. decrease dims[0]	(failure)
- *        	case #3. same dims[0]		(failure)
- *        	case #4. decrease dims[0]	(failure)
- *        	case #5. increase dims[0]
+ *    one-dimensional dataset :
+ *        DSET_ONE with NULL fields
+ *        DSET_CMPD with fields: NULL, VALID_FIELDS1, VALID_FIELDS2
+ *        DSET_CMPD_ESC with fields: NULL, VALID_ESC_FIELDS1, VALID_ESC_FIELDS2
+ *
+ *        case #1. increase dims[0]
+ *            case #2. decrease dims[0]    (failure)
+ *            case #3. same dims[0]        (failure)
+ *            case #4. decrease dims[0]    (failure)
+ *            case #5. increase dims[0]
  *
  **************************************************************************************
  */
 static herr_t
 test_LD_elmts_one(const char *file, const char *dname, const char *fields)
 {
-    hid_t fid=-1;		/* file identifier */
-    hid_t did=-1;		/* dataset identifier */
-    hid_t dtype=-1;		/* dataset's data type */
-    hsize_t ext_dims[1];	/* extended dimension sizes of the dataset */
-    hsize_t prev_dims[1];	/* previous dimension sizes of the dataset */
-    int i, j;			/* local index variable */
-    int ret = 0;		/* return value */
+    hid_t fid=-1;        /* file identifier */
+    hid_t did=-1;        /* dataset identifier */
+    hid_t dtype=-1;        /* dataset's data type */
+    hsize_t ext_dims[1];    /* extended dimension sizes of the dataset */
+    hsize_t prev_dims[1];    /* previous dimension sizes of the dataset */
+    int i, j;            /* local index variable */
+    int ret = 0;        /* return value */
 
-    TESTING("H5LDget_dset_elmts: one-dimensional dataset");
+    HL_TESTING2("H5LDget_dset_elmts: one-dimensional dataset");
 
     /* Copy the test file */
     if(h5_make_local_copy(file, COPY_FILENAME) < 0)
         TEST_ERROR
 
     for(i = 0; i < TEST_BUF_SIZE; i++) {
-	cbuf[i].field1 = i;
-	cbuf[i].field2.a = i;
-	cbuf[i].field2.b.a = i;
-	cbuf[i].field2.b.b = i;
-	cbuf[i].field2.b.c = i;
-	cbuf[i].field2.c = i;
-	cbuf[i].field3 = (double)i;
-	cbuf[i].field4.a = i;
-	cbuf[i].field4.b = i;
-	ibuf[i] = i;
+    cbuf[i].field1 = i;
+    cbuf[i].field2.a = i;
+    cbuf[i].field2.b.a = i;
+    cbuf[i].field2.b.b = i;
+    cbuf[i].field2.b.c = i;
+    cbuf[i].field2.c = i;
+    cbuf[i].field3 = (double)i;
+    cbuf[i].field4.a = i;
+    cbuf[i].field4.b = i;
+    ibuf[i] = i;
     } /* end for */
 
     /* Open the copied file */
     if((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Open the dataset */
     if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the dataset's data type */
     if((dtype = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get current dimension sizes before extending the dataset's dimension sizes */
     if(H5LDget_dset_dims(did, prev_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Loop through different variations of extending the dataset */
     for(i = 0; i < ONE_NTESTS; i++) {
-	HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
-	HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
-	HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-	HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
-
-	ext_dims[0] = (hsize_t)((int)prev_dims[0] + one_tests[i]);
-
-	/* Change the dimension sizes of the dataset */
-	if(H5Dset_extent(did, ext_dims) < 0)
-	    FAIL_STACK_ERROR
-
-	/* Initialize data */
-	if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
-	    if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
-		FAIL_STACK_ERROR
-	} /* end if */
+    HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
+    HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
+    HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
+    HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
+
+    ext_dims[0] = (hsize_t)((int)prev_dims[0] + one_tests[i]);
+
+    /* Change the dimension sizes of the dataset */
+    if(H5Dset_extent(did, ext_dims) < 0)
+        FAIL_STACK_ERROR
+
+    /* Initialize data */
+    if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
+        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
+        FAIL_STACK_ERROR
+    } /* end if */
         else if(!HDstrcmp(dname, DSET_ONE)) {
-	    if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
-		FAIL_STACK_ERROR
-	} /* end if */
-
-	/* There are changes in dimension sizes */
-	if(one_tests[i] > 0) {
-	    if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
-		if(fields) {
+        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
+        FAIL_STACK_ERROR
+    } /* end if */
+
+    /* There are changes in dimension sizes */
+    if(one_tests[i] > 0) {
+        if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
+        if(fields) {
                     if(!HDstrcmp(fields, VALID_FIELDS1) || !HDstrcmp(fields, VALID_ESC_FIELDS1)) {
                         /* Retrieve the elmemts in BUF */
                         if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf1) < 0)
@@ -1067,24 +1067,24 @@ test_LD_elmts_one(const char *file, const char *dname, const char *fields)
                             VERIFY_ELMTS_VALID2(vbuf2[j], cbuf[prev_dims[0] + (hsize_t)j])
                     } /* end else-if */
                     else
-			TEST_ERROR
-		} /* end if */
+            TEST_ERROR
+        } /* end if */
                 else {
-		    /* Retrieve the elmemts in BUF */
-		    if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
-			TEST_ERROR
-		    for(j = 0; j < one_tests[i]; j++)
-			VERIFY_ELMTS_ALL(ccbuf[j], cbuf[prev_dims[0] + (hsize_t)j])
-		} /* end else-if */
-	    } /* end if */
+            /* Retrieve the elmemts in BUF */
+            if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
+            TEST_ERROR
+            for(j = 0; j < one_tests[i]; j++)
+            VERIFY_ELMTS_ALL(ccbuf[j], cbuf[prev_dims[0] + (hsize_t)j])
+        } /* end else-if */
+        } /* end if */
             else {
-		/* Retrieve the elmemts in BUF */
-		if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
-		    TEST_ERROR
-		for(j = 0; j < one_tests[i]; j++)
-		    VERIFY_EQUAL(iibuf[j], ibuf[prev_dims[0] + (hsize_t)j])
-	    } /* end else */
-	} /* end if */
+        /* Retrieve the elmemts in BUF */
+        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
+            TEST_ERROR
+        for(j = 0; j < one_tests[i]; j++)
+            VERIFY_EQUAL(iibuf[j], ibuf[prev_dims[0] + (hsize_t)j])
+        } /* end else */
+    } /* end if */
         else {
             /* Verify failure when changes between prev_dims and ext_dims are same/decrease */
             ret = H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf);
@@ -1108,56 +1108,56 @@ test_LD_elmts_one(const char *file, const char *dname, const char *fields)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(dtype);
-	H5Dclose(did);
-	H5Fclose(fid);
+    H5Tclose(dtype);
+    H5Dclose(did);
+    H5Fclose(fid);
     } H5E_END_TRY;
     return(-1);
 } /* test_LD_elmts_one() */
 
-
+
 /*
  **************************************************************************************
  *
- * Helper routine to verify elements of a 2-dimensional dataset 
- *	_ldbuf contains the elements retrieved via H5LDget_dset_elmts()
- *	_buf contains the data written to the dataset
+ * Helper routine to verify elements of a 2-dimensional dataset
+ *    _ldbuf contains the elements retrieved via H5LDget_dset_elmts()
+ *    _buf contains the data written to the dataset
  *
- *	e.g. prev_dims[2] = {4, 6}; ext_dims[2] = {6, 10}
- *	     elements marked in 'v' in _buf are compared to elements in _ldbuf
- *		0 1 2 3 4 5 | 6 7 8 9
- *             0	    | v v v v
- *	       1	    | v v v v
- *	       2	    | v v v v
- *	       3	    | v v v v
- *	        ---------------------
- *	       4 v v v v v v  v v v v	    
- *	       5 v v v v v v  v v v v
+ *    e.g. prev_dims[2] = {4, 6}; ext_dims[2] = {6, 10}
+ *         elements marked in 'v' in _buf are compared to elements in _ldbuf
+ *        0 1 2 3 4 5 | 6 7 8 9
+ *             0        | v v v v
+ *           1        | v v v v
+ *           2        | v v v v
+ *           3        | v v v v
+ *            ---------------------
+ *           4 v v v v v v  v v v v
+ *           5 v v v v v v  v v v v
  *
  **************************************************************************************
  */
 static herr_t
 verify_elmts_two(int type, hsize_t *ext_dims, hsize_t *prev_dims,  void *_ldbuf, void *_buf)
 {
-    int k, m;		/* Local index variable */
+    int k, m;        /* Local index variable */
 
-    k = 0;							
+    k = 0;
     for(m = 0; m < (int)ext_dims[0]; m++) {
-        int n, ind;	/* Local index variable */
-
-	ind = m * (int)ext_dims[1];	
-	if(m < (int)prev_dims[0]) {
-	    for(n = (int)prev_dims[1]; n < (int)ext_dims[1]; n++) {
-		VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
-		++k;
-	    }  /* end for */
-	} /* end if */
-        else {					
-	    for(n = 0; n < (int)ext_dims[1]; n++) {
-		VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
-		++k;
-	    } /* end for */
-	} /* end else */
+        int n, ind;    /* Local index variable */
+
+    ind = m * (int)ext_dims[1];
+    if(m < (int)prev_dims[0]) {
+        for(n = (int)prev_dims[1]; n < (int)ext_dims[1]; n++) {
+        VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
+        ++k;
+        }  /* end for */
+    } /* end if */
+        else {
+        for(n = 0; n < (int)ext_dims[1]; n++) {
+        VERIFY_ELMTS(type, k, ind, _ldbuf, _buf)
+        ++k;
+        } /* end for */
+    } /* end else */
     } /* end for */
 
     return(0);
@@ -1166,106 +1166,106 @@ error:
     return(-1);
 } /* verify_elmts_two() */
 
-
-/* 
+
+/*
  **************************************************************************************
  * Testing for the High Level public routine: H5LDget_dset_elmts()
- * 	Verify elements retrieved via H5LDget_dset_elmts() are correct as expected when
- *	the datset's dimension sizes are changed accordingly to two_tests[]:
+ *     Verify elements retrieved via H5LDget_dset_elmts() are correct as expected when
+ *    the datset's dimension sizes are changed accordingly to two_tests[]:
  *
- *	two-dimensional dataset: DSET_TWO with NULL fields
- *				 DSET_CMPD_TWO with fields: NULL, VALID_FIELDS1, VALID_FIELDS2
+ *    two-dimensional dataset: DSET_TWO with NULL fields
+ *                 DSET_CMPD_TWO with fields: NULL, VALID_FIELDS1, VALID_FIELDS2
+ *
+ *            dims[0]        dims[1]
+ *            -------        -------
+ *    case #1:     increase    increase
+ *      case #2:    increase    decrease
+ *      case #3:    increase    same
+ *      case #4:    decrease    increase
+ *      case #5:    decrease    decrease    (failure)
+ *      case #6:    decrease    same        (failure)
+ *      case #7:    same        increase
+ *      case #8:    same        decrease    (failure)
+ *      case #9:    same        same        (failure)
  *
- *			dims[0]		dims[1]
- *			-------		-------
- *	case #1: 	increase	increase
- *      case #2:	increase	decrease
- *      case #3:	increase	same
- *      case #4:	decrease	increase
- *      case #5:	decrease	decrease	(failure)
- *      case #6:	decrease	same		(failure)
- *      case #7:	same		increase
- *      case #8:	same		decrease	(failure)
- *      case #9:	same		same		(failure)
- *		
  **************************************************************************************
  */
 static herr_t
 test_LD_elmts_two(const char *file, const char *dname, const char *fields)
 {
-    hid_t fid=-1;		/* file identifier */
-    hid_t did=-1;		/* dataset identifier */
-    hid_t dtype=-1;		/* dataset's data type */
-    hsize_t ext_dims[2];	/* extended dimension sizes of the dataset */
-    hsize_t prev_dims[2];	/* previous dimension sizes of the dataset */
-    int i;			/* local index variable */
-    int ret = 0;		/* return value */
+    hid_t fid=-1;        /* file identifier */
+    hid_t did=-1;        /* dataset identifier */
+    hid_t dtype=-1;        /* dataset's data type */
+    hsize_t ext_dims[2];    /* extended dimension sizes of the dataset */
+    hsize_t prev_dims[2];    /* previous dimension sizes of the dataset */
+    int i;            /* local index variable */
+    int ret = 0;        /* return value */
 
-    TESTING("H5LDget_dset_elmts: two-dimensional dataset");
+    HL_TESTING2("H5LDget_dset_elmts: two-dimensional dataset");
 
     /* Copy the test file */
     if(h5_make_local_copy(file, COPY_FILENAME) < 0)
         TEST_ERROR
 
     for(i = 0; i < TEST_BUF_SIZE; i++) {
-	cbuf[i].field1 = i;
-	cbuf[i].field2.a = i;
-	cbuf[i].field2.b.a = i;
-	cbuf[i].field2.b.b = i;
-	cbuf[i].field2.b.c = i;
-	cbuf[i].field2.c = i;
-	cbuf[i].field3 = (double)i;
-	cbuf[i].field4.a = i;
-	cbuf[i].field4.b = i;
-	ibuf[i] = i;
+    cbuf[i].field1 = i;
+    cbuf[i].field2.a = i;
+    cbuf[i].field2.b.a = i;
+    cbuf[i].field2.b.b = i;
+    cbuf[i].field2.b.c = i;
+    cbuf[i].field2.c = i;
+    cbuf[i].field3 = (double)i;
+    cbuf[i].field4.a = i;
+    cbuf[i].field4.b = i;
+    ibuf[i] = i;
     } /* end for */
 
     /* Open the copied file */
     if((fid = H5Fopen(COPY_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Open the dataset */
     if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get the dataset's data type */
     if((dtype = H5Tget_native_type(H5Dget_type(did), H5T_DIR_DEFAULT)) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Get current dimension sizes before extending the dataset's dimension sizes */
     if(H5LDget_dset_dims(did, prev_dims) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     /* Loop through different variations of extending the dataset */
     for(i = 0; i < TWO_NTESTS; i++) {
-	HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
-	HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
-	HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-	HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
-
-	ext_dims[0] = (hsize_t)((int)prev_dims[0] + two_tests[i][0]);
-	ext_dims[1] = (hsize_t)((int)prev_dims[1] + two_tests[i][1]);
-
-	/* Change the dimension sizes of the dataset */
-	if(H5Dset_extent(did, ext_dims) < 0)
-	    FAIL_STACK_ERROR
-
-	/* Initialize data */
-	if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
-	    if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
-		FAIL_STACK_ERROR
-	} /* end if */
+    HDmemset(vbuf1, 0, TEST_BUF_SIZE * sizeof(test_valid_fields1));
+    HDmemset(vbuf2, 0, TEST_BUF_SIZE * sizeof(test_valid_fields2));
+    HDmemset(ccbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
+    HDmemset(iibuf, 0, TEST_BUF_SIZE * sizeof(int));
+
+    ext_dims[0] = (hsize_t)((int)prev_dims[0] + two_tests[i][0]);
+    ext_dims[1] = (hsize_t)((int)prev_dims[1] + two_tests[i][1]);
+
+    /* Change the dimension sizes of the dataset */
+    if(H5Dset_extent(did, ext_dims) < 0)
+        FAIL_STACK_ERROR
+
+    /* Initialize data */
+    if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
+        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
+        FAIL_STACK_ERROR
+    } /* end if */
         else if(!HDstrcmp(dname, DSET_TWO)) {
-	    if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
-		FAIL_STACK_ERROR
-	} /* end else-if */
+        if(H5Dwrite(did, dtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
+        FAIL_STACK_ERROR
+    } /* end else-if */
         else
             TEST_ERROR
 
-	/* There are changes in dimension sizes */
-	if(two_tests[i][0] > 0 || two_tests[i][1] > 0) {
-	    if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
-		if(fields) {
+    /* There are changes in dimension sizes */
+    if(two_tests[i][0] > 0 || two_tests[i][1] > 0) {
+        if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
+        if(fields) {
                      if(!HDstrcmp(fields, VALID_FIELDS1) || !HDstrcmp(fields, VALID_ESC_FIELDS1)) {
                         /* Retrieve the elmemts in BUF */
                         if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, vbuf1) < 0)
@@ -1282,37 +1282,37 @@ test_LD_elmts_two(const char *file, const char *dname, const char *fields)
                     } /* end else-if */
                     else
                         TEST_ERROR
-		} /* end if */
+        } /* end if */
                 else {
-		    /* Retrieve the elmemts in BUF */
-		    if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
-			TEST_ERROR
-		    if(verify_elmts_two(TWO_CMPD_NULL, ext_dims, prev_dims, ccbuf, cbuf) < 0)
-			TEST_ERROR
-		} /* end else */
-	    } /* end if */
+            /* Retrieve the elmemts in BUF */
+            if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, ccbuf) < 0)
+            TEST_ERROR
+            if(verify_elmts_two(TWO_CMPD_NULL, ext_dims, prev_dims, ccbuf, cbuf) < 0)
+            TEST_ERROR
+        } /* end else */
+        } /* end if */
             else { /* DSET_TWO */
-		/* Retrieve the elmemts in BUF */
-		if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
-		    TEST_ERROR
-    		if(verify_elmts_two(TWO_NONE, ext_dims, prev_dims, iibuf, ibuf) < 0)
-		    TEST_ERROR
-	    } /* end else */
-	} /* end if */
+        /* Retrieve the elmemts in BUF */
+        if(H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf) < 0)
+            TEST_ERROR
+            if(verify_elmts_two(TWO_NONE, ext_dims, prev_dims, iibuf, ibuf) < 0)
+            TEST_ERROR
+        } /* end else */
+    } /* end if */
         else {
-	    /* Verify failure when changes between prev_dims and ext_dims are same/decrease */
-	    ret = H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf);
-	    VERIFY_EQUAL(ret, FAIL)
-	} /* end else */
+        /* Verify failure when changes between prev_dims and ext_dims are same/decrease */
+        ret = H5LDget_dset_elmts(did, prev_dims, ext_dims, fields, iibuf);
+        VERIFY_EQUAL(ret, FAIL)
+    } /* end else */
     } /* end for */
 
     /* Closing */
     if(H5Tclose(dtype) < 0)
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
     if(H5Dclose(did) < 0)
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
     if(H5Fclose(fid) < 0)
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
 
     /* Remove the copied file */
     HDremove(COPY_FILENAME);
@@ -1322,16 +1322,16 @@ test_LD_elmts_two(const char *file, const char *dname, const char *fields)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(dtype);
-	H5Dclose(did);
-	H5Fclose(fid);
+    H5Tclose(dtype);
+    H5Dclose(did);
+    H5Fclose(fid);
     } H5E_END_TRY;
     return(-1);
 } /* test_LD_elmts_two() */
 
 /*
- * Tests for High Level routines: 
- *	H5LDget_dset_dims(), H5LDget_dset_elmts, H5LDget_dset_type_size()
+ * Tests for High Level routines:
+ *    H5LDget_dset_dims(), H5LDget_dset_elmts, H5LDget_dset_type_size()
  */
 int main(void)
 {
@@ -1339,60 +1339,60 @@ int main(void)
 
     /* Set up temporary buffers for tests: test_LD_elmts_one() & test_LD_elmts_two() */
     if(NULL == (ibuf = (int *)HDmalloc(sizeof(int) * TEST_BUF_SIZE)))
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
     if(NULL == (iibuf = (int *)HDmalloc(sizeof(int) * TEST_BUF_SIZE)))
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
 
     if(NULL == (cbuf = (set_t *)HDmalloc(sizeof(set_t) * TEST_BUF_SIZE)))
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
     if(NULL == (ccbuf = (set_t *)HDmalloc(sizeof(set_t) * TEST_BUF_SIZE)))
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
 
     if(NULL == (vbuf1 = (test_valid_fields1 *)HDmalloc(sizeof(test_valid_fields1) * TEST_BUF_SIZE)))
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
     if(NULL == (vbuf2 = (test_valid_fields2 *)HDmalloc(sizeof(test_valid_fields2) * TEST_BUF_SIZE)))
-	FAIL_STACK_ERROR;
+    FAIL_STACK_ERROR;
 
-    /* 
-     * Testing H5LDget_dset_dims() 
+    /*
+     * Testing H5LDget_dset_dims()
      */
     nerrors += test_LD_dims_params(FILE);
     nerrors += test_LD_dims(FILE);
 
-    /* 
-     * Testing H5LDget_dset_type_size() 
+    /*
+     * Testing H5LDget_dset_type_size()
      */
     nerrors += test_LD_size(FILE);
 
-    /* 
+    /*
      * Testing invalid conditions for H5LDget_dset_elmts()
      */
     nerrors += test_LD_elmts_invalid(FILE);
 
-    /* 
-     * Testing H5LDget_dset_elmts(): 
-     *	 1-dimensional dataset
+    /*
+     * Testing H5LDget_dset_elmts():
+     *     1-dimensional dataset
      */
     nerrors += test_LD_elmts_one(FILE, DSET_ONE, NULL);
 
-    /* 
-     * Testing H5LDget_dset_elmts(): 
-     *	 1-dimensional dataset w/ compound datatype
+    /*
+     * Testing H5LDget_dset_elmts():
+     *     1-dimensional dataset w/ compound datatype
      */
     nerrors += test_LD_elmts_one(FILE, DSET_CMPD, NULL);
     nerrors += test_LD_elmts_one(FILE, DSET_CMPD, VALID_FIELDS1);
     nerrors += test_LD_elmts_one(FILE, DSET_CMPD, VALID_FIELDS2);
 
-    /* 
+    /*
      * Testing H5LDget_dset_elmts():
-     * 	 1-dimensional dataset with compound datatype and 
-     *   member names with escape/separator characters 
+     *      1-dimensional dataset with compound datatype and
+     *   member names with escape/separator characters
      */
     nerrors += test_LD_elmts_one(FILE, DSET_CMPD_ESC, NULL);
     nerrors += test_LD_elmts_one(FILE, DSET_CMPD_ESC, VALID_ESC_FIELDS1);
     nerrors += test_LD_elmts_one(FILE, DSET_CMPD_ESC, VALID_ESC_FIELDS2);
 
-    /* 
+    /*
      * Testing H5LDget_dset_elmts() for 2-dimensional datasets
      */
     nerrors += test_LD_elmts_two(FILE, DSET_TWO, NULL);
@@ -1416,7 +1416,7 @@ int main(void)
 
     /* check for errors */
     if(nerrors)
-	goto error;
+    goto error;
 
     puts("All tests for H5LD high level routines passed.");
 
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index 51ab72b..e6b4668 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -87,7 +87,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset");
+    HL_TESTING2("H5LTmake_dataset");
 
     /* Make dataset */
     if ( H5LTmake_dataset( file_id, DSET0_NAME, rank, dims, H5T_NATIVE_INT, data_int_in ) < 0 )
@@ -118,7 +118,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTread_dataset");
+    HL_TESTING2("H5LTread_dataset");
 
     if ( H5LTread_dataset( file_id, DSET0_NAME, H5T_NATIVE_INT, data_int_out ) < 0 )
         goto out;
@@ -143,7 +143,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset_char");
+    HL_TESTING2("H5LTmake_dataset_char");
 
     /* Make dataset char */
     if ( H5LTmake_dataset_char( file_id, DSET1_NAME, rank, dims, data_char_in ) < 0 )
@@ -179,7 +179,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset_short");
+    HL_TESTING2("H5LTmake_dataset_short");
 
     /* Make dataset short */
     if ( H5LTmake_dataset_short( file_id, DSET2_NAME, rank, dims, data_short_in ) < 0 )
@@ -214,7 +214,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset_int");
+    HL_TESTING2("H5LTmake_dataset_int");
 
     /* Make dataset int */
     if ( H5LTmake_dataset_int( file_id, DSET3_NAME, rank, dims, data_int_in ) < 0 )
@@ -250,7 +250,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset_long");
+    HL_TESTING2("H5LTmake_dataset_long");
 
     /* Make dataset long */
     if ( H5LTmake_dataset_long( file_id, DSET4_NAME, rank, dims, data_long_in ) < 0 )
@@ -286,7 +286,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset_float");
+    HL_TESTING2("H5LTmake_dataset_float");
 
     /* Make dataset float */
     if ( H5LTmake_dataset_float( file_id, DSET5_NAME, rank, dims, data_float_in ) < 0 )
@@ -322,7 +322,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset_double");
+    HL_TESTING2("H5LTmake_dataset_double");
 
     /* Make dataset double */
     if ( H5LTmake_dataset_double( file_id, DSET6_NAME, rank, dims, data_double_in ) < 0 )
@@ -358,7 +358,7 @@ static int test_dsets( void )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTmake_dataset_string");
+    HL_TESTING2("H5LTmake_dataset_string");
 
     /* Make dataset string */
     if ( H5LTmake_dataset_string(file_id,DSET7_NAME,data_string_in) < 0 )
@@ -517,7 +517,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_string");
+    HL_TESTING2("H5LTset_attribute_string");
 
     /* Set the attribute */
     if ( H5LTset_attribute_string( loc_id, obj_name, ATTR1_NAME, attr_str_in ) < 0 )
@@ -530,7 +530,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_string");
+    HL_TESTING2("H5LTget_attribute_string");
 
 
     /* Get the attribute */
@@ -550,7 +550,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_char");
+    HL_TESTING2("H5LTset_attribute_char");
 
     /* Set the attribute */
     if ( H5LTset_attribute_char( loc_id, obj_name, ATTR2_NAME, attr_char_in, (size_t)5 ) < 0 )
@@ -563,7 +563,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_char");
+    HL_TESTING2("H5LTget_attribute_char");
 
     /* Get the attribute */
     if ( H5LTget_attribute_char( loc_id, obj_name, ATTR2_NAME, attr_char_out ) < 0 )
@@ -594,7 +594,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_short");
+    HL_TESTING2("H5LTset_attribute_short");
 
     /* Set the attribute */
     if ( H5LTset_attribute_short( loc_id, obj_name, ATTR3_NAME, attr_short_in, (size_t)5 ) < 0 )
@@ -608,7 +608,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_short");
+    HL_TESTING2("H5LTget_attribute_short");
 
     /* Get the attribute */
     if ( H5LTget_attribute_short( loc_id, obj_name, ATTR3_NAME, attr_short_out ) < 0 )
@@ -640,7 +640,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_int");
+    HL_TESTING2("H5LTset_attribute_int");
 
     /* Set the attribute */
     if ( H5LTset_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_in, (size_t)5 ) < 0 )
@@ -661,7 +661,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_int");
+    HL_TESTING2("H5LTget_attribute_int");
 
     /* Get the attribute */
     if ( H5LTget_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_out ) < 0 )
@@ -712,7 +712,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_long");
+    HL_TESTING2("H5LTset_attribute_long");
 
     /* Set the attribute */
     if ( H5LTset_attribute_long( loc_id, obj_name, ATTR5_NAME, attr_long_in, (size_t)5 ) < 0 )
@@ -725,7 +725,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_long");
+    HL_TESTING2("H5LTget_attribute_long");
 
     /* Get the attribute */
     if ( H5LTget_attribute_long( loc_id, obj_name, ATTR5_NAME, attr_long_out ) < 0 )
@@ -756,7 +756,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_uchar");
+    HL_TESTING2("H5LTset_attribute_uchar");
 
     /* Set the attribute */
     if ( H5LTset_attribute_uchar( loc_id, obj_name, ATTR6_NAME, attr_uchar_in, (size_t)5 ) < 0 )
@@ -769,7 +769,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_uchar");
+    HL_TESTING2("H5LTget_attribute_uchar");
 
     /* Get the attribute */
     if ( H5LTget_attribute_uchar( loc_id, obj_name, ATTR6_NAME, attr_uchar_out ) < 0 )
@@ -800,7 +800,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_ushort");
+    HL_TESTING2("H5LTset_attribute_ushort");
 
     /* Set the attribute */
     if ( H5LTset_attribute_ushort( loc_id, obj_name, ATTR7_NAME, attr_ushort_in, (size_t)5 ) < 0 )
@@ -814,7 +814,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_ushort");
+    HL_TESTING2("H5LTget_attribute_ushort");
 
     /* Get the attribute */
     if ( H5LTget_attribute_ushort( loc_id, obj_name, ATTR7_NAME, attr_ushort_out ) < 0 )
@@ -846,7 +846,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_uint");
+    HL_TESTING2("H5LTset_attribute_uint");
 
     /* Set the attribute */
     if ( H5LTset_attribute_uint( loc_id, obj_name, ATTR8_NAME, attr_uint_in, (size_t)5 ) < 0 )
@@ -859,7 +859,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_uint");
+    HL_TESTING2("H5LTget_attribute_uint");
 
     /* Get the attribute */
     if ( H5LTget_attribute_uint( loc_id, obj_name, ATTR8_NAME, attr_uint_out ) < 0 )
@@ -890,7 +890,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_ulong");
+    HL_TESTING2("H5LTset_attribute_ulong");
 
     /* Set the attribute */
     if ( H5LTset_attribute_ulong( loc_id, obj_name, ATTR9_NAME, attr_ulong_in, (size_t)5 ) < 0 )
@@ -903,7 +903,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_ulong");
+    HL_TESTING2("H5LTget_attribute_ulong");
 
     /* Get the attribute */
     if ( H5LTget_attribute_ulong( loc_id, obj_name, ATTR9_NAME, attr_ulong_out ) < 0 )
@@ -935,7 +935,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_float");
+    HL_TESTING2("H5LTset_attribute_float");
 
     /* Set the attribute */
     if ( H5LTset_attribute_float( loc_id, obj_name, ATTR10_NAME, attr_float_in, (size_t)5 ) < 0 )
@@ -948,7 +948,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_float");
+    HL_TESTING2("H5LTget_attribute_float");
 
 
     /* Get the attribute */
@@ -980,7 +980,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTset_attribute_double");
+    HL_TESTING2("H5LTset_attribute_double");
 
     /* Set the attribute */
     if ( H5LTset_attribute_double( loc_id, obj_name, ATTR11_NAME, attr_double_in, (size_t)5 ) < 0 )
@@ -993,7 +993,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_double");
+    HL_TESTING2("H5LTget_attribute_double");
 
     /* Get the attribute */
     if ( H5LTget_attribute_double( loc_id, obj_name, ATTR11_NAME, attr_double_out ) < 0 )
@@ -1026,7 +1026,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     */
 
 
-    TESTING("H5LTget_attribute_ndims");
+    HL_TESTING2("H5LTget_attribute_ndims");
 
     if ( H5LTget_attribute_ndims( loc_id, obj_name, ATTR2_NAME, &rank_out ) < 0 )
         return -1;
@@ -1042,7 +1042,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     *-------------------------------------------------------------------------
     */
 
-    TESTING("H5LTget_attribute_info");
+    HL_TESTING2("H5LTget_attribute_info");
 
     if(NULL==(dims_out = (hsize_t*) HDmalloc( sizeof(hsize_t) * (size_t)rank_out ))) return -1;
 
@@ -1079,7 +1079,7 @@ static int test_integers(void)
     char*   dt_str;
     size_t  str_len;
 
-    TESTING3("\n        text for integer types");
+    HL_TESTING3("\n        text for integer types");
 
     if((dtype = H5LTtext_to_dtype("H5T_NATIVE_INT\n", H5LT_DDL))<0)
         goto out;
@@ -1136,7 +1136,7 @@ static int test_fps(void)
     char*   dt_str;
     size_t  str_len;
 
-    TESTING3("        text for floating-point types");
+    HL_TESTING3("        text for floating-point types");
 
     if((dtype = H5LTtext_to_dtype("H5T_NATIVE_LDOUBLE\n", H5LT_DDL))<0)
         goto out;
@@ -1197,7 +1197,7 @@ static int test_strings(void)
     char*   dt_str = NULL;
     size_t  str_len;
 
-    TESTING3("        text for string types");
+    HL_TESTING3("        text for string types");
 
     if((dtype = H5LTtext_to_dtype("H5T_STRING { STRSIZE 13; STRPAD H5T_STR_NULLTERM; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; }", H5LT_DDL))<0)
         goto out;
@@ -1328,7 +1328,7 @@ static int test_opaques(void)
     char*   dt_str;
     size_t  str_len;
 
-    TESTING3("        text for opaque types");
+    HL_TESTING3("        text for opaque types");
 
     if((dtype = H5LTtext_to_dtype("H5T_OPAQUE { OPQ_SIZE 19; OPQ_TAG \"This is a tag for opaque type\"; }", H5LT_DDL))<0)
         goto out;
@@ -1385,7 +1385,7 @@ static int test_enums(void)
     char*   dt_str;
     size_t  str_len;
 
-    TESTING3("        text for enum types");
+    HL_TESTING3("        text for enum types");
 
     if((dtype = H5LTtext_to_dtype("H5T_ENUM { H5T_STD_I32LE; \"RED\" 5; \"GREEN\" 6; \"BLUE\" 7; \"WHITE\" 8; }", H5LT_DDL))<0)
         goto out;
@@ -1457,7 +1457,7 @@ static int test_variables(void)
     char*   dt_str;
     size_t  str_len;
 
-    TESTING3("        text for variable types");
+    HL_TESTING3("        text for variable types");
 
     if((dtype = H5LTtext_to_dtype("H5T_VLEN { H5T_NATIVE_CHAR }\n", H5LT_DDL))<0)
         goto out;
@@ -1518,7 +1518,7 @@ static int test_arrays(void)
     char*   dt_str;
     size_t  str_len;
 
-    TESTING3("        text for array types");
+    HL_TESTING3("        text for array types");
 
     if((dtype = H5LTtext_to_dtype("H5T_ARRAY { [5][7][13] H5T_ARRAY { [17][19] H5T_COMPOUND { H5T_STD_I8BE \"arr_compound_1\"; H5T_STD_I32BE \"arr_compound_2\"; } } }", H5LT_DDL))<0)
         goto out;
@@ -1579,7 +1579,7 @@ static int test_compounds(void)
     char*   dt_str;
     size_t  str_len;
 
-    TESTING3("        text for compound types");
+    HL_TESTING3("        text for compound types");
 
     if((dtype = H5LTtext_to_dtype("H5T_COMPOUND { H5T_STD_I16BE \"one_field\" : 2; H5T_STD_U8LE \"two_field\" : 6; }", H5LT_DDL))<0)
         goto out;
@@ -1673,7 +1673,7 @@ static int test_compound_bug(void)
      "  } } \"sub\" : 8;\n"
      "}\n";
 
-    TESTING3("        text for compound type of bug fix");
+    HL_TESTING3("        text for compound type of bug fix");
 
     if((dtype = H5LTtext_to_dtype(text, H5LT_DDL))<0)
         goto out;
@@ -1765,7 +1765,7 @@ static int test_complicated_compound(void)
     size_t  size = 1024;
     const char *filename = H5_get_srcdir_filename(INPUT_FILE);
 
-    TESTING3("        text for complicated compound types");
+    HL_TESTING3("        text for complicated compound types");
 
     /* Open input file */
     fp = HDfopen(filename, "r");
@@ -1834,7 +1834,7 @@ out:
 */
 static int test_text_dtype(void)
 {
-    TESTING("H5LTtext_to_dtype");
+    HL_TESTING2("H5LTtext_to_dtype");
 
     if(test_integers()<0)
         goto out;
@@ -1882,7 +1882,7 @@ static int test_valid_path(void)
   htri_t path_valid;
   const char *data_string_in = "test";
 
-  TESTING("H5LTpath_valid");
+  HL_TESTING2("H5LTpath_valid");
 
   /* Create a new file using default properties. */
 
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 7003b26..61aebc7 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -178,7 +178,7 @@ static int test_create_close(hid_t fid)
     hid_t table;
     hid_t part_t;
 
-    TESTING("H5PTcreate_fl and H5PTclose");
+    HL_TESTING2("H5PTcreate_fl and H5PTclose");
 
     /* Create a datatype for the particle struct */
     part_t = make_particle_type();
@@ -188,11 +188,11 @@ static int test_create_close(hid_t fid)
     /* Create the table */
     table = H5PTcreate_fl(fid, PT_NAME, part_t, (hsize_t)100, -1);
     if (H5Tclose(part_t) < 0)
-	goto error;
+    goto error;
     if( H5PTis_valid(table) < 0)
-	goto error;
+    goto error;
     if( H5PTis_varlen(table) != 0)
-	goto error;
+    goto error;
 
     /* Close the table */
     err = H5PTclose(table);
@@ -219,7 +219,7 @@ static int test_open(hid_t fid)
     herr_t err;
     hid_t table;
 
-    TESTING("H5PTopen");
+    HL_TESTING2("H5PTopen");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
@@ -255,7 +255,7 @@ static int test_append(hid_t fid)
     hid_t table;
     hsize_t count = 0;
 
-    TESTING("H5PTappend");
+    HL_TESTING2("H5PTappend");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
@@ -322,7 +322,7 @@ static int test_read(hid_t fid)
     particle_t readBuf[NRECORDS];
     size_t c;
 
-    TESTING("H5PTread_packets");
+    HL_TESTING2("H5PTread_packets");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
@@ -383,7 +383,7 @@ static int test_get_next(hid_t fid)
     particle_t readBuf2[NRECORDS];
     size_t c;
 
-    TESTING("H5PTget_next");
+    HL_TESTING2("H5PTget_next");
 
     /* Open the table */
     table = H5PTopen(fid, PT_NAME);
@@ -454,7 +454,7 @@ static int    test_big_table(hid_t fid)
     particle_t readPart;
     hsize_t count;
 
-    TESTING("large packet table");
+    HL_TESTING2("large packet table");
 
     /* Create a datatype for the particle struct */
     part_t = make_particle_type();
@@ -528,7 +528,7 @@ static int    test_opaque(hid_t fid)
     size_t c;
     particle_t readBuf[NRECORDS];
 
-    TESTING("opaque data");
+    HL_TESTING2("opaque data");
 
     /* Create an opaque datatype for the particle struct */
     if ((part_t = H5Tcreate (H5T_OPAQUE, sizeof(particle_t) )) < 0 )
@@ -602,7 +602,7 @@ test_compress(void)
     particle_t readPart[1];
     hsize_t count;
 
-    TESTING("packet table compression");
+    HL_TESTING2("packet table compression");
 
     /* Create a file. */
     if((fid1 = H5Fcreate(TEST_COMPRESS_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR;
@@ -739,7 +739,7 @@ static int test_rw_nonnative_dt(hid_t fid)
  int writeBuffer[5];
  int readBuffer[5];
 
- TESTING("reading/writing non-native packet table");
+ HL_TESTING2("reading/writing non-native packet table");
 
  /* Initialize buffers */
  for(x=0; x<5; x++) {
@@ -794,7 +794,7 @@ static int test_rw_nonnative_dt(hid_t fid)
  /* Close the packet table */
  if( (err = H5PTclose(ptable)) < 0)
         goto error;
- 
+
  PASSED();
  return SUCCEED;
 
@@ -819,7 +819,7 @@ static int test_error(hid_t fid)
   int id_open=0;
   particle_t readBuf[1];
 
-  TESTING("error conditions");
+  HL_TESTING2("error conditions");
 
   /* Create a HL table */
   if(create_hl_table(fid) < 0)
@@ -981,7 +981,7 @@ int main(void)
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	status = 1;
+    status = 1;
 
     return status;
 }
diff --git a/hl/test/test_packet_vlen.c b/hl/test/test_packet_vlen.c
index 1d6231e..4d83ae6 100644
--- a/hl/test/test_packet_vlen.c
+++ b/hl/test/test_packet_vlen.c
@@ -46,24 +46,24 @@ static int verify_attribute(hid_t fid, const char *table_name, const char *attr_
 
 /*-------------------------------------------------------------------------
  * test_VLof_atomic(): Test that a packet table with VL datatypes of atomic
- *	datatypes can be created and written correctly. (HDFFV-442)
+ *    datatypes can be created and written correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int test_VLof_atomic(void)
 {
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;	/* Variable length datatype */
-    hsize_t count;		/* Number of records in the table */
-    unsigned uu, vv;		/* Loop variables */
-    hvl_t   writeBuf[NRECORDS];	/* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];	/* Buffer to hold read data */
-    char    msg[80];		/* For error message */
-    herr_t  ret;		/* Returned status from a callee */
-
-    TESTING3("        with vlen of atomic");
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
+    hsize_t count;        /* Number of records in the table */
+    unsigned uu, vv;        /* Loop variables */
+    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
+    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
+    char    msg[80];        /* For error message */
+    herr_t  ret;        /* Returned status from a callee */
+
+    HL_TESTING3("        with vlen of atomic");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -71,42 +71,42 @@ static int test_VLof_atomic(void)
         if (writeBuf[uu].p == NULL) {
             fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-	}
+    }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++)
-	    ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
+        ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
     } /* end for */
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create a vlen type that uses an atomic datatype as its base type */
     vltype = H5Tvlen_create (H5T_NATIVE_UINT);
     if (vltype < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a vlen datatype of an atomic type */
     ptable = H5PTcreate(fid, PT_VLEN_ATOMIC, vltype, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Close the vlen datatype */
     if (H5Tclose(vltype) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -114,33 +114,33 @@ static int test_VLof_atomic(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     for (uu = 0; uu < NRECORDS; uu++)
         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]);
-	    }
+        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]);
+        }
         }
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -157,7 +157,7 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * test_VLof_comptype(): Test that a packet table with VL datatypes of
- *	compound datatypes can be created and written correctly. (HDFFV-442)
+ *    compound datatypes can be created and written correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
@@ -169,18 +169,18 @@ static int test_VLof_comptype(void)
         unsigned u;
         float f;
     } VLcomp_t;
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   cmptype=H5I_INVALID_HID;	/* Compound datatype */
-    hvl_t   writeBuf[NRECORDS];	/* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];	/* Buffer to hold read data */
-    hsize_t count;		/* Number of records in the table */
-    unsigned uu, vv;		/* Loop variables */
-    char    msg[80];		/* For error message */
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   cmptype=H5I_INVALID_HID;    /* Compound datatype */
+    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
+    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
+    hsize_t count;        /* Number of records in the table */
+    unsigned uu, vv;        /* Loop variables */
+    char    msg[80];        /* For error message */
     herr_t ret;
 
-    TESTING3("        with vlen of compound datatypes");
+    HL_TESTING3("        with vlen of compound datatypes");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -188,7 +188,7 @@ static int test_VLof_comptype(void)
         if(writeBuf[uu].p == NULL) {
             fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-	}
+    }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++) {
             ((VLcomp_t *)writeBuf[uu].p)[vv].u = uu + vv;
@@ -199,48 +199,48 @@ static int test_VLof_comptype(void)
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create the base compound type */
     cmptype = H5Tcreate(H5T_COMPOUND, sizeof(VLcomp_t));
     if (cmptype < 0)
-	goto error;
+    goto error;
 
     /* Insert fields */
     ret = H5Tinsert(cmptype, "u", HOFFSET(VLcomp_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5Tinsert(cmptype, "f", HOFFSET(VLcomp_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Create a variable length type that uses the VLcomp_t as its base type */
     vltype = H5Tvlen_create(cmptype);
     if (vltype < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a vlen datatype of compound datatype */
     ptable = H5PTcreate(fid, PT_VLEN_COMP, vltype, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Release the datatypes */
     if (H5Tclose(cmptype) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(vltype) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)5, writeBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -248,39 +248,39 @@ static int test_VLof_comptype(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* 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);
-	    continue;
-	} /* write len != read 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]);
                 continue;
-	    } /* write value != read value */
-	}
+        } /* write value != read value */
+    }
     } /* end for */
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -298,8 +298,8 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * test_compound_VL_VL(): Test that a packet table of compound datatypes
- *	containing VL datatypes can be created and written
- *	correctly. (HDFFV-442)
+ *    containing VL datatypes can be created and written
+ *    correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
@@ -310,23 +310,23 @@ static int test_compound_VL_VLtype(void)
     typedef struct {
         unsigned u;
         float f;
-	hvl_t v;
+    hvl_t v;
     } compVLVL_t;
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   comp_vlvl=H5I_INVALID_HID;	/* ID of a compound datatype containing 
-					   a VL of VL of atomic datatype */
-    hsize_t count;		/* Number of records in the table */
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   vlofvl=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   comp_vlvl=H5I_INVALID_HID;    /* ID of a compound datatype containing
+                    a VL of VL of atomic datatype */
+    hsize_t count;        /* Number of records in the table */
     compVLVL_t writeBuf[NRECORDS];/* Buffer to hold data to be written */
     compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */
     hvl_t   *t1, *t2;
-    unsigned uu, vv, ww;	/* Loop variables */
-    char    msg[80];		/* For error message */
-    herr_t  ret;		/* Returned status from a callee */
+    unsigned uu, vv, ww;    /* Loop variables */
+    char    msg[80];        /* For error message */
+    herr_t  ret;        /* Returned status from a callee */
 
-    TESTING3("        with compound datatype containing vlen datatype");
+    HL_TESTING3("        with compound datatype containing vlen datatype");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -336,15 +336,15 @@ static int test_compound_VL_VLtype(void)
         if (writeBuf[uu].v.p == NULL) {
             fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-	}
+    }
         writeBuf[uu].v.len = uu + L1_INCM;
         for (t1 = (hvl_t *)((writeBuf[uu].v).p), vv = 0; vv < (uu + L1_INCM); vv++, t1++)
-	{
+    {
             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);
-		goto error;
-	    }
+        if (t1->p == NULL) {
+        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        goto error;
+        }
             t1->len = vv + L2_INCM;
             for (ww = 0; ww < vv + L2_INCM; ww++)
                 ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
@@ -354,58 +354,58 @@ static int test_compound_VL_VLtype(void)
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create a VL datatype of an atomic type */
     vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
     if (vlatomic < 0)
-	goto error;
+    goto error;
 
     /* Create a VL datatype of the VL of atomic datatype */
     vlofvl = H5Tvlen_create (vlatomic);
     if (vlofvl < 0)
-	goto error;
+    goto error;
 
     /* Create the base compound type */
     comp_vlvl = H5Tcreate(H5T_COMPOUND, sizeof(compVLVL_t));
     if (comp_vlvl < 0)
-	goto error;
+    goto error;
 
     /* Insert fields: atomic, atomic, vlen */
     ret = H5Tinsert(comp_vlvl, "u", HOFFSET(compVLVL_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5Tinsert(comp_vlvl, "f", HOFFSET(compVLVL_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5Tinsert(comp_vlvl, "v", HOFFSET(compVLVL_t, v), vlofvl);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a compound datatype of vlen datatype */
     ptable = H5PTcreate(fid, PT_COMP_VLEN, comp_vlvl, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(vlofvl) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(comp_vlvl) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -413,7 +413,7 @@ static int test_compound_VL_VLtype(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -448,19 +448,19 @@ static int test_compound_VL_VLtype(void)
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -479,27 +479,27 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * test_VLof_VLtype(): Test that a packet table of VL datatype with VL
- *	datatypes of atomic datatypes can be created and written
- *	correctly. (HDFFV-442)
+ *    datatypes of atomic datatypes can be created and written
+ *    correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int test_VLof_VLtype(void)
 {
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;	/* VL datatype of VL datatypes */
-    hsize_t count;		/* Number of records in the table */
-    hvl_t   *t1;		/* pointer to advance */
-    unsigned uu, vv, ww;	/* Loop variables */
-    hvl_t   writeBuf[NRECORDS];	/* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];	/* Buffer to hold read data */
-    char    msg[80];		/* For error message */
-    herr_t  ret;		/* Returned status from a callee */
-
-    TESTING3("        with vlen datatype of vlen datatype");
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   vlofvl=H5I_INVALID_HID;    /* VL datatype of VL datatypes */
+    hsize_t count;        /* Number of records in the table */
+    hvl_t   *t1;        /* pointer to advance */
+    unsigned uu, vv, ww;    /* Loop variables */
+    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
+    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
+    char    msg[80];        /* For error message */
+    herr_t  ret;        /* Returned status from a callee */
+
+    HL_TESTING3("        with vlen datatype of vlen datatype");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -510,12 +510,12 @@ static int test_VLof_VLtype(void)
         } /* end if */
         writeBuf[uu].len = uu + 1;
         for (t1=(hvl_t *)(writeBuf[uu].p), vv = 0; vv < (uu + 1); vv++, t1++)
-	{
+    {
             t1->p = HDmalloc((vv + 1) * sizeof(unsigned int));
-	    if (t1->p == NULL) {
-		fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
-		goto error;
-	    }
+        if (t1->p == NULL) {
+        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        goto error;
+        }
             t1->len = vv * 1;
             for (ww = 0; ww < (vv * 1); ww++)
                 ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
@@ -525,39 +525,39 @@ static int test_VLof_VLtype(void)
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create a VL datatype of an atomic type */
     vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
     if (vlatomic < 0)
-	goto error;
+    goto error;
 
     vlofvl = H5Tvlen_create (vlatomic);
     if (vlofvl < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a vlen datatype of vlen datatype */
     ptable = H5PTcreate(fid, PT_VLEN_VLEN, vlofvl, (hsize_t)1, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(vlofvl) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)5, writeBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -565,24 +565,24 @@ static int test_VLof_VLtype(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -600,41 +600,41 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * verify_ptlengthtype() - helper function, verifies that the named packet
- *	table is a fixed-length or variable-length as indicated by the last
- *	argument.
+ *    table is a fixed-length or variable-length as indicated by the last
+ *    argument.
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int verify_ptlengthtype(hid_t fid, const char *table_name, herr_t expected_value)
 {
-    hid_t   ptable = H5I_INVALID_HID;	/* Packet table identifier */
+    hid_t   ptable = H5I_INVALID_HID;    /* Packet table identifier */
     herr_t  is_varlen = 0;
     herr_t  ret = FAIL;
 
     /* Open the named packet table */
     if( (ptable = H5PTopen(fid, table_name)) < 0)
-	goto error;
+    goto error;
 
     /* Verify the value returned from H5PTis_varlen is as expected */
     is_varlen = H5PTis_varlen(ptable);
     if (is_varlen == FAIL)
-	goto error;
+    goto error;
     else if (is_varlen == expected_value)
-	ret = SUCCEED;
+    ret = SUCCEED;
     else
     {
-	char lenthtype[20];
-	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);
-	ret = FAIL;
+    char lenthtype[20];
+    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);
+    ret = FAIL;
     }
 
     /* Close the packet table */
     if (H5PTclose(ptable) < 0)
-	goto error;
+    goto error;
 
     return ret;
 
@@ -645,71 +645,71 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * test_H5PTis_varlen(): Test that H5PTis_varlen works correctly on both
- *	fixed- and variable-length packet tables.
+ *    fixed- and variable-length packet tables.
  *
  * Description:
- *	- Added a fixed-length packet table to the file for variety
- *	- Use the helper funtion verify_ptlengthtype to test H5PTis_varlen
- *	  on each packet table.
+ *    - Added a fixed-length packet table to the file for variety
+ *    - Use the helper funtion verify_ptlengthtype to test H5PTis_varlen
+ *      on each packet table.
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int test_H5PTis_varlen(void)
 {
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    herr_t  ret;		/* Returned status from a callee */
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    herr_t  ret;        /* Returned status from a callee */
 
-    TESTING("H5PTis_varlen");
+    HL_TESTING2("H5PTis_varlen");
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create a new table */
     ptable = H5PTcreate(fid, PT_FIXED_LEN, H5T_STD_I32BE, (hsize_t)100, H5P_DEFAULT);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Open each packet table, and verify that H5PTis_varlen returns correct
        type for each table */
     ret = verify_ptlengthtype(fid, PT_VLEN_ATOMIC, 1); /* vlen of atomic */
     if (ret < 0)
-	goto error;
+    goto error;
     ret = verify_ptlengthtype(fid, PT_VLEN_COMP, 1); /* vlen of compound */
     if (ret < 0)
-	goto error;
+    goto error;
     ret = verify_ptlengthtype(fid, PT_COMP_VLEN, 0); /* compound of vlen, no vlen */
     if (ret < 0)
-	goto error;
+    goto error;
     ret = verify_ptlengthtype(fid, PT_VLEN_VLEN, 1); /* vlen of vlen */
     if (ret < 0)
-	goto error;
+    goto error;
     ret = verify_ptlengthtype(fid, PT_FIXED_LEN, 0); /* no vlen */
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -722,11 +722,11 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * adding_attribute() - helper function, adds an attribute to the named
- *	packet table.
+ *    packet table.
  * Note:
- *	For simplicity, the attributes that are added to the packet tables
- *	have the same characteristics except their names.  They have the
- *	same type, space, and values.
+ *    For simplicity, the attributes that are added to the packet tables
+ *    have the same characteristics except their names.  They have the
+ *    same type, space, and values.
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
@@ -737,47 +737,47 @@ int attr_data[ATTR_DIM]={256,11945,-22107}; /* values to be written to attr */
 
 static int adding_attribute(hid_t fid, const char *table_name, const char *attr_name)
 {
-    hid_t ptable = H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t space_id = H5I_INVALID_HID;	/* Dataspace for the attribute */
-    hid_t attr_id = H5I_INVALID_HID;	/* Attribute identifier */
-    hid_t dset_id = H5I_INVALID_HID;	/* Dataset identifier */
-    hsize_t dims[] = {ATTR_DIM};	/* Dimension for dataspace */
-    int ret = FAIL;		/* Returned status from a callee */
+    hid_t ptable = H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t space_id = H5I_INVALID_HID;    /* Dataspace for the attribute */
+    hid_t attr_id = H5I_INVALID_HID;    /* Attribute identifier */
+    hid_t dset_id = H5I_INVALID_HID;    /* Dataset identifier */
+    hsize_t dims[] = {ATTR_DIM};    /* Dimension for dataspace */
+    int ret = FAIL;        /* Returned status from a callee */
 
     /* Create dataspace for attribute */
     space_id = H5Screate_simple(ATTR_RANK, dims, NULL);
     if (space_id < 0)
-	goto error;
+    goto error;
 
     /* Open the named packet table */
     if( (ptable = H5PTopen(fid, table_name)) < 0)
-	goto error;
+    goto error;
 
     dset_id = H5PTget_dataset(ptable);
     if (dset_id < 0)
-	goto error;
+    goto error;
 
     /* Add the specified attribute to it */
     attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT);
     if (attr_id < 0)
-	goto error;
+    goto error;
 
     /* Write attribute values */
     ret = H5Awrite(attr_id, H5T_NATIVE_INT, attr_data);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the attribute */
     if (H5Aclose(attr_id) < 0)
-	goto error;
+    goto error;
 
     /* Close the dataspace */
     if (H5Sclose(space_id) < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     if (H5PTclose(ptable) < 0)
-	goto error;
+    goto error;
 
     return SUCCEED;
 
@@ -790,39 +790,39 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * verify_attribute() - helper function, verifies the named attribute can
- *	be read correctly.
+ *    be read correctly.
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static herr_t verify_attribute(hid_t fid, const char *table_name, const char *attr_name)
 {
-    hid_t ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t attr_id=H5I_INVALID_HID;	/* Attribute identifier */
-    hid_t dset_id=H5I_INVALID_HID;	/* Dataset associated with the pt */
-    int read_data[ATTR_DIM];		/* Output buffer */
+    hid_t ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t attr_id=H5I_INVALID_HID;    /* Attribute identifier */
+    hid_t dset_id=H5I_INVALID_HID;    /* Dataset associated with the pt */
+    int read_data[ATTR_DIM];        /* Output buffer */
     int ii;
-    herr_t ret = FAIL;		/* Returned status from a callee */
+    herr_t ret = FAIL;        /* Returned status from a callee */
 
     /* Open the named packet table */
     ptable = H5PTopen(fid, table_name);
     if (ptable < 0)
-	goto error;
+    goto error;
 
     /* Get the dataset id of this packet table */
     dset_id = H5PTget_dataset(ptable);
     if (dset_id < 0)
-	goto error;
+    goto error;
 
     /* Open first attribute for the dataset */
     attr_id = H5Aopen(dset_id, attr_name, H5P_DEFAULT);
     if (attr_id < 0)
-	goto error;
+    goto error;
 
     /* Read attribute values */
     ret = H5Aread(attr_id, H5T_NATIVE_INT, read_data);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Verify values read in */
     for (ii = 0; ii < ATTR_DIM; ii++)
@@ -831,11 +831,11 @@ static herr_t verify_attribute(hid_t fid, const char *table_name, const char *at
 
     /* Close the attribute */
     if (H5Aclose(attr_id) < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     if (H5PTclose(ptable) < 0)
-	goto error;
+    goto error;
 
     return SUCCEED;
 
@@ -849,58 +849,58 @@ error: /* An error has occurred.  Clean up and exit. */
  * test_attributes(): Test adding attributes to packet tables
  *
  * Description:
- *	Added attributes to some random packet tables in the file.
+ *    Added attributes to some random packet tables in the file.
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int test_attributes(void)
 {
-    hid_t fid=H5I_INVALID_HID;		/* File identifier */
-    hid_t attr_id=H5I_INVALID_HID;	/* Attribute identifier */
-    herr_t ret = FAIL;		/* Returned status from a callee */
+    hid_t fid=H5I_INVALID_HID;        /* File identifier */
+    hid_t attr_id=H5I_INVALID_HID;    /* Attribute identifier */
+    herr_t ret = FAIL;        /* Returned status from a callee */
 
-    TESTING("adding attributes to packet tables");
+    HL_TESTING2("adding attributes to packet tables");
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Add an arbitrary attribute to a few packet tables, using helper func */
     attr_id = adding_attribute(fid, PT_VLEN_ATOMIC, "Attribute 1");
     if (attr_id < 0)
-	goto error;
+    goto error;
     attr_id = adding_attribute(fid, PT_VLEN_COMP, "Attribute 2");
     if (attr_id < 0)
-	goto error;
+    goto error;
     attr_id = adding_attribute(fid, PT_COMP_VLEN, "Attribute 3");
     if (attr_id < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     /* Open the file again */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Read each attribute and verify the values, using helper function */
     ret = verify_attribute(fid, PT_VLEN_ATOMIC, "Attribute 1");
     if (ret < 0)
-	goto error;
+    goto error;
     ret = verify_attribute(fid, PT_VLEN_COMP, "Attribute 2");
     if (ret < 0)
-	goto error;
+    goto error;
     ret = verify_attribute(fid, PT_COMP_VLEN, "Attribute 3");
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return(ret);
@@ -913,17 +913,17 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * verify_accessors() - helper function, verifies that various info can be
- *	retrieved correctly using the info returned by the accessor functions.
+ *    retrieved correctly using the info returned by the accessor functions.
  *
  * Description:
- *	Testing functions H5PTget_dataset and H5PTget_type
+ *    Testing functions H5PTget_dataset and H5PTget_type
  *
- *	- Opens the named packet table
- *	- Gets its associated dataset ID then calls a C function on that ID
- *	  to verify the dataset name
- *	- Gets its associated datatype ID then calls a C function on that ID
- *	  to verify that the packet table is variable- or fixed-length as
- *	  indicated by the expected_value argument
+ *    - Opens the named packet table
+ *    - Gets its associated dataset ID then calls a C function on that ID
+ *      to verify the dataset name
+ *    - Gets its associated datatype ID then calls a C function on that ID
+ *      to verify that the packet table is variable- or fixed-length as
+ *      indicated by the expected_value argument
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
@@ -990,18 +990,18 @@ error: /* An error has occurred.  Clean up and exit. */
  * test_accessors(): Test the accessor functions
  *
  * Description:
- *	Retrieves the dataset and datatype IDs and verifies various info
- *	to ensure these IDs are correct.
+ *    Retrieves the dataset and datatype IDs and verifies various info
+ *    to ensure these IDs are correct.
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int test_accessors(void)
 {
-    hid_t fid=H5I_INVALID_HID;		/* File identifier */
-    herr_t ret = FAIL;		/* Returned status from a callee */
+    hid_t fid=H5I_INVALID_HID;        /* File identifier */
+    herr_t ret = FAIL;        /* Returned status from a callee */
 
-    TESTING("accessor functions");
+    HL_TESTING2("accessor functions");
 
     /* Open the file */
     fid = H5Fopen(TEST_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
@@ -1031,32 +1031,32 @@ error: /* An error has occurred.  Clean up and exit. */
 } /* test_accessors */
 
 /**************************************************************************
-	Test set for deprecated function H5PTcreate_fl
-	Each test in this set is the same as the corresponding one in the
-	set for H5PTcreate, as of Mar 2016
+    Test set for deprecated function H5PTcreate_fl
+    Each test in this set is the same as the corresponding one in the
+    set for H5PTcreate, as of Mar 2016
 
 **************************************************************************/
 
 /*-------------------------------------------------------------------------
  * testfl_VLof_atomic(): Test that a packet table with VL datatypes of atomic
- *	datatypes can be created and written correctly. (HDFFV-442)
+ *    datatypes can be created and written correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int testfl_VLof_atomic(void)
 {
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;	/* Variable length datatype */
-    hsize_t count;		/* Number of records in the table */
-    unsigned uu, vv;		/* Loop variables */
-    hvl_t   writeBuf[NRECORDS];	/* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];	/* Buffer to hold read data */
-    char    msg[80];		/* For error message */
-    herr_t  ret;		/* Returned status from a callee */
-
-    TESTING3("        with vlen of atomic");
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
+    hsize_t count;        /* Number of records in the table */
+    unsigned uu, vv;        /* Loop variables */
+    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
+    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
+    char    msg[80];        /* For error message */
+    herr_t  ret;        /* Returned status from a callee */
+
+    HL_TESTING3("        with vlen of atomic");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -1064,42 +1064,42 @@ static int testfl_VLof_atomic(void)
         if (writeBuf[uu].p == NULL) {
             fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-	}
+    }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++)
-	    ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
+        ((unsigned int *)writeBuf[uu].p)[vv] = uu * 10 + vv;
     } /* end for */
 
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create a vlen type that uses an atomic datatype as its base type */
     vltype = H5Tvlen_create (H5T_NATIVE_UINT);
     if (vltype < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a vlen datatype of an atomic type */
     ptable = H5PTcreate_fl(fid, PT_VLEN_ATOMIC, vltype, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Close the vlen datatype */
     if (H5Tclose(vltype) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -1107,33 +1107,33 @@ static int testfl_VLof_atomic(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     for (uu = 0; uu < NRECORDS; uu++)
         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]);
-	    }
+        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]);
+        }
         }
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -1150,7 +1150,7 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * testfl_VLof_comptype(): Test that a packet table with VL datatypes of
- *	compound datatypes can be created and written correctly. (HDFFV-442)
+ *    compound datatypes can be created and written correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
@@ -1162,18 +1162,18 @@ static int testfl_VLof_comptype(void)
         unsigned u;
         float f;
     } VLcomp_t;
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vltype=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   cmptype=H5I_INVALID_HID;	/* Compound datatype */
-    hvl_t   writeBuf[NRECORDS];	/* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];	/* Buffer to hold read data */
-    hsize_t count;		/* Number of records in the table */
-    unsigned uu, vv;		/* Loop variables */
-    char    msg[80];		/* For error message */
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vltype=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   cmptype=H5I_INVALID_HID;    /* Compound datatype */
+    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
+    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
+    hsize_t count;        /* Number of records in the table */
+    unsigned uu, vv;        /* Loop variables */
+    char    msg[80];        /* For error message */
     herr_t ret;
 
-    TESTING3("        with vlen of compound datatypes");
+    HL_TESTING3("        with vlen of compound datatypes");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -1181,7 +1181,7 @@ static int testfl_VLof_comptype(void)
         if(writeBuf[uu].p == NULL) {
             fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-	}
+    }
         writeBuf[uu].len = uu + 1;
         for (vv = 0; vv < (uu + 1); vv++) {
             ((VLcomp_t *)writeBuf[uu].p)[vv].u = uu + vv;
@@ -1192,48 +1192,48 @@ static int testfl_VLof_comptype(void)
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create the base compound type */
     cmptype = H5Tcreate(H5T_COMPOUND, sizeof(VLcomp_t));
     if (cmptype < 0)
-	goto error;
+    goto error;
 
     /* Insert fields */
     ret = H5Tinsert(cmptype, "u", HOFFSET(VLcomp_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5Tinsert(cmptype, "f", HOFFSET(VLcomp_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Create a variable length type that uses the VLcomp_t as its base type */
     vltype = H5Tvlen_create(cmptype);
     if (vltype < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a vlen datatype of compound datatype */
     ptable = H5PTcreate_fl(fid, PT_VLEN_COMP, vltype, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Release the datatypes */
     if (H5Tclose(cmptype) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(vltype) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)5, writeBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -1241,39 +1241,39 @@ static int testfl_VLof_comptype(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* 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);
-	    continue;
-	} /* write len != read 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]);
                 continue;
-	    } /* write value != read value */
-	}
+        } /* write value != read value */
+    }
     } /* end for */
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -1291,8 +1291,8 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * testfl_compound_VL_VL(): Test that a packet table of compound datatypes
- *	containing VL datatypes can be created and written
- *	correctly. (HDFFV-442)
+ *    containing VL datatypes can be created and written
+ *    correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
@@ -1303,23 +1303,23 @@ static int testfl_compound_VL_VLtype(void)
     typedef struct {
         unsigned u;
         float f;
-	hvl_t v;
+    hvl_t v;
     } compVLVL_t;
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   comp_vlvl=H5I_INVALID_HID;	/* ID of a compound datatype containing 
-					   a VL of VL of atomic datatype */
-    hsize_t count;		/* Number of records in the table */
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   vlofvl=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   comp_vlvl=H5I_INVALID_HID;    /* ID of a compound datatype containing
+                    a VL of VL of atomic datatype */
+    hsize_t count;        /* Number of records in the table */
     compVLVL_t writeBuf[NRECORDS];/* Buffer to hold data to be written */
     compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */
     hvl_t   *t1, *t2;
-    unsigned uu, vv, ww;	/* Loop variables */
-    char    msg[80];		/* For error message */
-    herr_t  ret;		/* Returned status from a callee */
+    unsigned uu, vv, ww;    /* Loop variables */
+    char    msg[80];        /* For error message */
+    herr_t  ret;        /* Returned status from a callee */
 
-    TESTING3("        with compound datatype containing vlen datatype");
+    HL_TESTING3("        with compound datatype containing vlen datatype");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -1329,15 +1329,15 @@ static int testfl_compound_VL_VLtype(void)
         if (writeBuf[uu].v.p == NULL) {
             fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
             goto error;
-	}
+    }
         writeBuf[uu].v.len = uu + L1_INCM;
         for (t1 = (hvl_t *)((writeBuf[uu].v).p), vv = 0; vv < (uu + L1_INCM); vv++, t1++)
-	{
+    {
             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);
-		goto error;
-	    }
+        if (t1->p == NULL) {
+        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        goto error;
+        }
             t1->len = vv + L2_INCM;
             for (ww = 0; ww < vv + L2_INCM; ww++)
                 ((unsigned int*)t1->p)[ww] = uu * 100 + vv * 10 + ww;
@@ -1347,58 +1347,58 @@ static int testfl_compound_VL_VLtype(void)
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create a VL datatype of an atomic type */
     vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
     if (vlatomic < 0)
-	goto error;
+    goto error;
 
     /* Create a VL datatype of the VL of atomic datatype */
     vlofvl = H5Tvlen_create (vlatomic);
     if (vlofvl < 0)
-	goto error;
+    goto error;
 
     /* Create the base compound type */
     comp_vlvl = H5Tcreate(H5T_COMPOUND, sizeof(compVLVL_t));
     if (comp_vlvl < 0)
-	goto error;
+    goto error;
 
     /* Insert fields: atomic, atomic, vlen */
     ret = H5Tinsert(comp_vlvl, "u", HOFFSET(compVLVL_t, u), H5T_NATIVE_UINT);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5Tinsert(comp_vlvl, "f", HOFFSET(compVLVL_t, f), H5T_NATIVE_FLOAT);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5Tinsert(comp_vlvl, "v", HOFFSET(compVLVL_t, v), vlofvl);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a compound datatype of vlen datatype */
     ptable = H5PTcreate_fl(fid, PT_COMP_VLEN, comp_vlvl, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(vlofvl) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(comp_vlvl) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)NRECORDS, writeBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -1406,7 +1406,7 @@ static int testfl_compound_VL_VLtype(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)NRECORDS, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Compare data read in */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -1441,19 +1441,19 @@ static int testfl_compound_VL_VLtype(void)
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -1472,27 +1472,27 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * testfl_VLof_VLtype(): Test that a packet table of VL datatype with VL
- *	datatypes of atomic datatypes can be created and written
- *	correctly. (HDFFV-442)
+ *    datatypes of atomic datatypes can be created and written
+ *    correctly. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 static int testfl_VLof_VLtype(void)
 {
-    hid_t   fid=H5I_INVALID_HID;	/* Test file identifier */
-    hid_t   ptable=H5I_INVALID_HID;	/* Packet table identifier */
-    hid_t   vlatomic=H5I_INVALID_HID;	/* Variable length datatype */
-    hid_t   vlofvl=H5I_INVALID_HID;	/* VL datatype of VL datatypes */
-    hsize_t count;		/* Number of records in the table */
-    hvl_t   *t1;		/* pointer to advance */
-    unsigned uu, vv, ww;	/* Loop variables */
-    hvl_t   writeBuf[NRECORDS];	/* Buffer to hold data to be written */
-    hvl_t   readBuf[NRECORDS];	/* Buffer to hold read data */
-    char    msg[80];		/* For error message */
-    herr_t  ret;		/* Returned status from a callee */
-
-    TESTING3("        with vlen datatype of vlen datatype");
+    hid_t   fid=H5I_INVALID_HID;    /* Test file identifier */
+    hid_t   ptable=H5I_INVALID_HID;    /* Packet table identifier */
+    hid_t   vlatomic=H5I_INVALID_HID;    /* Variable length datatype */
+    hid_t   vlofvl=H5I_INVALID_HID;    /* VL datatype of VL datatypes */
+    hsize_t count;        /* Number of records in the table */
+    hvl_t   *t1;        /* pointer to advance */
+    unsigned uu, vv, ww;    /* Loop variables */
+    hvl_t   writeBuf[NRECORDS];    /* Buffer to hold data to be written */
+    hvl_t   readBuf[NRECORDS];    /* Buffer to hold read data */
+    char    msg[80];        /* For error message */
+    herr_t  ret;        /* Returned status from a callee */
+
+    HL_TESTING3("        with vlen datatype of vlen datatype");
 
     /* Allocate and initialize VL data to write (copied from C test) */
     for (uu = 0; uu < NRECORDS; uu++) {
@@ -1503,12 +1503,12 @@ static int testfl_VLof_VLtype(void)
         } /* end if */
         writeBuf[uu].len = uu + 1;
         for (t1 = (hvl_t *)(writeBuf[uu].p), vv = 0; vv < (uu + 1); vv++, t1++)
-	{
+    {
             t1->p = HDmalloc((vv + 1) * sizeof(unsigned int));
-	    if (t1->p == NULL) {
-		fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
-		goto error;
-	    }
+        if (t1->p == NULL) {
+        fprintf(stderr, "Cannot allocate memory for VL data! uu=%u\n", uu);
+        goto error;
+        }
             t1->len = vv + 1;
             for (ww = 0; ww < (vv + 1); ww++)
                 ((unsigned int *)t1->p)[ww] = uu * 100 + vv * 10 + ww;
@@ -1518,39 +1518,39 @@ static int testfl_VLof_VLtype(void)
     /* Open the file */
     fid = H5Fopen(TESTFL_FILE_NAME, H5F_ACC_RDWR, H5P_DEFAULT);
     if (fid < 0)
-	goto error;
+    goto error;
 
     /* Create a VL datatype of an atomic type */
     vlatomic = H5Tvlen_create (H5T_NATIVE_UINT);
     if (vlatomic < 0)
-	goto error;
+    goto error;
 
     vlofvl = H5Tvlen_create (vlatomic);
     if (vlofvl < 0)
-	goto error;
+    goto error;
 
     /* Create a packet table that uses a vlen datatype of vlen datatype */
     ptable = H5PTcreate_fl(fid, PT_VLEN_VLEN, vlofvl, (hsize_t)1, 0);
 
     /* Ensure that PT is created successfully */
     if (ptable == H5I_INVALID_HID)
-	goto error;
+    goto error;
 
     /* Release datatypes */
     if (H5Tclose(vlatomic) < 0)
-	goto error;
+    goto error;
     if (H5Tclose(vlofvl) < 0)
-	goto error;
+    goto error;
 
     /* Write the entire buffer to the packet table */
     ret = H5PTappend(ptable, (size_t)5, writeBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Get the number of packets in the packet table, should be NRECORDS. */
     ret = H5PTget_num_packets(ptable, &count);
     if (ret < 0)
-	goto error;
+    goto error;
 
     sprintf(msg, "The number of packets in the packet table must be %u\n", NRECORDS);
     VERIFY(count == NRECORDS, msg);
@@ -1558,24 +1558,24 @@ static int testfl_VLof_VLtype(void)
     /* Read all five packets back */
     ret = H5PTread_packets(ptable, (hsize_t)0, (size_t)5, (void*)readBuf );
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Free the buffers */
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, readBuf);
     if (ret < 0)
-	goto error;
+    goto error;
     ret = H5PTfree_vlen_buff(ptable, NRECORDS, writeBuf);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the packet table */
     ret = H5PTclose(ptable);
     if (ret < 0)
-	goto error;
+    goto error;
 
     /* Close the file */
     if (H5Fclose(fid) < 0)
-	goto error;
+    goto error;
 
     PASSED();
     return SUCCEED;
@@ -1593,25 +1593,25 @@ error: /* An error has occurred.  Clean up and exit. */
 
 /*-------------------------------------------------------------------------
  * test_packet_table_with_varlen(): Invokes individual tests to ensure that
- *	packet tables with variable length are created and written correctly
- *	without the specific VL PT functionality. (HDFFV-442)
+ *    packet tables with variable length are created and written correctly
+ *    without the specific VL PT functionality. (HDFFV-442)
  *
  * 2016/01/27 -BMR
  *-------------------------------------------------------------------------
  */
 int test_packet_table_with_varlen(void)
 {
-    hid_t fid=H5I_INVALID_HID;		/* File identifier */
+    hid_t fid=H5I_INVALID_HID;        /* File identifier */
     int status = SUCCEED;
 
     /* Create a file using default properties */
     fid = H5Fcreate(TEST_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0)
-	return FAIL;
+    return FAIL;
 
     /* Close the file.  The file will be opened by each test function below */
     if (H5Fclose(fid) < 0)
-	return FAIL;
+    return FAIL;
 
     HDputs("Testing packet table with various variable-length datatypes");
 
@@ -1620,46 +1620,46 @@ int test_packet_table_with_varlen(void)
 
     /* Test variable length of a simple type */
     if (test_VLof_atomic() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test variable length of a compound type */
     if (test_VLof_comptype() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test compound type with variable length */
     if (test_compound_VL_VLtype() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test variable length of a variable length */
     if (test_VLof_VLtype() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test variable length of a variable length */
     if (test_H5PTis_varlen() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test adding attributes to packet table */
     if (test_attributes() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test accessor functions */
     if (test_accessors() < 0)
-	status = FAIL;
+    status = FAIL;
 
 /**************************************************************************
-	Calling test functions for deprecated function H5PTcreate_fl
-	Mar 2016, -BMR
+    Calling test functions for deprecated function H5PTcreate_fl
+    Mar 2016, -BMR
 
 **************************************************************************/
 
     /* Create a file using default properties */
     fid = H5Fcreate(TESTFL_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0)
-	return FAIL;
+    return FAIL;
 
     /* Close the file.  The file will be opened by each test function below */
     if (H5Fclose(fid) < 0)
-	return FAIL;
+    return FAIL;
 
     HDputs("Testing packet table with various variable-length datatypes - H5PTcreate_fl");
 
@@ -1668,19 +1668,19 @@ int test_packet_table_with_varlen(void)
 
     /* Test variable length of a simple type */
     if (testfl_VLof_atomic() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test variable length of a compound type */
     if (testfl_VLof_comptype() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test compound type with variable length */
     if (testfl_compound_VL_VLtype() < 0)
-	status = FAIL;
+    status = FAIL;
 
     /* Test variable length of a variable length */
     if (testfl_VLof_VLtype() < 0)
-	status = FAIL;
+    status = FAIL;
 
     return(status);
 }
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 0215697..1d6bcec 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -51,8 +51,6 @@
 #define NRECORDS         8
 #define NRECORDS_ADD     3
 
-#define TESTING2(WHAT) {printf("%-70s", "Testing     " WHAT); fflush(stdout);}
-
 /*-------------------------------------------------------------------------
 * structure used for all tests, a particle with properties
 *-------------------------------------------------------------------------
@@ -117,7 +115,7 @@ typedef struct particle3_t
  *-------------------------------------------------------------------------
  */
 
-/*  Push current alignment rule forcing 4-byte alignment boundary 
+/*  Push current alignment rule forcing 4-byte alignment boundary
  *  to the internal stack ...
  */
 #pragma pack(push,4)
@@ -129,7 +127,7 @@ typedef struct particle3_t
         float      aty[3];
         float      rro[2];
     } particle4_t;
-/* 
+/*
  * ... and restore original alignment rules from stack
  */
 #pragma pack(pop)
@@ -164,14 +162,14 @@ static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf )
     if ( ( HDstrcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
         rbuf[i].lati != wbuf[j].lati ||
         rbuf[i].longi != wbuf[j].longi ||
-	!H5_FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure)  ||
-	!H5_DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) )
+    !H5_FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure)  ||
+    !H5_DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) )
     {
         HDfprintf(stderr,"read and write buffers have differences\n");
         HDfprintf(stderr,"%s %ld %f %f %d\n",
-		  rbuf[i].name,rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
+        rbuf[i].name,rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
         HDfprintf(stderr,"%s %ld %f %f %d\n",
-		  wbuf[j].name,wbuf[j].longi,(double)wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
+        wbuf[j].name,wbuf[j].longi,(double)wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
         return -1;
     }
     return 0;
@@ -424,7 +422,7 @@ static int test_table(hid_t fid, int do_write)
         sizeof( rbuf[0].lati)
     };
 
-    const char *field_names4[NFIELDS+1] = 
+    const char *field_names4[NFIELDS+1] =
       { "F1", "F2", "F3", "F4", "F5", "F6"};
     hid_t       field_type4[NFIELDS+1];
     particle4_t fill_data[1] = { {9999999, -9999999, 999999, {999,999,999},{999,999,999}, {999,999}} };
@@ -458,7 +456,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("making table");
+        HL_TESTING2("making table");
 
         if (H5TBmake_table(TITLE,fid,"table1",FIELDS,RECORDS,type_size_mem,
             field_names,field_offset,field_type,
@@ -467,7 +465,7 @@ static int test_table(hid_t fid, int do_write)
         PASSED();
     }
 
-    TESTING2("reading table");
+    HL_TESTING2("reading table");
 
     /*-------------------------------------------------------------------------
     * read the table
@@ -497,7 +495,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("writing records");
+        HL_TESTING2("writing records");
 
         /* create an empty table */
         if (H5TBmake_table(TITLE,fid,"table2",FIELDS,RECORDS,type_size_mem,
@@ -540,7 +538,7 @@ static int test_table(hid_t fid, int do_write)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("reading records");
+    HL_TESTING2("reading records");
 
     /*-------------------------------------------------------------------------
     * read records, start at 0, read 8
@@ -584,7 +582,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("appending records");
+        HL_TESTING2("appending records");
 
         /*-------------------------------------------------------------------------
         * append 2 records
@@ -630,7 +628,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("inserting records");
+        HL_TESTING2("inserting records");
 
         /*-------------------------------------------------------------------------
         * insert 2 records
@@ -690,7 +688,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("deleting records");
+        HL_TESTING2("deleting records");
 
         /*-------------------------------------------------------------------------
         * Create a table
@@ -883,54 +881,54 @@ static int test_table(hid_t fid, int do_write)
     /*------------------------------------------------------------------------
      * Functions tested:
      *
-     * H5TBdelete_record -- With differing memory layout from machine memory 
+     * H5TBdelete_record -- With differing memory layout from machine memory
      *                      layout. HDFFV-8055
      *
      *-------------------------------------------------------------------------
      */
     if (do_write)
     {
-        TESTING2("deleting records (differing memory layout)");
+        HL_TESTING2("deleting records (differing memory layout)");
 
-	dims = 3;
-	arry3_32f = H5Tarray_create2(H5T_NATIVE_FLOAT,  1, &dims); 
+    dims = 3;
+    arry3_32f = H5Tarray_create2(H5T_NATIVE_FLOAT,  1, &dims);
 
-	dims = 2;
-	arry2_32f = H5Tarray_create2(H5T_NATIVE_FLOAT,  1, &dims); 
+    dims = 2;
+    arry2_32f = H5Tarray_create2(H5T_NATIVE_FLOAT,  1, &dims);
 
-	/* Initialize the field field_type */
-	field_type4[0] = H5T_NATIVE_UINT32;
-	field_type4[1] = H5T_NATIVE_DOUBLE;
-	field_type4[2] = H5T_NATIVE_DOUBLE;
-	field_type4[3] = arry3_32f;
-	field_type4[4] = arry3_32f;
-	field_type4[5] = arry2_32f;
+    /* Initialize the field field_type */
+    field_type4[0] = H5T_NATIVE_UINT32;
+    field_type4[1] = H5T_NATIVE_DOUBLE;
+    field_type4[2] = H5T_NATIVE_DOUBLE;
+    field_type4[3] = arry3_32f;
+    field_type4[4] = arry3_32f;
+    field_type4[5] = arry2_32f;
 
-	/* Make the table */
-	if (H5TBmake_table("Table Title",fid,"table",NFIELDS+1,(hsize_t)NRECORDS,
+    /* Make the table */
+    if (H5TBmake_table("Table Title",fid,"table",NFIELDS+1,(hsize_t)NRECORDS,
                           tbl_size, field_names4, tbl_offset, field_type4,
                           chunk_size, fill_data, compress, p_data)<0)
-	  goto out;
-	/* Delete records */
-	start    = 3;
-	nrecords = 3;
-	if (H5TBdelete_record(fid, "table", start, nrecords)<0)
-	  goto out;;
-	/* Get table info */
-	if (H5TBget_table_info(fid,"table", &nfields_out, &nrecords_out)<0)
-	  goto out;
-	/* check */
-	if( (int)nfields_out != (int)NFIELDS+1)
-	  goto out;
-      
-	if( (int)nrecords_out != (int)NRECORDS-3)
-	  goto out;
-    
-	/* close type */
-	H5Tclose(arry3_32f);
-	H5Tclose(arry2_32f);
-
-	PASSED();
+    goto out;
+    /* Delete records */
+    start    = 3;
+    nrecords = 3;
+    if (H5TBdelete_record(fid, "table", start, nrecords)<0)
+    goto out;;
+    /* Get table info */
+    if (H5TBget_table_info(fid,"table", &nfields_out, &nrecords_out)<0)
+    goto out;
+    /* check */
+    if( (int)nfields_out != (int)NFIELDS+1)
+    goto out;
+
+    if( (int)nrecords_out != (int)NRECORDS-3)
+    goto out;
+
+    /* close type */
+    H5Tclose(arry3_32f);
+    H5Tclose(arry2_32f);
+
+    PASSED();
     }
 
     /*-------------------------------------------------------------------------
@@ -945,7 +943,7 @@ static int test_table(hid_t fid, int do_write)
 
     if (do_write)
     {
-        TESTING2("adding records");
+        HL_TESTING2("adding records");
 
         /* create 2 tables */
         if (H5TBmake_table(TITLE,fid,"table4",FIELDS,RECORDS,type_size_mem,
@@ -1005,7 +1003,7 @@ static int test_table(hid_t fid, int do_write)
 
     if (do_write)
     {
-        TESTING2("combining tables");
+        HL_TESTING2("combining tables");
 
         /* create 2 tables */
         if (H5TBmake_table(TITLE,fid,"table6",FIELDS,RECORDS,type_size_mem,
@@ -1100,7 +1098,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("writing fields by name");
+        HL_TESTING2("writing fields by name");
 
         /* make an empty table with fill values */
         if (H5TBmake_table(TITLE,fid,"table9",FIELDS,RECORDS,type_size_mem,
@@ -1138,10 +1136,10 @@ static int test_table(hid_t fid, int do_write)
                 {
                     if ( rbuf[i].lati       != position_in[i-NRECORDS_ADD+1].lati ||
                         rbuf[i].longi       != position_in[i-NRECORDS_ADD+1].longi ||
-			!H5_FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
+            !H5_FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
                     {
                         HDfprintf(stderr,"%ld %f %d\n",
-				  rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].lati);
+                rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].lati);
                         HDfprintf(stderr,"%ld %f %d\n",
                             position_in[i].longi,(double)pressure_in[i],position_in[i].lati);
                         goto out;
@@ -1163,7 +1161,7 @@ static int test_table(hid_t fid, int do_write)
     *
     *-------------------------------------------------------------------------
     */
-    TESTING2("reading fields by name");
+    HL_TESTING2("reading fields by name");
 
     /*-------------------------------------------------------------------------
     * write and read the "Pressure" field
@@ -1191,7 +1189,7 @@ static int test_table(hid_t fid, int do_write)
     if ( H5TBread_fields_name(fid,"table10","DoesNotExist",start,nrecords,
         sizeof(float),0,field_sizes_pre,pressure_out) >=0)
       goto out;
-    
+
     /* read the "Pressure" field */
     if ( H5TBread_fields_name(fid,"table10","Pressure",start,nrecords,
         sizeof(float),0,field_sizes_pre,pressure_out)<0)
@@ -1263,7 +1261,7 @@ static int test_table(hid_t fid, int do_write)
     for( i = 0; i < NRECORDS; i++ )
     {
         if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
-	     !H5_FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
+        !H5_FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
                 goto out;
         }
     }
@@ -1292,7 +1290,7 @@ static int test_table(hid_t fid, int do_write)
     {
         hsize_t iistart = start;
         if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[iistart+i].name ) != 0 ) ||
-	     !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[iistart+i].pressure) ) {
+        !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[iistart+i].pressure) ) {
                 goto out;
         }
     }
@@ -1311,7 +1309,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("writing fields by index");
+        HL_TESTING2("writing fields by index");
 
         /* make an empty table */
         if (H5TBmake_table(TITLE,fid,"table11",FIELDS,RECORDS,type_size_mem,
@@ -1351,7 +1349,7 @@ static int test_table(hid_t fid, int do_write)
             {
                 if ( rbuf[i].lati        != position_in[i-NRECORDS_ADD+1].lati ||
                     rbuf[i].longi       != position_in[i-NRECORDS_ADD+1].longi ||
-		    !H5_FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
+            !H5_FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
                     goto out;
             }
         }
@@ -1369,7 +1367,7 @@ static int test_table(hid_t fid, int do_write)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("reading fields by index");
+    HL_TESTING2("reading fields by index");
 
     if (do_write)
     {
@@ -1470,8 +1468,8 @@ static int test_table(hid_t fid, int do_write)
     for( i = 0; i < NRECORDS; i++ )
     {
       if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
-	   !H5_FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
-	goto out;
+    !H5_FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
+    goto out;
       }
     }
 
@@ -1501,7 +1499,7 @@ static int test_table(hid_t fid, int do_write)
     {
         int iistart = (int) start;
         if ( ( HDstrcmp( namepre_out[i].name,  wbuf[iistart+(int)i].name ) != 0 ) ||
-	     !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, wbuf[iistart+(int)i].pressure) ) {
+        !H5_FLT_ABS_EQUAL(namepre_out[i].pressure, wbuf[iistart+(int)i].pressure) ) {
                 goto out;
         }
     }
@@ -1520,7 +1518,7 @@ static int test_table(hid_t fid, int do_write)
 
     if (do_write)
     {
-        TESTING2("inserting fields");
+        HL_TESTING2("inserting fields");
 
         /* make a table */
         if (H5TBmake_table(TITLE,fid,"table13",FIELDS,RECORDS,type_size_mem,
@@ -1544,8 +1542,8 @@ static int test_table(hid_t fid, int do_write)
             if ( ( HDstrcmp( rbuf2[i].name,  wbuf[i].name ) != 0 ) ||
                 rbuf2[i].lati          != wbuf[i].lati ||
                 rbuf2[i].longi         != wbuf[i].longi ||
-		!H5_FLT_ABS_EQUAL(rbuf2[i].pressure,wbuf[i].pressure) ||
-		!H5_DBL_ABS_EQUAL(rbuf2[i].temperature,wbuf[i].temperature) ||
+        !H5_FLT_ABS_EQUAL(rbuf2[i].pressure,wbuf[i].pressure) ||
+        !H5_DBL_ABS_EQUAL(rbuf2[i].temperature,wbuf[i].temperature) ||
                 rbuf2[i].new_field     != buf_new[i] ) {
                     goto out;
             }
@@ -1563,7 +1561,7 @@ static int test_table(hid_t fid, int do_write)
     */
     if (do_write)
     {
-        TESTING2("deleting fields");
+        HL_TESTING2("deleting fields");
 
         /* make a table */
         if (H5TBmake_table(TITLE,fid,"table14",FIELDS,RECORDS,type_size_mem,
@@ -1585,7 +1583,7 @@ static int test_table(hid_t fid, int do_write)
             if ( ( HDstrcmp( rbuf3[i].name, wbuf[i].name ) != 0 ) ||
                 rbuf3[i].lati != wbuf[i].lati ||
                 rbuf3[i].longi != wbuf[i].longi ||
-		!H5_DBL_ABS_EQUAL(rbuf3[i].temperature,wbuf[i].temperature) ) {
+        !H5_DBL_ABS_EQUAL(rbuf3[i].temperature,wbuf[i].temperature) ) {
                     goto out;
             }
         }
@@ -1603,7 +1601,7 @@ static int test_table(hid_t fid, int do_write)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("getting table info");
+    HL_TESTING2("getting table info");
 
     /* get table info  */
     if ( H5TBget_table_info (fid, "table1", &rfields, &rrecords ) < 0 )
@@ -1624,7 +1622,7 @@ static int test_table(hid_t fid, int do_write)
     *-------------------------------------------------------------------------
     */
 
-    TESTING2("getting field info");
+    HL_TESTING2("getting field info");
 
     /* alocate */
     names_out = (char**) HDmalloc( sizeof(char*) * (size_t)NFIELDS );
diff --git a/test/accum.c b/test/accum.c
index 4cef35a..3c308b7 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -1846,11 +1846,11 @@ test_swmr_write_big(hbool_t newest_format)
      * by the environment variable.
      */
     driver = HDgetenv("HDF5_DRIVER");
-    if (!H5FD_supports_swmr_test(driver)) {
+    if(!H5FD_supports_swmr_test(driver)) {
         SKIPPED();
         HDputs("    Test skipped due to VFD not supporting SWMR I/O.");
         return 0;
-    } /* end if */
+    }
 
     /* File access property list */
     if((fapl = h5_fileaccess()) < 0)
@@ -1968,14 +1968,15 @@ test_swmr_write_big(hbool_t newest_format)
         /* Flush the accumulator */
         if(accum_reset(rf) < 0)
             FAIL_STACK_ERROR;
-        /* Close the property list */
-        if(H5Pclose(fapl) < 0) 
-            FAIL_STACK_ERROR;
 
         /* Close and remove the file */
         if(H5Fclose(fid) < 0) 
             FAIL_STACK_ERROR;
 
+        /* Close the property list */
+        if(H5Pclose(fapl) < 0) 
+            FAIL_STACK_ERROR;
+
         /* Pop API context */
         if(api_ctx_pushed && H5CX_pop() < 0) FAIL_STACK_ERROR
         api_ctx_pushed = FALSE;
@@ -1993,11 +1994,11 @@ test_swmr_write_big(hbool_t newest_format)
 
 error:
     /* Closing and remove the file */
-    H5Pclose(fapl);
     H5Fclose(fid);
 
     if(api_ctx_pushed) H5CX_pop();
 
+    H5Pclose(fapl);
     HDremove(SWMR_FILENAME);
 
     /* Release memory */
diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c
index 5bda46a..157712f 100644
--- a/test/accum_swmr_reader.c
+++ b/test/accum_swmr_reader.c
@@ -56,9 +56,8 @@ main(void)
      * by the environment variable.
      */
     driver = HDgetenv("HDF5_DRIVER");
-    if(!H5FD_supports_swmr_test(driver)) {
+    if(!H5FD_supports_swmr_test(driver))
         return EXIT_SUCCESS;
-    }
 
     /* Initialize buffers */
     for(u = 0; u < 1024; u++) {
@@ -71,7 +70,7 @@ main(void)
 
     /* Open the file with SWMR_READ */
     if((fid = H5Fopen(SWMR_FILENAME, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
-	    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     /* Push API context */
     if(H5CX_push() < 0) FAIL_STACK_ERROR
@@ -79,21 +78,21 @@ main(void)
 
     /* Get H5F_t * to internal file structure */
     if(NULL == (f = (H5F_t *)H5I_object(fid))) 
-	    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     /* Should read in [1024, 2024] with buf data */
     if(H5F_block_read(f, H5FD_MEM_DEFAULT, (haddr_t)1024, (size_t)1024, rbuf) < 0)
-	    FAIL_STACK_ERROR;
+        FAIL_STACK_ERROR;
 
     /* Verify the data read is correct */
     if(HDmemcmp(buf, rbuf, (size_t)1024) != 0) 
-	    TEST_ERROR;
+        TEST_ERROR;
 
     /* CLose the file */
     if(H5Pclose(fapl) < 0)
-	    FAIL_STACK_ERROR;
+        FAIL_STACK_ERROR;
     if(H5Fclose(fid) < 0)
-	    FAIL_STACK_ERROR;
+        FAIL_STACK_ERROR;
 
     /* Pop API context */
     if(api_ctx_pushed && H5CX_pop() < 0) FAIL_STACK_ERROR
@@ -101,8 +100,11 @@ main(void)
 
     return EXIT_SUCCESS;
 
-error: 
-    H5Fclose(fid);
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Fclose(fid);
+    } H5E_END_TRY;
 
     if(api_ctx_pushed) H5CX_pop();
 
diff --git a/test/btree2.c b/test/btree2.c
index d26fed5..fb18048 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -20,13 +20,13 @@
  * This file needs to access private datatypes from the H5B2 package.
  * This file also needs to access the v2 B-tree testing code.
  */
-#define H5B2_FRIEND		/*suppress error about including H5B2pkg	  */
+#define H5B2_FRIEND        /*suppress error about including H5B2pkg      */
 #define H5B2_TESTING
 #include "H5B2pkg.h"
 
 /* Other private headers that this test requires */
 #include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Iprivate.h"
+#include "H5Iprivate.h"        /* Virtual Object Layer                     */
 
 const char *FILENAME[] = {
     "btree2",
@@ -50,16 +50,16 @@ typedef struct bt2_test_param_t {
     hbool_t reopen_btree;               /* Whether to re-open the B-tree during the test */
 } bt2_test_param_t;
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	init_cparam
+ * Function:    init_cparam
  *
- * Purpose:	Initialize v2 B-tree creation parameter structure
+ * Purpose:    Initialize v2 B-tree creation parameter structure
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, October 29, 2009
  *
  *-------------------------------------------------------------------------
@@ -90,16 +90,16 @@ init_cparam(H5B2_create_t *cparam, H5B2_create_t *cparam2)
     return(0);
 } /* init_cparam() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_file
+ * Function:    create_file
  *
- * Purpose:	Perform common "creation" operations on file
+ * Purpose:    Perform common "creation" operations on file
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November  5, 2009
  *
  *-------------------------------------------------------------------------
@@ -107,7 +107,7 @@ init_cparam(H5B2_create_t *cparam, H5B2_create_t *cparam2)
 static int
 create_file(hid_t *file, H5F_t **f, hid_t fapl)
 {
-    char	filename[1024];         /* Filename to use */
+    char    filename[1024];         /* Filename to use */
 
     /* Set the filename to use for this test (dependent on fapl) */
     h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
@@ -131,16 +131,16 @@ error:
     return(-1);
 } /* end create_file() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_btree
+ * Function:    create_btree
  *
- * Purpose:	Perform common "create" operations on B-tree for testing
+ * Purpose:    Perform common "create" operations on B-tree for testing
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November  5, 2009
  *
  *-------------------------------------------------------------------------
@@ -164,16 +164,16 @@ error:
     return(-1);
 } /* end create_btree() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	reopen_file
+ * Function:    reopen_file
  *
- * Purpose:	Re-open the file
+ * Purpose:    Re-open the file
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, December 28, 2015
  *
  *-------------------------------------------------------------------------
@@ -181,7 +181,7 @@ error:
 static int
 reopen_file(hid_t *file, H5F_t **f, hid_t fapl)
 {
-    char	filename[1024];         /* Filename to use */
+    char    filename[1024];         /* Filename to use */
 
     /* Set the filename to use for this test (dependent on fapl) */
     h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
@@ -205,16 +205,16 @@ error:
     return(-1);
 } /* end create_file() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	reopen_btree
+ * Function:    reopen_btree
  *
- * Purpose:	Perform common "re-open" operations on B-tree for testing
+ * Purpose:    Perform common "re-open" operations on B-tree for testing
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November  5, 2009
  *
  *-------------------------------------------------------------------------
@@ -241,16 +241,16 @@ error:
     return(-1);
 } /* end reopen_btree() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_stats
+ * Function:    check_stats
  *
- * Purpose:	Check statistics about v1 B-tree
+ * Purpose:    Check statistics about v1 B-tree
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November  5, 2009
  *
  *-------------------------------------------------------------------------
@@ -275,16 +275,16 @@ error:
     return(-1);
 } /* end check_stats() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_node_depth
+ * Function:    check_node_depth
  *
- * Purpose:	Check the depth of the node containing a record
+ * Purpose:    Check the depth of the node containing a record
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November  5, 2009
  *
  *-------------------------------------------------------------------------
@@ -306,16 +306,16 @@ error:
     return(-1);
 } /* end check_node_depth() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_node_info
+ * Function:    check_node_info
  *
- * Purpose:	Check the info of the node containing a record
+ * Purpose:    Check the info of the node containing a record
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, November  6, 2009
  *
  *-------------------------------------------------------------------------
@@ -340,16 +340,16 @@ error:
     return(-1);
 } /* end check_node_info() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	iter_cb
+ * Function:    iter_cb
  *
- * Purpose:	v2 B-tree iterator callback
+ * Purpose:    v2 B-tree iterator callback
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Wednesday, February 16, 2005
  *
  *-------------------------------------------------------------------------
@@ -367,16 +367,16 @@ iter_cb(const void *_record, void *_op_data)
     return(H5_ITER_CONT);
 } /* end iter_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	iter_rec_cb
+ * Function:    iter_rec_cb
  *
- * Purpose:	v2 B-tree iterator callback for H5B2_test_rec_t records
+ * Purpose:    v2 B-tree iterator callback for H5B2_test_rec_t records
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, December 25, 2015
  *
  *-------------------------------------------------------------------------
@@ -397,16 +397,16 @@ iter_rec_cb(const void *_record, void *_op_data)
     return(H5_ITER_CONT);
 } /* end iter_rec_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	find_cb
+ * Function:    find_cb
  *
- * Purpose:	v2 B-tree find callback
+ * Purpose:    v2 B-tree find callback
  *
- * Return:	Success:	TRUE/FALSE
- *		Failure:	FAIL
+ * Return:    Success:    TRUE/FALSE
+ *        Failure:    FAIL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, February 24, 2005
  *
  *-------------------------------------------------------------------------
@@ -423,16 +423,16 @@ find_cb(const void *_record, void *_op_data)
     return(TRUE);
 } /* end find_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	find_rec_cb
+ * Function:    find_rec_cb
  *
- * Purpose:	v2 B-tree find callback for H5B2_test_rec_t records
+ * Purpose:    v2 B-tree find callback for H5B2_test_rec_t records
  *
- * Return:	Success:	TRUE/FALSE
- *		Failure:	FAIL
+ * Return:    Success:    TRUE/FALSE
+ *        Failure:    FAIL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, December 25, 2015
  *
  *-------------------------------------------------------------------------
@@ -450,18 +450,18 @@ find_rec_cb(const void *_record, void *_op_data)
     return(TRUE);
 } /* end find_rec_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	find_dec_cb
+ * Function:    find_dec_cb
  *
- * Purpose:	v2 B-tree find callback for indexing in decreasing order
+ * Purpose:    v2 B-tree find callback for indexing in decreasing order
  *
- * Note:	Currently hard-wired to "insert_lots" test
+ * Note:    Currently hard-wired to "insert_lots" test
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  7, 2006
  *
  *-------------------------------------------------------------------------
@@ -478,16 +478,16 @@ find_dec_cb(const void *_record, void *_op_data)
     return(0);
 } /* end find_dec_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	index_rec_cb
+ * Function:    index_rec_cb
  *
- * Purpose:	v2 B-tree index callback for H5B2_test_rec_t records
+ * Purpose:    v2 B-tree index callback for H5B2_test_rec_t records
  *
- * Return:	Success:	TRUE/FALSE
- *		Failure:	FAIL
+ * Return:    Success:    TRUE/FALSE
+ *        Failure:    FAIL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, December 25, 2015
  *
  *-------------------------------------------------------------------------
@@ -506,17 +506,17 @@ index_rec_cb(const void *_record, void *_op_data)
     return(TRUE);
 } /* end index_rec_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	neighbor_cb
+ * Function:    neighbor_cb
  *
- * Purpose:	v2 B-tree neighbor callback
+ * Purpose:    v2 B-tree neighbor callback
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -532,17 +532,17 @@ neighbor_cb(const void *_record, void *_op_data)
     return(0);
 } /* end neighbor_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	modify_cb
+ * Function:    modify_cb
  *
- * Purpose:	v2 B-tree modify callback
+ * Purpose:    v2 B-tree modify callback
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March 10, 2005
  *
  *-------------------------------------------------------------------------
@@ -559,16 +559,16 @@ modify_cb(void *_record, void *_op_data, hbool_t *changed)
     return(0);
 } /* end modify_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	modify_rec_cb
+ * Function:    modify_rec_cb
  *
- * Purpose:	v2 B-tree modify callback for H5B2_test_rec_t records
+ * Purpose:    v2 B-tree modify callback for H5B2_test_rec_t records
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, December 25, 2015
  *
  *-------------------------------------------------------------------------
@@ -586,17 +586,17 @@ modify_rec_cb(void *_record, void *_op_data, hbool_t *changed)
     return(0);
 } /* end modify_rec_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	no_modify_cb
+ * Function:    no_modify_cb
  *
- * Purpose:	v2 B-tree modify callback for updates which shouldn't change
- *		the record (ie. inserting not modifying)
+ * Purpose:    v2 B-tree modify callback for updates which shouldn't change
+ *        the record (ie. inserting not modifying)
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Wednesday, December 23, 2015
  *
  *-------------------------------------------------------------------------
@@ -610,17 +610,17 @@ no_modify_cb(void H5_ATTR_UNUSED *_record, void H5_ATTR_UNUSED *_op_data,
     return(1);
 } /* end no_modify_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	remove_cb
+ * Function:    remove_cb
  *
- * Purpose:	v2 B-tree remove callback
+ * Purpose:    v2 B-tree remove callback
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, August 8, 2006
  *
  *-------------------------------------------------------------------------
@@ -636,16 +636,16 @@ remove_cb(const void *_record, void *_op_data)
     return(0);
 } /* end remove_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_basic
+ * Function:    test_insert_basic
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, February  3, 2005
  *
  *-------------------------------------------------------------------------
@@ -654,8 +654,8 @@ static unsigned
 test_insert_basic(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -702,7 +702,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to index record in B-tree with no records */
     idx = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)0, find_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)0, find_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -746,7 +746,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to index non-existant record in B-tree with 1 record */
     idx = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, find_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, find_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -803,7 +803,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to index non-existant record in B-tree with several records */
     idx = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, find_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, find_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -841,24 +841,24 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_insert_basic() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_split_root
+ * Function:    test_insert_split_root
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It also continues to add a few more records to each of the
  *              left and right leaf nodes after the split
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, February  3, 2005
  *
  *-------------------------------------------------------------------------
@@ -867,8 +867,8 @@ static unsigned
 test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -979,7 +979,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to index non-existant record in level-1 B-tree */
     idx = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC+2), find_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC+2), find_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -1016,25 +1016,25 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_split_root() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level1_2leaf_redistrib
+ * Function:    test_insert_level1_2leaf_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              redistribution
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, February  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -1043,8 +1043,8 @@ static unsigned
 test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -1170,25 +1170,25 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level1_2leaf_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level1_side_split
+ * Function:    test_insert_level1_side_split
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              split, adding another node to the B-tree
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, February  9, 2005
  *
  *-------------------------------------------------------------------------
@@ -1197,8 +1197,8 @@ static unsigned
 test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -1329,27 +1329,27 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level1_side_split() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level1_3leaf_redistrib
+ * Function:    test_insert_level1_3leaf_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              split, adding another node to the B-tree, then continues to
  *              add records until a 3 node redistribution occurs
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, February 10, 2005
  *
  *-------------------------------------------------------------------------
@@ -1358,8 +1358,8 @@ static unsigned
 test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -1472,26 +1472,26 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level1_3leaf_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level1_middle_split
+ * Function:    test_insert_level1_middle_split
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              split, adding another node to the B-tree, then continues to
  *              add records until a 3 node split occurs
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, February 10, 2005
  *
  *-------------------------------------------------------------------------
@@ -1500,8 +1500,8 @@ static unsigned
 test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -1594,22 +1594,22 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level1_middle_split() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_make_level2
+ * Function:    test_insert_make_level2
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 11, 2005
  *
  *-------------------------------------------------------------------------
@@ -1618,8 +1618,8 @@ static unsigned
 test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -1735,7 +1735,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to index non-existant record in level-2 B-tree */
     idx = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC * 30), find_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC * 30), find_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -1773,24 +1773,24 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_make_level2() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level2_leaf_redistrib
+ * Function:    test_insert_level2_leaf_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree and then adds enough more
  *              records to force the leaves to redistribute
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, February 17, 2005
  *
  *-------------------------------------------------------------------------
@@ -1799,8 +1799,8 @@ static unsigned
 test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -2001,24 +2001,24 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level2_leaf_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level2_leaf_split
+ * Function:    test_insert_level2_leaf_split
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree and then adds enough more
  *              records to force leaves to split.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, February 17, 2005
  *
  *-------------------------------------------------------------------------
@@ -2027,8 +2027,8 @@ static unsigned
 test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -2233,25 +2233,25 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level2_leaf_split() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level2_2internal_redistrib
+ * Function:    test_insert_level2_2internal_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree and then adds enough more
  *              records to force the left-most and right-most internal nodes to
  *              redistribute.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 18, 2005
  *
  *-------------------------------------------------------------------------
@@ -2260,8 +2260,8 @@ static unsigned
 test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -2404,25 +2404,25 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level2_2internal_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level2_2internal_split
+ * Function:    test_insert_level2_2internal_split
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree and then adds enough more
  *              records to force the left-most and right-most internal nodes to
  *              split.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 18, 2005
  *
  *-------------------------------------------------------------------------
@@ -2431,8 +2431,8 @@ static unsigned
 test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -2581,26 +2581,26 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level2_2internal_split() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level2_3internal_redistrib
+ * Function:    test_insert_level2_3internal_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree and then adds enough more
  *              records to force the left-most and right-most internal nodes to
  *              split and more records to force a 3 node redistribution of the
  *              internal nodes.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, February 19, 2005
  *
  *-------------------------------------------------------------------------
@@ -2609,8 +2609,8 @@ static unsigned
 test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -2758,26 +2758,26 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level2_3internal_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_level2_3internal_split
+ * Function:    test_insert_level2_3internal_split
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree and then adds enough more
  *              records to force the left-most and right-most internal nodes to
  *              split and more records to force a 3->4 node split of the
  *              internal nodes.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, February 19, 2005
  *
  *-------------------------------------------------------------------------
@@ -2786,8 +2786,8 @@ static unsigned
 test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -2939,23 +2939,23 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_insert_level2_3internal_split() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_insert_lots
+ * Function:    test_insert_lots
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts many
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts many
  *              records in random order, enough to make at a level 4 B-tree.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, February 19, 2005
  *
  *-------------------------------------------------------------------------
@@ -2964,9 +2964,9 @@ static unsigned
 test_insert_lots(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[1024];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[1024];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -3099,13 +3099,13 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
 
     /* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY*3), find_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY*3), find_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
         TEST_ERROR
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY*3), find_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY*3), find_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -3170,22 +3170,22 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     HDfree(records);
     return 1;
 } /* test_insert_lots() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_basic
+ * Function:    test_update_basic
  *
- * Purpose:	Basic tests for the v2 B-tree update operation
+ * Purpose:    Basic tests for the v2 B-tree update operation
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Wednesday, December 23, 2015
  *
  *-------------------------------------------------------------------------
@@ -3194,8 +3194,8 @@ static unsigned
 test_update_basic(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_test_rec_t record;             /* Record to insert into tree */
@@ -3257,7 +3257,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in B-tree with 1 record */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -3321,7 +3321,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in B-tree with 1 record */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -3391,7 +3391,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in B-tree with several records */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -3478,7 +3478,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in B-tree with several records */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -3537,24 +3537,24 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_update_basic() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_split_root
+ * Function:    test_update_split_root
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It also continues to add a few more records to each of the
  *              left and right leaf nodes after the split
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Wednesday, December 23, 2015
  *
  *-------------------------------------------------------------------------
@@ -3563,8 +3563,8 @@ static unsigned
 test_update_split_root(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_test_rec_t record;             /* Record to insert into tree */
@@ -3736,7 +3736,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in level-1 B-tree */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC + 2), index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC + 2), index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -3788,25 +3788,25 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_update_split_root() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_level1_2leaf_redistrib
+ * Function:    test_update_level1_2leaf_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              redistribution
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, December 26, 2015
  *
  *-------------------------------------------------------------------------
@@ -3815,8 +3815,8 @@ static unsigned
 test_update_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_test_rec_t record;             /* Record to insert into tree */
@@ -3946,25 +3946,25 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_update_level1_2leaf_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_level1_side_split
+ * Function:    test_update_level1_side_split
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              split, adding another node to the B-tree
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, December 26, 2015
  *
  *-------------------------------------------------------------------------
@@ -3973,8 +3973,8 @@ static unsigned
 test_update_level1_side_split(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_test_rec_t record;             /* Record to insert into tree */
@@ -4109,27 +4109,27 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_update_level1_side_split() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_level1_3leaf_redistrib
+ * Function:    test_update_level1_3leaf_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              split, adding another node to the B-tree, then continues to
  *              add records until a 3 node redistribution occurs
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, December 26, 2015
  *
  *-------------------------------------------------------------------------
@@ -4138,8 +4138,8 @@ static unsigned
 test_update_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_test_rec_t record;             /* Record to insert into tree */
@@ -4256,26 +4256,26 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_update_level1_3leaf_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_level1_middle_split
+ * Function:    test_update_level1_middle_split
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to split the root node and force the tree to depth 1.
  *              It continues to add a more records to the each of the
  *              left and right leaf nodes after the split to force a 2 node
  *              split, adding another node to the B-tree, then continues to
  *              add records until a 3 node split occurs
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, December 26, 2015
  *
  *-------------------------------------------------------------------------
@@ -4284,8 +4284,8 @@ static unsigned
 test_update_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_test_rec_t record;             /* Record to insert into tree */
@@ -4381,22 +4381,22 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_update_level1_middle_split() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_make_level2
+ * Function:    test_update_make_level2
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts enough
  *              records to make a level 2 B-tree
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, December 26, 2015
  *
  *-------------------------------------------------------------------------
@@ -4405,8 +4405,8 @@ static unsigned
 test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_test_rec_t record;             /* Record to insert into tree */
@@ -4541,7 +4541,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in level-2 B-tree */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -4706,7 +4706,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in level-2 B-tree */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -4881,7 +4881,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Attempt to index non-existant record in level-2 B-tree */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -4934,22 +4934,22 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_update_make_level2() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_update_lots
+ * Function:    test_update_lots
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts many
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts many
  *              records in random order, enough to make at a level 4 B-tree.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Sunday, December 27, 2015
  *
  *-------------------------------------------------------------------------
@@ -4958,8 +4958,8 @@ static unsigned
 test_update_lots(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     time_t      curr_time;              /* Current time, for seeding random number generator */
@@ -5086,13 +5086,13 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
 
     /* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
         TEST_ERROR
     H5E_BEGIN_TRY {
-	ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
+    ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -5174,23 +5174,23 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     HDfree(records);
 
     return 1;
 } /* test_update_lots() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_basic
+ * Function:    test_remove_basic
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 25, 2005
  *
  *-------------------------------------------------------------------------
@@ -5199,8 +5199,8 @@ static unsigned
 test_remove_basic(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -5231,7 +5231,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to remove a record from a B-tree with no records */
     record = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_remove(bt2, &record, NULL, NULL);
+    ret = H5B2_remove(bt2, &record, NULL, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -5351,7 +5351,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam,
 
     record = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_remove(bt2, &record, NULL, NULL);
+    ret = H5B2_remove(bt2, &record, NULL, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -5483,21 +5483,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_basic() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_noredistrib
+ * Function:    test_remove_level1_noredistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 25, 2005
  *
  *-------------------------------------------------------------------------
@@ -5506,8 +5506,8 @@ static unsigned
 test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -5554,7 +5554,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to remove a non-existant record from a B-tree with 1 record */
     record = (INSERT_SPLIT_ROOT_NREC * 2) + 1;
     H5E_BEGIN_TRY {
-	ret = H5B2_remove(bt2, &record, NULL, NULL);
+    ret = H5B2_remove(bt2, &record, NULL, NULL);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -5705,21 +5705,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_noredistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_redistrib
+ * Function:    test_remove_level1_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -5728,8 +5728,8 @@ static unsigned
 test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -5901,21 +5901,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_2leaf_merge
+ * Function:    test_remove_level1_2leaf_merge
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -5924,8 +5924,8 @@ static unsigned
 test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -6079,21 +6079,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_2leaf_merge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_3leaf_merge
+ * Function:    test_remove_level1_3leaf_merge
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -6102,8 +6102,8 @@ static unsigned
 test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -6204,21 +6204,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_3leaf_merge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_promote
+ * Function:    test_remove_level1_promote
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -6227,8 +6227,8 @@ static unsigned
 test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -6430,21 +6430,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_promote() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_promote_2leaf_redistrib
+ * Function:    test_remove_level1_promote_2leaf_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -6453,8 +6453,8 @@ static unsigned
 test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -6577,21 +6577,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_promote_2leaf_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_promote_3leaf_redistrib
+ * Function:    test_remove_level1_promote_3leaf_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -6600,8 +6600,8 @@ static unsigned
 test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -6724,21 +6724,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_promote_3leaf_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_promote_2leaf_merge
+ * Function:    test_remove_level1_promote_2leaf_merge
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -6747,8 +6747,8 @@ static unsigned
 test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -6868,21 +6868,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_promote_2leaf_merge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_promote_3leaf_merge
+ * Function:    test_remove_level1_promote_3leaf_merge
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -6891,8 +6891,8 @@ static unsigned
 test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -7012,21 +7012,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_promote_3leaf_merge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level1_collapse
+ * Function:    test_remove_level1_collapse
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -7035,8 +7035,8 @@ static unsigned
 test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -7150,21 +7150,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level1_collapse() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_promote
+ * Function:    test_remove_level2_promote
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March  4, 2005
  *
  *-------------------------------------------------------------------------
@@ -7173,8 +7173,8 @@ static unsigned
 test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -7435,21 +7435,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_promote() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_promote_2internal_redistrib
+ * Function:    test_remove_level2_promote_2internal_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  7, 2005
  *
  *-------------------------------------------------------------------------
@@ -7458,8 +7458,8 @@ static unsigned
 test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -7584,21 +7584,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_promote_2internal_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_3promote_internal_redistrib
+ * Function:    test_remove_level2_3promote_internal_redistrib
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  7, 2005
  *
  *-------------------------------------------------------------------------
@@ -7607,8 +7607,8 @@ static unsigned
 test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -7733,21 +7733,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_promote_3internal_redistrib() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_promote_2internal_merge
+ * Function:    test_remove_level2_promote_2internal_merge
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  7, 2005
  *
  *-------------------------------------------------------------------------
@@ -7756,8 +7756,8 @@ static unsigned
 test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -7883,21 +7883,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_promote_2internal_merge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_3promote_internal_merge
+ * Function:    test_remove_level2_3promote_internal_merge
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  7, 2005
  *
  *-------------------------------------------------------------------------
@@ -7906,8 +7906,8 @@ static unsigned
 test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -8033,21 +8033,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_promote_3internal_merge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_2internal_merge_left
+ * Function:    test_remove_level2_2internal_merge_left
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -8056,8 +8056,8 @@ static unsigned
 test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -8158,21 +8158,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_2internal_merge_left() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_2internal_merge_right
+ * Function:    test_remove_level2_2internal_merge_right
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -8181,8 +8181,8 @@ static unsigned
 test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -8283,21 +8283,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_2internal_merge_right() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_3internal_merge
+ * Function:    test_remove_level2_3internal_merge
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -8306,8 +8306,8 @@ static unsigned
 test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -8408,21 +8408,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_3internal_merge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_level2_collapse_right
+ * Function:    test_remove_level2_collapse_right
  *
- * Purpose:	Basic tests for the B-tree v2 code
+ * Purpose:    Basic tests for the B-tree v2 code
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -8431,8 +8431,8 @@ static unsigned
 test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -8533,21 +8533,21 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_remove_level2_collapse_right() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	gen_l4_btree2
+ * Function:    gen_l4_btree2
  *
- * Purpose:	Generate a level-4 v2 B-tree for testing.
+ * Purpose:    Generate a level-4 v2 B-tree for testing.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, October 14, 2008
  *
  *-------------------------------------------------------------------------
@@ -8556,8 +8556,8 @@ static unsigned
 gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam,
     haddr_t *bt2_addr, const hsize_t *records)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     hsize_t     record;                 /* Record to insert into tree */
     unsigned    u;                      /* Local index variable */
@@ -8607,24 +8607,24 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
 
     return 1;
 } /* gen_l4_btree2() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_remove_lots
+ * Function:    test_remove_lots
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test inserts many
+ * Purpose:    Basic tests for the B-tree v2 code.  This test inserts many
  *              records in random order, enough to make at a level 4 B-tree
  *              and then removes them all, by record and by index.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -8632,11 +8632,11 @@ error:
 static unsigned
 test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[1024];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[1024];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     int         fd = -1;                /* File descriptor */
-    h5_stat_t	sb;                     /* Stat buffer for file */
+    h5_stat_t    sb;                     /* Stat buffer for file */
     void        *file_data = NULL;      /* Copy of file data */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
@@ -9051,7 +9051,7 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
 
     if(fd > 0)
@@ -9064,17 +9064,17 @@ error:
     return 1;
 } /* test_remove_lots() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_find_neighbor
+ * Function:    test_find_neighbor
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test exercises
+ * Purpose:    Basic tests for the B-tree v2 code.  This test exercises
  *              code to find nearest neighbors to a given value in a B-tree.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  8, 2005
  *
  *-------------------------------------------------------------------------
@@ -9083,8 +9083,8 @@ static unsigned
 test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -9125,7 +9125,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to find record B-tree less than a value */
     search = 0;
     H5E_BEGIN_TRY {
-	ret = H5B2_neighbor(bt2, H5B2_COMPARE_LESS, &search, neighbor_cb, &record);
+    ret = H5B2_neighbor(bt2, H5B2_COMPARE_LESS, &search, neighbor_cb, &record);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -9203,7 +9203,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam,
     /* Attempt to find record B-tree less than a value */
     search = (FIND_NEIGHBOR * 2) + 1;
     H5E_BEGIN_TRY {
-	ret = H5B2_neighbor(bt2, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record);
+    ret = H5B2_neighbor(bt2, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -9279,23 +9279,23 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     HDfree(records);
     return 1;
 } /* test_find_neighbor() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_delete
+ * Function:    test_delete
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test exercises
+ * Purpose:    Basic tests for the B-tree v2 code.  This test exercises
  *              code to delete a B-tree from a file
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Wednesday, March  9, 2005
  *
  *-------------------------------------------------------------------------
@@ -9303,9 +9303,9 @@ error:
 static unsigned
 test_delete(hid_t fapl, const H5B2_create_t *cparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[1024];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[1024];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t       empty_size;             /* Size of an empty file */
     h5_stat_size_t       file_size;              /* Size of each file created */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
@@ -9551,22 +9551,22 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_delete() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_modify
+ * Function:    test_modify
  *
- * Purpose:	Basic tests for the B-tree v2 code.  This test exercises
+ * Purpose:    Basic tests for the B-tree v2 code.  This test exercises
  *              code to modify an existing record in the B-tree
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, March 10, 2005
  *
  *-------------------------------------------------------------------------
@@ -9575,8 +9575,8 @@ static unsigned
 test_modify(hid_t fapl, const H5B2_create_t *cparam,
     const bt2_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     hsize_t     record;                 /* Record to insert into tree */
@@ -9617,7 +9617,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam,
     record = 3;
     modify = 4;
     H5E_BEGIN_TRY {
-	ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+    ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -9663,7 +9663,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam,
     record = 4330;
     found = HSIZET_MAX;
     H5E_BEGIN_TRY {
-	ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+    ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -9709,7 +9709,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam,
     record = 5350;
     found = 5350;
     H5E_BEGIN_TRY {
-	ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+    ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -9755,7 +9755,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam,
     record = 9445;
     found = 9445;
     H5E_BEGIN_TRY {
-	ret = H5B2_modify(bt2, &record, modify_cb, &modify);
+    ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     } H5E_END_TRY;
     /* Should fail */
     if(ret != FAIL)
@@ -9778,23 +9778,23 @@ error:
     H5E_BEGIN_TRY {
         if(bt2)
             H5B2_close(bt2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* test_modify() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_open_twice_diff
+ * Function:    test_open_twice_diff
  *
- * Purpose:	Open a v2 B-tree twice, through different "top" file
+ * Purpose:    Open a v2 B-tree twice, through different "top" file
  *              handles, with an intermediate file open that takes the "shared"
  *              file handle from the first B-tree's file pointer.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, December 18, 2015
  *
  *-------------------------------------------------------------------------
@@ -9802,14 +9802,14 @@ error:
 static unsigned
 test_open_twice_diff(hid_t fapl, const H5B2_create_t *cparam)
 {
-    char	filename[1024];         /* Filename to use */
+    char    filename[1024];         /* Filename to use */
     char        filename_tmp[1024];     /* Temporary file name */
-    hid_t	file = -1;              /* File ID */
-    hid_t	file2 = -1;             /* File ID */
-    hid_t	file0 = -1;             /* File ID */
-    hid_t	file00 = -1;            /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
-    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    hid_t    file2 = -1;             /* File ID */
+    hid_t    file0 = -1;             /* File ID */
+    hid_t    file00 = -1;            /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
+    H5F_t    *f2 = NULL;             /* Internal file object pointer */
     H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
     H5B2_t      *bt2_2 = NULL;          /* Second v2 B-tree wrapper */
     haddr_t     bt2_addr;               /* Address of B-tree created */
@@ -9914,25 +9914,25 @@ error:
             H5B2_close(bt2);
         if(bt2)
             H5B2_close(bt2_2);
-	H5Fclose(file);
-	H5Fclose(file2);
-	H5Fclose(file0);
-	H5Fclose(file00);
+    H5Fclose(file);
+    H5Fclose(file2);
+    H5Fclose(file0);
+    H5Fclose(file00);
     } H5E_END_TRY;
     return(1);
 } /* test_open_twice_diff() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test the B-tree v2 code
+ * Purpose:    Test the B-tree v2 code
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, February  1, 2005
  *
  *-------------------------------------------------------------------------
@@ -9942,10 +9942,10 @@ main(void)
 {
     H5B2_create_t cparam, cparam2;      /* Creation parameters for v2 B-tree */
     bt2_test_param_t tparam;            /* Test parameters for v2 B-tree */
-    hid_t	fapl = -1;              /* File access property list for data files */
-    unsigned	nerrors = 0;            /* Cumulative error count */
+    hid_t    fapl = -1;              /* File access property list for data files */
+    unsigned    nerrors = 0;            /* Cumulative error count */
     unsigned    reopen;                 /* Whether to reopen B-tree during tests */
-    int		ExpressMode;
+    int        ExpressMode;
     const char  *envval = NULL;
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
 
@@ -9958,7 +9958,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, &cparam2);
@@ -9970,11 +9970,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 */
 
@@ -9994,7 +9994,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);
 
@@ -10008,7 +10008,7 @@ main(void)
         nerrors += test_update_level1_middle_split(fapl, &cparam2, &tparam);
         nerrors += test_update_make_level2(fapl, &cparam2, &tparam);
         if(ExpressMode > 1)
-            printf("***Express test mode on.  test_update_lots skipped\n");
+            HDprintf("***Express test mode on.  test_update_lots skipped\n");
         else
             nerrors += test_update_lots(fapl, &cparam2, &tparam);
 
@@ -10035,7 +10035,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.c b/test/cache.c
index d5e3c6c..1a726fa 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -14,85 +14,85 @@
 /* Programmer:  John Mainzer
  *              6/9/04
  *
- *		This file contains tests for the cache implemented in
- *		H5C.c
+ *        This file contains tests for the cache implemented in
+ *        H5C.c
  */
 #include "cache_common.h"
 
-
+
 /* private typedef declarations: */
 
 struct flush_cache_test_spec
 {
-    int			entry_num;
-    int			entry_type;
-    int			entry_index;
-    hbool_t		insert_flag;
-    unsigned int	flags;
-    hbool_t		expected_deserialized;
-    hbool_t		expected_serialized;
-    hbool_t		expected_destroyed;
+    int            entry_num;
+    int            entry_type;
+    int            entry_index;
+    hbool_t        insert_flag;
+    unsigned int    flags;
+    hbool_t        expected_deserialized;
+    hbool_t        expected_serialized;
+    hbool_t        expected_destroyed;
 };
 
 struct pe_flush_cache_test_spec
 {
-    int			entry_num;
-    int			entry_type;
-    int			entry_index;
-    hbool_t		insert_flag;
-    unsigned int	flags;
-    int			num_pins;
-    int			pin_type[MAX_PINS];
-    int			pin_idx[MAX_PINS];
-    hbool_t		expected_deserialized;
-    hbool_t		expected_serialized;
-    hbool_t		expected_destroyed;
+    int            entry_num;
+    int            entry_type;
+    int            entry_index;
+    hbool_t        insert_flag;
+    unsigned int    flags;
+    int            num_pins;
+    int            pin_type[MAX_PINS];
+    int            pin_idx[MAX_PINS];
+    hbool_t        expected_deserialized;
+    hbool_t        expected_serialized;
+    hbool_t        expected_destroyed;
 };
 
 struct fo_flush_entry_check
 {
-    int			entry_num;
-    int			entry_type;
-    int			entry_index;
-    size_t		expected_size;
-    hbool_t		in_cache;
-    hbool_t		at_main_addr;
-    hbool_t		is_dirty;
-    hbool_t		is_protected;
-    hbool_t		is_pinned;
-    hbool_t		expected_deserialized;
-    hbool_t		expected_serialized;
-    hbool_t		expected_destroyed;
+    int            entry_num;
+    int            entry_type;
+    int            entry_index;
+    size_t        expected_size;
+    hbool_t        in_cache;
+    hbool_t        at_main_addr;
+    hbool_t        is_dirty;
+    hbool_t        is_protected;
+    hbool_t        is_pinned;
+    hbool_t        expected_deserialized;
+    hbool_t        expected_serialized;
+    hbool_t        expected_destroyed;
 };
 
 struct fo_flush_cache_test_spec
 {
-    int				entry_num;
-    int				entry_type;
-    int				entry_index;
-    hbool_t			insert_flag;
-    unsigned int		flags;
-    hbool_t			resize_flag;
-    size_t			new_size;
-    int				num_pins;
-    int				pin_type[MAX_PINS];
-    int				pin_idx[MAX_PINS];
-    int				num_flush_ops;
-    struct flush_op		flush_ops[MAX_FLUSH_OPS];
-    hbool_t			expected_deserialized;
-    hbool_t			expected_serialized;
-    hbool_t			expected_destroyed;
+    int                entry_num;
+    int                entry_type;
+    int                entry_index;
+    hbool_t            insert_flag;
+    unsigned int        flags;
+    hbool_t            resize_flag;
+    size_t            new_size;
+    int                num_pins;
+    int                pin_type[MAX_PINS];
+    int                pin_idx[MAX_PINS];
+    int                num_flush_ops;
+    struct flush_op        flush_ops[MAX_FLUSH_OPS];
+    hbool_t            expected_deserialized;
+    hbool_t            expected_serialized;
+    hbool_t            expected_destroyed;
 };
 
 struct move_entry_test_spec
 {
-    int			entry_type;
-    int			entry_index;
-    hbool_t		is_pinned;
+    int            entry_type;
+    int            entry_index;
+    hbool_t        is_pinned;
     hbool_t             is_protected;
 };
 
-
+
 /* private function declarations: */
 
 static unsigned smoke_check_1(int express_test, unsigned paged);
@@ -136,7 +136,7 @@ static void check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
                                                  int entry_type,
                                                  int entry_idx,
                                                  hbool_t unprot_dirty_flag,
-					         hbool_t mark_dirty,
+                            hbool_t mark_dirty,
                                                  hbool_t pop_mark_dirty_prot,
                                                  hbool_t pop_mark_dirty_pinned,
                                                  hbool_t unprotect_unpin,
@@ -150,11 +150,11 @@ static void check_flush_cache__flush_op_test(H5F_t * file_ptr,
                                         unsigned int flush_flags,
                                         int spec_size,
                                         const struct fo_flush_cache_test_spec spec[],
-				        unsigned init_expected_index_len,
-				        size_t init_expected_index_size,
-				        unsigned expected_index_len,
-				        size_t expected_index_size,
-					int check_size,
+                        unsigned init_expected_index_len,
+                        size_t init_expected_index_size,
+                        unsigned expected_index_len,
+                        size_t expected_index_size,
+                    int check_size,
                                         struct fo_flush_entry_check check[]);
 static void check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr);
 static unsigned check_get_entry_status(unsigned paged);
@@ -204,7 +204,7 @@ static unsigned check_stats(unsigned paged);
 static void check_stats__smoke_check_1(H5F_t * file_ptr);
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-
+
 /**************************************************************************/
 /**************************************************************************/
 /********************************* tests: *********************************/
@@ -212,15 +212,15 @@ static void check_stats__smoke_check_1(H5F_t * file_ptr);
 /**************************************************************************/
 
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_1()
+ * Function:    smoke_check_1()
  *
- * Purpose:	A basic functional test, inserts, destroys, and moves in
+ * Purpose:    A basic functional test, inserts, destroys, and moves in
  *              the mix, along with repeated protects and unprotects.
- *		All entries are marked as clean.
+ *        All entries are marked as clean.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/16/04
  *
  *-------------------------------------------------------------------------
@@ -251,23 +251,23 @@ smoke_check_1(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -289,7 +289,7 @@ smoke_check_1(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -299,7 +299,7 @@ smoke_check_1(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ TRUE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -318,7 +318,7 @@ smoke_check_1(int express_test, unsigned paged)
                             /* do_moves             */ TRUE,
                             /* move_to_main_addr    */ TRUE,
                             /* do_destroys            */ FALSE,
-			    /* do_mult_ro_protects    */ TRUE,
+                /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ dirty_destroys,
                             /* dirty_unprotects       */ dirty_unprotects);
 
@@ -327,7 +327,7 @@ smoke_check_1(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -337,7 +337,7 @@ smoke_check_1(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ FALSE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -357,7 +357,7 @@ smoke_check_1(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -382,7 +382,7 @@ smoke_check_1(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr               */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                             /* lag                    */ lag,
                             /* verbose                */ FALSE,
                             /* reset_stats            */ TRUE,
@@ -416,18 +416,18 @@ smoke_check_1(int express_test, unsigned paged)
 
 } /* smoke_check_1() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_2()
+ * Function:    smoke_check_2()
  *
- * Purpose:	A basic functional test, with inserts, destroys, and
- *		moves in the mix, along with some repeated protects
- *		and unprotects.  About half the entries are marked as
- *		dirty.
+ * Purpose:    A basic functional test, with inserts, destroys, and
+ *        moves in the mix, along with some repeated protects
+ *        and unprotects.  About half the entries are marked as
+ *        dirty.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  *-------------------------------------------------------------------------
@@ -458,23 +458,23 @@ smoke_check_2(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -496,7 +496,7 @@ smoke_check_2(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -506,7 +506,7 @@ smoke_check_2(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ TRUE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -525,7 +525,7 @@ smoke_check_2(int express_test, unsigned paged)
                             /* do_moves             */ TRUE,
                             /* move_to_main_addr    */ TRUE,
                             /* do_destroys            */ FALSE,
-			    /* do_mult_ro_protects    */ TRUE,
+                /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ dirty_destroys,
                             /* dirty_unprotects       */ dirty_unprotects);
 
@@ -534,7 +534,7 @@ smoke_check_2(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -544,7 +544,7 @@ smoke_check_2(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ FALSE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -564,7 +564,7 @@ smoke_check_2(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -589,7 +589,7 @@ smoke_check_2(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr               */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                             /* lag                    */ lag,
                             /* verbose                */ FALSE,
                             /* reset_stats            */ TRUE,
@@ -623,17 +623,17 @@ smoke_check_2(int express_test, unsigned paged)
 
 } /* smoke_check_2() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_3()
+ * Function:    smoke_check_3()
  *
- * Purpose:	A basic functional test on a tiny cache, with inserts,
- *		destroys, and moves in the mix, along with repeated
- *		protects and unprotects.  All entries are marked as clean.
+ * Purpose:    A basic functional test on a tiny cache, with inserts,
+ *        destroys, and moves in the mix, along with repeated
+ *        protects and unprotects.  All entries are marked as clean.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/16/04
  *
  *-------------------------------------------------------------------------
@@ -664,23 +664,23 @@ smoke_check_3(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -702,7 +702,7 @@ smoke_check_3(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -712,7 +712,7 @@ smoke_check_3(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ TRUE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -731,7 +731,7 @@ smoke_check_3(int express_test, unsigned paged)
                             /* do_moves             */ TRUE,
                             /* move_to_main_addr    */ TRUE,
                             /* do_destroys            */ FALSE,
-			    /* do_mult_ro_protects    */ TRUE,
+                /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ dirty_destroys,
                             /* dirty_unprotects       */ dirty_unprotects);
 
@@ -740,7 +740,7 @@ smoke_check_3(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -750,7 +750,7 @@ smoke_check_3(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ FALSE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -770,7 +770,7 @@ smoke_check_3(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -795,7 +795,7 @@ smoke_check_3(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                             /* lag                    */ lag,
                             /* verbose                */ FALSE,
                             /* reset_stats            */ TRUE,
@@ -829,18 +829,18 @@ smoke_check_3(int express_test, unsigned paged)
 
 } /* smoke_check_3() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_4()
+ * Function:    smoke_check_4()
  *
- * Purpose:	A basic functional test on a tiny cache, with inserts,
- *	 	destroys, and moves in the mix, along with repeated
- *		protects and unprotects.  About half the entries are
- *		marked as dirty.
+ * Purpose:    A basic functional test on a tiny cache, with inserts,
+ *         destroys, and moves in the mix, along with repeated
+ *        protects and unprotects.  About half the entries are
+ *        marked as dirty.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  *-------------------------------------------------------------------------
@@ -871,23 +871,23 @@ smoke_check_4(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -909,7 +909,7 @@ smoke_check_4(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -919,7 +919,7 @@ smoke_check_4(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ TRUE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -938,7 +938,7 @@ smoke_check_4(int express_test, unsigned paged)
                             /* do_moves             */ TRUE,
                             /* move_to_main_addr    */ TRUE,
                             /* do_destroys            */ FALSE,
-			    /* do_mult_ro_protects    */ TRUE,
+                /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ dirty_destroys,
                             /* dirty_unprotects       */ dirty_unprotects);
 
@@ -947,7 +947,7 @@ smoke_check_4(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -957,7 +957,7 @@ smoke_check_4(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ FALSE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -977,7 +977,7 @@ smoke_check_4(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr               */ file_ptr,
-		           /* max_index              */ max_index,
+                /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -1002,7 +1002,7 @@ smoke_check_4(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr               */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                             /* lag                    */ lag,
                             /* verbose                */ FALSE,
                             /* reset_stats            */ TRUE,
@@ -1036,18 +1036,18 @@ smoke_check_4(int express_test, unsigned paged)
 
 } /* smoke_check_4() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_5()
+ * Function:    smoke_check_5()
  *
- * Purpose:	A basic functional test on a cache with automatic cache
- *		resizing enabled, with inserts in the mix, along with
- *		repeated protects and unprotects.  All entries are marked
- *		as clean.
+ * Purpose:    A basic functional test on a cache with automatic cache
+ *        resizing enabled, with inserts in the mix, along with
+ *        repeated protects and unprotects.  All entries are marked
+ *        as clean.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/14/04
  *
  *-------------------------------------------------------------------------
@@ -1093,9 +1093,9 @@ smoke_check_5(int express_test, unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
@@ -1126,23 +1126,23 @@ smoke_check_5(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -1280,18 +1280,18 @@ smoke_check_5(int express_test, unsigned paged)
 
 } /* smoke_check_5() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_6()
+ * Function:    smoke_check_6()
  *
- * Purpose:	A basic functional test on a cache with automatic cache
- *		resizing enabled, with inserts in the mix, along with
+ * Purpose:    A basic functional test on a cache with automatic cache
+ *        resizing enabled, with inserts in the mix, along with
  *              repeated protects and unprotects.  About one half of all
- *		entries are marked as dirty.
+ *        entries are marked as dirty.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/25/04
  *
  *-------------------------------------------------------------------------
@@ -1337,9 +1337,9 @@ smoke_check_6(int express_test, unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
@@ -1372,23 +1372,23 @@ smoke_check_6(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     if(show_progress) /* 1 */
@@ -1524,18 +1524,18 @@ smoke_check_6(int express_test, unsigned paged)
 
 } /* smoke_check_6() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_7()
+ * Function:    smoke_check_7()
  *
- * Purpose:	A basic functional test on a cache with automatic cache
- *		resizing enabled, with inserts in the mix, along with
- *		repeated protects and unprotects.  All entries are marked
- *		as clean.
+ * Purpose:    A basic functional test on a cache with automatic cache
+ *        resizing enabled, with inserts in the mix, along with
+ *        repeated protects and unprotects.  All entries are marked
+ *        as clean.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              12/2/04
  *
  *-------------------------------------------------------------------------
@@ -1581,9 +1581,9 @@ smoke_check_7(int express_test, unsigned paged)
         /* size_t      max_increment          = */ (8 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */
@@ -1615,23 +1615,23 @@ smoke_check_7(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -1769,18 +1769,18 @@ smoke_check_7(int express_test, unsigned paged)
 
 } /* smoke_check_7() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_8()
+ * Function:    smoke_check_8()
  *
- * Purpose:	A basic functional test on a cache with automatic cache
- *		resizing enabled, with inserts in the mix, along with
+ * Purpose:    A basic functional test on a cache with automatic cache
+ *        resizing enabled, with inserts in the mix, along with
  *              repeated protects and unprotects.  About one half of all
- *		entries are marked as dirty.
+ *        entries are marked as dirty.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/25/04
  *
  *-------------------------------------------------------------------------
@@ -1826,9 +1826,9 @@ smoke_check_8(int express_test, unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */
@@ -1860,23 +1860,23 @@ smoke_check_8(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -2014,26 +2014,26 @@ smoke_check_8(int express_test, unsigned paged)
 
 } /* smoke_check_8() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_9()
+ * Function:    smoke_check_9()
  *
- * Purpose:	A repeat of smoke check 1, only with the cache corked
- * 		part of the time.
+ * Purpose:    A repeat of smoke check 1, only with the cache corked
+ *         part of the time.
  *
- * 		Recall that smoke check 1 is a basic functional test,
- * 		with inserts, destroys, and moves in the mix, along
- * 		with repeated protects and unprotects.  All entries are
- * 		marked as clean.
+ *         Recall that smoke check 1 is a basic functional test,
+ *         with inserts, destroys, and moves in the mix, along
+ *         with repeated protects and unprotects.  All entries are
+ *         marked as clean.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              8/1/07
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -2066,23 +2066,23 @@ smoke_check_9(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -2113,8 +2113,8 @@ smoke_check_9(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 1.\n";
-	}
+        failure_mssg = "can't disable evictions 1.\n";
+    }
     }
 
     if(show_progress) /* 4 */
@@ -2122,7 +2122,7 @@ smoke_check_9(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2132,7 +2132,7 @@ smoke_check_9(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ TRUE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -2149,8 +2149,8 @@ smoke_check_9(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't enable evictions 1.\n";
-	}
+        failure_mssg = "can't enable evictions 1.\n";
+    }
     }
 
     if(show_progress) /* 6 */
@@ -2168,7 +2168,7 @@ smoke_check_9(int express_test, unsigned paged)
                             /* do_moves             */ TRUE,
                             /* move_to_main_addr    */ TRUE,
                             /* do_destroys            */ FALSE,
-			    /* do_mult_ro_protects    */ TRUE,
+                /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ dirty_destroys,
                             /* dirty_unprotects       */ dirty_unprotects);
 
@@ -2183,8 +2183,8 @@ smoke_check_9(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 2.\n";
-	}
+        failure_mssg = "can't disable evictions 2.\n";
+    }
     }
 
     if(show_progress) /* 8 */
@@ -2192,7 +2192,7 @@ smoke_check_9(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2202,7 +2202,7 @@ smoke_check_9(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ FALSE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -2217,8 +2217,8 @@ smoke_check_9(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't enable evictions 2.\n";
-	}
+        failure_mssg = "can't enable evictions 2.\n";
+    }
     }
 
     if(show_progress) /* 10 */
@@ -2243,8 +2243,8 @@ smoke_check_9(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 3.\n";
-	}
+        failure_mssg = "can't disable evictions 3.\n";
+    }
     }
 
     if(show_progress) /* 12 */
@@ -2252,7 +2252,7 @@ smoke_check_9(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2283,8 +2283,8 @@ smoke_check_9(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't enable evictions 3.\n";
-	}
+        failure_mssg = "can't enable evictions 3.\n";
+    }
     }
 
     if(show_progress) /* 15 */
@@ -2292,7 +2292,7 @@ smoke_check_9(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr              */ file_ptr,
-		             /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                             /* lag                    */ lag,
                             /* verbose                */ FALSE,
                             /* reset_stats            */ TRUE,
@@ -2312,8 +2312,8 @@ smoke_check_9(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 4.\n";
-	}
+        failure_mssg = "can't disable evictions 4.\n";
+    }
     }
 
 
@@ -2342,26 +2342,26 @@ smoke_check_9(int express_test, unsigned paged)
 
 } /* smoke_check_9() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	smoke_check_10()
+ * Function:    smoke_check_10()
  *
- * Purpose:	A repeat of smoke check 2, only with the cache corked
- * 		part of the time.
+ * Purpose:    A repeat of smoke check 2, only with the cache corked
+ *         part of the time.
  *
- * 		Recall that smoke check 2 is a basic functional test,
- * 		with inserts, destroys, and moves in the mix, along
- * 		with some repeated protects and unprotects.  About half
- * 		the entries are marked as dirty.
+ *         Recall that smoke check 2 is a basic functional test,
+ *         with inserts, destroys, and moves in the mix, along
+ *         with some repeated protects and unprotects.  About half
+ *         the entries are marked as dirty.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              8/1/07
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -2394,23 +2394,23 @@ smoke_check_10(int express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -2433,7 +2433,7 @@ smoke_check_10(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2443,7 +2443,7 @@ smoke_check_10(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ TRUE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -2458,8 +2458,8 @@ smoke_check_10(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 1.\n";
-	}
+        failure_mssg = "can't disable evictions 1.\n";
+    }
     }
 
     if(show_progress) /* 5 */
@@ -2477,7 +2477,7 @@ smoke_check_10(int express_test, unsigned paged)
                             /* do_moves             */ TRUE,
                             /* move_to_main_addr    */ TRUE,
                             /* do_destroys            */ FALSE,
-			    /* do_mult_ro_protects    */ TRUE,
+                /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ dirty_destroys,
                             /* dirty_unprotects       */ dirty_unprotects);
 
@@ -2492,8 +2492,8 @@ smoke_check_10(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't enable evictions 1.\n";
-	}
+        failure_mssg = "can't enable evictions 1.\n";
+    }
     }
 
     if(show_progress) /* 7 */
@@ -2501,7 +2501,7 @@ smoke_check_10(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2511,7 +2511,7 @@ smoke_check_10(int express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ FALSE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ dirty_destroys,
                            /* dirty_unprotects       */ dirty_unprotects);
 
@@ -2526,8 +2526,8 @@ smoke_check_10(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 2.\n";
-	}
+        failure_mssg = "can't disable evictions 2.\n";
+    }
     }
 
     if(show_progress) /* 9 */
@@ -2552,8 +2552,8 @@ smoke_check_10(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't enable evictions 2.\n";
-	}
+        failure_mssg = "can't enable evictions 2.\n";
+    }
     }
 
     if(show_progress) /* 11 */
@@ -2561,7 +2561,7 @@ smoke_check_10(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2581,8 +2581,8 @@ smoke_check_10(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 3.\n";
-	}
+        failure_mssg = "can't disable evictions 3.\n";
+    }
     }
 
     if(show_progress) /* 13 */
@@ -2607,8 +2607,8 @@ smoke_check_10(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't enable evictions 3.\n";
-	}
+        failure_mssg = "can't enable evictions 3.\n";
+    }
     }
 
     if(show_progress) /* 15 */
@@ -2616,7 +2616,7 @@ smoke_check_10(int express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr              */ file_ptr,
-		             /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                             /* lag                    */ lag,
                             /* verbose                */ FALSE,
                             /* reset_stats            */ TRUE,
@@ -2636,8 +2636,8 @@ smoke_check_10(int express_test, unsigned paged)
         if(result < 0) {
 
              pass = FALSE;
-	     failure_mssg = "can't disable evictions 4.\n";
-	}
+        failure_mssg = "can't disable evictions 4.\n";
+    }
     }
 
     if(show_progress) /* 17 */
@@ -2665,19 +2665,19 @@ smoke_check_10(int express_test, unsigned paged)
 
 } /* smoke_check_10() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	write_permitted_check()
+ * Function:    write_permitted_check()
  *
- * Purpose:	A basic test of the write permitted function.  In essence,
- *		we load the cache up with dirty entryies, set
- *		write_permitted to FALSE, and then protect a bunch of
- *		entries.  If there are any writes while write_permitted is
- *		FALSE, the test will fail.
+ * Purpose:    A basic test of the write permitted function.  In essence,
+ *        we load the cache up with dirty entryies, set
+ *        write_permitted to FALSE, and then protect a bunch of
+ *        entries.  If there are any writes while write_permitted is
+ *        FALSE, the test will fail.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  * Modifications:
@@ -2712,23 +2712,23 @@ express_test, unsigned paged)
 
     switch (express_test)
     {
-	case 0:
-	    max_index = (10 * 1024) - 1;
-	    break;
+    case 0:
+        max_index = (10 * 1024) - 1;
+        break;
 
-	case 1:
-	    max_index = (1 * 1024) - 1;
-	    break;
+    case 1:
+        max_index = (1 * 1024) - 1;
+        break;
 
-	case 2:
-	    max_index = (512) - 1;
-	    break;
+    case 2:
+        max_index = (512) - 1;
+        break;
 
-	default:
+    default:
             SKIPPED();
-            HDfprintf(stdout, "	Long tests disabled.\n");
-	    return 0;  /* <========== note return */
-	    break;
+            HDfprintf(stdout, "    Long tests disabled.\n");
+        return 0;  /* <========== note return */
+        break;
     }
 
     pass = TRUE;
@@ -2750,7 +2750,7 @@ express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2760,7 +2760,7 @@ express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ TRUE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ TRUE,
                            /* dirty_unprotects       */ TRUE);
 
@@ -2781,7 +2781,7 @@ express_test, unsigned paged)
                             /* do_moves             */ TRUE,
                             /* move_to_main_addr    */ TRUE,
                             /* do_destroys            */ FALSE,
-			    /* do_mult_ro_protects    */ TRUE,
+                /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ FALSE,
                             /* dirty_unprotects       */ NO_CHANGE);
 
@@ -2792,7 +2792,7 @@ express_test, unsigned paged)
     write_permitted = TRUE;
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2802,7 +2802,7 @@ express_test, unsigned paged)
                            /* do_moves             */ TRUE,
                            /* move_to_main_addr    */ FALSE,
                            /* do_destroys            */ FALSE,
-			   /* do_mult_ro_protects    */ TRUE,
+            /* do_mult_ro_protects    */ TRUE,
                            /* dirty_destroys         */ TRUE,
                            /* dirty_unprotects       */ TRUE);
 
@@ -2822,7 +2822,7 @@ express_test, unsigned paged)
                   FUNC, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
-		            /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                            /* lag                    */ lag,
                            /* verbose                */ FALSE,
                            /* reset_stats            */ TRUE,
@@ -2838,7 +2838,7 @@ express_test, unsigned paged)
     write_permitted = FALSE;
 
     col_major_scan_backward(/* file_ptr              */ file_ptr,
-		             /* max_index              */ max_index,
+                    /* max_index              */ max_index,
                             /* lag                    */ lag,
                             /* verbose                */ FALSE,
                             /* reset_stats            */ TRUE,
@@ -2874,7 +2874,7 @@ express_test, unsigned paged)
 
     SKIPPED();
 
-    HDfprintf(stdout, "	Clean and dirty LRU lists disabled.\n");
+    HDfprintf(stdout, "    Clean and dirty LRU lists disabled.\n");
 
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
@@ -2882,21 +2882,21 @@ express_test, unsigned paged)
 
 } /* write_permitted_check() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_insert_entry()
+ * Function:    check_insert_entry()
  *
- * Purpose:	Verify that H5C_insert_entry behaves as expected.
- *		Test the behaviour with different flags.
+ * Purpose:    Verify that H5C_insert_entry behaves as expected.
+ *        Test the behaviour with different flags.
  *
- *		This test was added primarily to test basic insert
- *		pinned entry functionallity, but I through in explicit
- *		tests for other functionallity that is tested implicitly
- *		elsewhere.
+ *        This test was added primarily to test basic insert
+ *        pinned entry functionallity, but I through in explicit
+ *        tests for other functionallity that is tested implicitly
+ *        elsewhere.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              8/10/06
  *
  * Modifications:
@@ -2960,13 +2960,13 @@ check_insert_entry(unsigned paged)
     base_addr = entries[0];
     while(pass && (i < 4))
     {
-	entry_ptr = &(base_addr[i]);
+    entry_ptr = &(base_addr[i]);
 
-	/* Start by checking everything we can via H5C_get_entry_status() */
+    /* Start by checking everything we can via H5C_get_entry_status() */
 
-	result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-			              &in_cache, &is_dirty, &is_protected,
-				      &is_pinned, NULL, NULL, NULL, NULL);
+    result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
+                        &in_cache, &is_dirty, &is_protected,
+                    &is_pinned, NULL, NULL, NULL, NULL);
 
         if(result < 0) {
 
@@ -2974,129 +2974,129 @@ check_insert_entry(unsigned paged)
             failure_mssg = "H5C_get_entry_status() reports failure.";
         }
 
-	if(pass) {
+    if(pass) {
 
-	    /* check the universals */
-	    if((!in_cache) || (!is_dirty) || (is_protected) ||
+        /* check the universals */
+        if((!in_cache) || (!is_dirty) || (is_protected) ||
                  (entry_size != entry_sizes[entry_type])) {
 
                 pass = FALSE;
                 failure_mssg = "Unexpected insert results 1.";
             }
-	}
+    }
 
-	if(pass) {
+    if(pass) {
 
             /* verify that the pinned flag got set correctly */
-	    if((i == 2) || (i == 3)) {
+        if((i == 2) || (i == 3)) {
 
-		if(!is_pinned) {
+        if(!is_pinned) {
 
                     pass = FALSE;
                     failure_mssg = "Unexpected insert results 2.";
-		}
-	    } else if(is_pinned) {
+        }
+        } else if(is_pinned) {
 
                 pass = FALSE;
                 failure_mssg = "Unexpected insert results 3.";
 
-	    } else if(is_pinned != ((entry_ptr->header).is_pinned)) {
+        } else if(is_pinned != ((entry_ptr->header).is_pinned)) {
 
                 pass = FALSE;
                 failure_mssg = "Unexpected insert results 4.";
             }
-	}
+    }
 
-	/* Thats all we can get from H5C_get_entry_status().
-	 * Now start looking at the cache data structures directly.
-	 */
+    /* Thats all we can get from H5C_get_entry_status().
+    * Now start looking at the cache data structures directly.
+    */
 
-	if(pass) {
+    if(pass) {
 
             /* Verify that the flush marker got set correctly */
-	    if((i == 1) || (i == 3)) {
+        if((i == 1) || (i == 3)) {
 
-		if(!((entry_ptr->header).flush_marker)) {
+        if(!((entry_ptr->header).flush_marker)) {
 
                     pass = FALSE;
                     failure_mssg = "Unexpected insert results 5.";
-		}
-	    } else if((entry_ptr->header).flush_marker) {
+        }
+        } else if((entry_ptr->header).flush_marker) {
 
                 pass = FALSE;
                 failure_mssg = "Unexpected insert results 6.";
-	    }
-	}
+        }
+    }
 
-	if(pass) {
+    if(pass) {
 
-	    /* Verify that pinned entries are in the pinned entry list */
-	    if((entry_ptr->header).is_pinned) {
+        /* Verify that pinned entries are in the pinned entry list */
+        if((entry_ptr->header).is_pinned) {
 
-		search_ptr = cache_ptr->pel_head_ptr;
+        search_ptr = cache_ptr->pel_head_ptr;
 
-		while((search_ptr != NULL) &&
-			(search_ptr !=
-			  (struct H5C_cache_entry_t *)entry_ptr))
-		{
-		    search_ptr = search_ptr->next;
-		}
+        while((search_ptr != NULL) &&
+            (search_ptr !=
+            (struct H5C_cache_entry_t *)entry_ptr))
+        {
+            search_ptr = search_ptr->next;
+        }
 
-		if(search_ptr == NULL) {
+        if(search_ptr == NULL) {
 
                     pass = FALSE;
                     failure_mssg = "Unexpected insert results 7.";
-		}
-	    }
-	}
+        }
+        }
+    }
 
-	if(pass) {
+    if(pass) {
 
-	    /* Verify that unpinned entries are in the LRU list */
-	    if(!((entry_ptr->header).is_pinned)) {
+        /* Verify that unpinned entries are in the LRU list */
+        if(!((entry_ptr->header).is_pinned)) {
 
-		search_ptr = cache_ptr->LRU_head_ptr;
+        search_ptr = cache_ptr->LRU_head_ptr;
 
-		while((search_ptr != NULL) &&
-			(search_ptr !=
-			  (struct H5C_cache_entry_t *)entry_ptr))
-		{
-		    search_ptr = search_ptr->next;
-		}
+        while((search_ptr != NULL) &&
+            (search_ptr !=
+            (struct H5C_cache_entry_t *)entry_ptr))
+        {
+            search_ptr = search_ptr->next;
+        }
 
-		if(search_ptr == NULL) {
+        if(search_ptr == NULL) {
 
                     pass = FALSE;
                     failure_mssg = "Unexpected insert results 8.";
-		}
-	    }
-	}
+        }
+        }
+    }
 
 #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
-	if(pass) {
+    if(pass) {
 
-	    /* Verify that unpinned entries are in the dirty LRU list */
-	    if(!((entry_ptr->header).is_pinned)) {
+        /* Verify that unpinned entries are in the dirty LRU list */
+        if(!((entry_ptr->header).is_pinned)) {
 
-		search_ptr = cache_ptr->dLRU_head_ptr;
+        search_ptr = cache_ptr->dLRU_head_ptr;
 
-		while((search_ptr != NULL) &&
-			(search_ptr !=
-			  (struct H5C_cache_entry_t *)entry_ptr))
-		{
-		    search_ptr = search_ptr->aux_next;
-		}
+        while((search_ptr != NULL) &&
+            (search_ptr !=
+            (struct H5C_cache_entry_t *)entry_ptr))
+        {
+            search_ptr = search_ptr->aux_next;
+        }
 
-		if(search_ptr == NULL) {
+        if(search_ptr == NULL) {
 
                     pass = FALSE;
                     failure_mssg = "Unexpected insert results 9.";
-		}
-	    }
-	}
+        }
+        }
+    }
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-	i++;
+    i++;
 
     } /* while */
 
@@ -3107,27 +3107,27 @@ check_insert_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 4) ||
-	     (cache_ptr->index_size != 4 * entry_sizes[entry_type]) ||
-	     (cache_ptr->slist_len != 4) ||
-	     (cache_ptr->slist_size != 4 * entry_sizes[entry_type]) ||
-	     (cache_ptr->pl_len != 0) ||
-	     (cache_ptr->pl_size != (size_t)0) ||
-	     (cache_ptr->pel_len != 2) ||
-	     (cache_ptr->pel_size != 2 * entry_sizes[entry_type]) ||
-	     (cache_ptr->LRU_list_len != 2) ||
-	     (cache_ptr->LRU_list_size != 2 * entry_sizes[entry_type])
+    if((cache_ptr->index_len != 4) ||
+        (cache_ptr->index_size != 4 * entry_sizes[entry_type]) ||
+        (cache_ptr->slist_len != 4) ||
+        (cache_ptr->slist_size != 4 * entry_sizes[entry_type]) ||
+        (cache_ptr->pl_len != 0) ||
+        (cache_ptr->pl_size != (size_t)0) ||
+        (cache_ptr->pel_len != 2) ||
+        (cache_ptr->pel_size != 2 * entry_sizes[entry_type]) ||
+        (cache_ptr->LRU_list_len != 2) ||
+        (cache_ptr->LRU_list_size != 2 * entry_sizes[entry_type])
 #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
-	     || (cache_ptr->dLRU_list_len != 2) ||
-	     (cache_ptr->dLRU_list_size != 2 * entry_sizes[entry_type]) ||
-	     (cache_ptr->cLRU_list_len != 0) ||
-	     (cache_ptr->cLRU_list_size != (size_t)0)
+        || (cache_ptr->dLRU_list_len != 2) ||
+        (cache_ptr->dLRU_list_size != 2 * entry_sizes[entry_type]) ||
+        (cache_ptr->cLRU_list_len != 0) ||
+        (cache_ptr->cLRU_list_size != (size_t)0)
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
              ) {
 
             pass = FALSE;
             failure_mssg = "Unexpected insert results 10.";
-	}
+    }
     }
 
     /* Finally, if stats collection is enabled, verify that the expected
@@ -3136,23 +3136,23 @@ check_insert_entry(unsigned paged)
 #if H5C_COLLECT_CACHE_STATS
     if(pass) {
 
-	if((cache_ptr->insertions[entry_type] != 4) ||
-	     (cache_ptr->pinned_insertions[entry_type] != 2) ||
-	     (cache_ptr->pins[entry_type] != 2) ||
-	     (cache_ptr->unpins[entry_type] != 0) ||
+    if((cache_ptr->insertions[entry_type] != 4) ||
+        (cache_ptr->pinned_insertions[entry_type] != 2) ||
+        (cache_ptr->pins[entry_type] != 2) ||
+        (cache_ptr->unpins[entry_type] != 0) ||
              (cache_ptr->dirty_pins[entry_type] != 0) ||
-	     (cache_ptr->max_index_len != 4) ||
-	     (cache_ptr->max_index_size != 4 * entry_sizes[entry_type]) ||
-	     (cache_ptr->max_slist_len != 4) ||
-	     (cache_ptr->max_slist_size != 4 * entry_sizes[entry_type]) ||
-	     (cache_ptr->max_pl_len != 0) ||
-	     (cache_ptr->max_pl_size != (size_t)0) ||
-	     (cache_ptr->max_pel_len != 2) ||
-	     (cache_ptr->max_pel_size != 2 * entry_sizes[entry_type])) {
+        (cache_ptr->max_index_len != 4) ||
+        (cache_ptr->max_index_size != 4 * entry_sizes[entry_type]) ||
+        (cache_ptr->max_slist_len != 4) ||
+        (cache_ptr->max_slist_size != 4 * entry_sizes[entry_type]) ||
+        (cache_ptr->max_pl_len != 0) ||
+        (cache_ptr->max_pl_size != (size_t)0) ||
+        (cache_ptr->max_pel_len != 2) ||
+        (cache_ptr->max_pel_size != 2 * entry_sizes[entry_type])) {
 
             pass = FALSE;
             failure_mssg = "Unexpected insert results 11.";
-	}
+    }
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -3161,7 +3161,7 @@ check_insert_entry(unsigned paged)
     if(pass) {
 
         unpin_entry(entry_type, 2);
-	unpin_entry(entry_type, 3);
+    unpin_entry(entry_type, 3);
     }
 
     if(pass) {
@@ -3181,16 +3181,16 @@ check_insert_entry(unsigned paged)
 
 } /* check_insert_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache()
+ * Function:    check_flush_cache()
  *
- * Purpose:	Verify that flush_cache behaves as expected.  In particular,
- *		test the behaviour with different flags.
+ * Purpose:    Verify that flush_cache behaves as expected.  In particular,
+ *        test the behaviour with different flags.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              1/10/05
  *
  * Modifications:
@@ -3247,7 +3247,7 @@ check_flush_cache(unsigned paged)
 
     if(pass) {
 
-	check_flush_cache__flush_ops(file_ptr);
+    check_flush_cache__flush_ops(file_ptr);
     }
 
     if(pass) {
@@ -3267,16 +3267,16 @@ check_flush_cache(unsigned paged)
 
 } /* check_flush_cache() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__empty_cache()
+ * Function:    check_flush_cache__empty_cache()
  *
- * Purpose:	Verify that flush_cache behaves as expected with an empty
+ * Purpose:    Verify that flush_cache behaves as expected with an empty
  *              cache.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              1/12/05
  *
  * Modifications:
@@ -3288,7 +3288,7 @@ static void
 check_flush_cache__empty_cache(H5F_t * file_ptr)
 {
     H5C_t * cache_ptr = file_ptr->shared->cache;
-    herr_t	 result;
+    herr_t     result;
 
     if(cache_ptr == NULL) {
 
@@ -3354,22 +3354,22 @@ check_flush_cache__empty_cache(H5F_t * file_ptr)
 
 } /* check_flush_cache__empty_cache() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__multi_entry()
+ * Function:    check_flush_cache__multi_entry()
  *
- * Purpose:	Verify that flush_cache behaves as expected when the cache
- *		contains multiple elements.
+ * Purpose:    Verify that flush_cache behaves as expected when the cache
+ *        contains multiple elements.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              1/14/05
  *
  * Modifications:
  *
- * 		JRM -- 4/5/06
- * 		Added pinned entry tests.
+ *         JRM -- 4/5/06
+ *         Added pinned entry tests.
  *
  *-------------------------------------------------------------------------
  */
@@ -4264,9 +4264,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 100,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ FALSE
@@ -4277,10 +4277,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 75,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ FALSE
@@ -4291,11 +4291,11 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 25,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 2,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 2,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ FALSE
@@ -4306,12 +4306,12 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 50,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 3,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 3,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                PICO_ENTRY_TYPE,
+                    PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ FALSE
@@ -4322,13 +4322,13 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 10,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 4,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+        /* num_pins              = */ 4,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-					   -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, -1, -1, -1, -1},
+                    PICO_ENTRY_TYPE,
+                    -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ FALSE
@@ -4339,14 +4339,14 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 20,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 5,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+        /* num_pins              = */ 5,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, 10, -1, -1, -1},
+                    PICO_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, 10, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ FALSE
@@ -4357,15 +4357,15 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 30,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 6,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+        /* num_pins              = */ 6,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-				 	   MONSTER_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, 10, 20, -1, -1},
+                    PICO_ENTRY_TYPE,
+                        MONSTER_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, 10, 20, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ FALSE
@@ -4376,16 +4376,16 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 40,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 7,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+        /* num_pins              = */ 7,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, 10, 20, 30, -1},
+                    PICO_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, 10, 20, 30, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ FALSE
@@ -4410,9 +4410,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 100,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4423,10 +4423,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 75,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4437,11 +4437,11 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 25,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 2,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]  = */ {100, 75, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 2,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]  = */ {100, 75, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4452,12 +4452,12 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 50,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 3,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 3,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                PICO_ENTRY_TYPE,
+                    PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4468,9 +4468,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 10,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4481,10 +4481,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 20,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {MONSTER_ENTRY_TYPE,
-					   -1, -1, -1, -1 -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {10, -1, -1, -1 -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {MONSTER_ENTRY_TYPE,
+                    -1, -1, -1, -1 -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {10, -1, -1, -1 -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4495,11 +4495,11 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 30,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 2,
-	    /* pin_type[MAX_PINS]    = */ {MONSTER_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {10, 20, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 2,
+        /* pin_type[MAX_PINS]    = */ {MONSTER_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {10, 20, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4510,12 +4510,12 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 40,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 3,
-	    /* pin_type[MAX_PINS]    = */ {MONSTER_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   MONSTER_ENTRY_TYPE,
-					   -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {10, 20, 30, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 3,
+        /* pin_type[MAX_PINS]    = */ {MONSTER_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    MONSTER_ENTRY_TYPE,
+                    -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {10, 20, 30, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4540,9 +4540,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 100,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4553,10 +4553,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 75,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4567,10 +4567,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 25,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4581,10 +4581,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 50,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4595,9 +4595,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 10,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4608,9 +4608,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 20,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4621,9 +4621,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 30,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4634,9 +4634,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 40,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4662,9 +4662,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 100,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4675,10 +4675,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 75,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4689,10 +4689,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 25,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4703,10 +4703,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 50,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4717,9 +4717,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 10,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4730,13 +4730,13 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 20,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG,
-	    /* num_pins              = */ 4,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+        /* num_pins              = */ 4,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-					   -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, -1, -1, -1, -1},
+                    PICO_ENTRY_TYPE,
+                    -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4747,13 +4747,13 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 30,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 4,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+        /* num_pins              = */ 4,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
                                            PICO_ENTRY_TYPE,
-					   PICO_ENTRY_TYPE,
-					   -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, -1, -1, -1, -1},
+                    PICO_ENTRY_TYPE,
+                    -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, 75, 25, 50, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4764,9 +4764,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 40,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ TRUE,
             /* expected_destroyed    = */ TRUE
@@ -4793,9 +4793,9 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 100,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 0,
-	    /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 0,
+        /* pin_type[MAX_PINS]    = */ {-1, -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {-1, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4806,10 +4806,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 75,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4820,10 +4820,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 25,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4834,10 +4834,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 50,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__NO_FLAGS_SET,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4848,10 +4848,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 10,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4862,10 +4862,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 20,
             /* insert_flag           = */ FALSE,
             /* flags                 = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ TRUE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4876,10 +4876,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 30,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4890,10 +4890,10 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
             /* entry_index           = */ 40,
             /* insert_flag           = */ TRUE,
             /* flags                 = */ H5C__SET_FLUSH_MARKER_FLAG,
-	    /* num_pins              = */ 1,
-	    /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
-		                           -1, -1, -1, -1, -1, -1, -1},
-	    /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
+        /* num_pins              = */ 1,
+        /* pin_type[MAX_PINS]    = */ {PICO_ENTRY_TYPE,
+                                -1, -1, -1, -1, -1, -1, -1},
+        /* pin_idx[MAX_PINS]     = */ {100, -1, -1, -1, -1, -1, -1, -1},
             /* expected_deserialized = */ FALSE,
             /* expected_serialized   = */ FALSE,
             /* expected_destroyed    = */ TRUE
@@ -4908,15 +4908,15 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
 
 } /* check_flush_cache__multi_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__multi_entry_test()
+ * Function:    check_flush_cache__multi_entry_test()
  *
- * Purpose:	Run a multi entry flush cache test.
+ * Purpose:    Run a multi entry flush cache test.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              1/13/05
  *
  * Modifications:
@@ -4933,9 +4933,9 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 {
     H5C_t * cache_ptr = file_ptr->shared->cache;
     static char    msg[128];
-    herr_t	   result;
+    herr_t       result;
     unsigned       u;
-    size_t	   total_entry_size = 0;
+    size_t       total_entry_size = 0;
     test_entry_t * base_addr;
     test_entry_t * entry_ptr;
 
@@ -4943,7 +4943,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
     /* This gets used a lot, so lets leave it in. */
 
     HDfprintf(stdout, "check_flush_cache__multi_entry_test: test %d\n",
-	      test_num);
+        test_num);
 #endif /* JRM */
 
     if(cache_ptr == NULL) {
@@ -5127,15 +5127,15 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 
 } /* check_flush_cache__multi_entry_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__pe_multi_entry_test()
+ * Function:    check_flush_cache__pe_multi_entry_test()
  *
- * Purpose:	Run a multi entry flush cache test.
+ * Purpose:    Run a multi entry flush cache test.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/5/06
  *
  * Modifications:
@@ -5152,10 +5152,10 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
 {
     H5C_t *cache_ptr = file_ptr->shared->cache;
     static char    msg[128];
-    herr_t	   result;
+    herr_t       result;
     unsigned       u;
     int            j;
-    size_t	   total_entry_size = 0;
+    size_t       total_entry_size = 0;
     test_entry_t * base_addr;
     test_entry_t * entry_ptr;
 
@@ -5163,7 +5163,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
     /* This is useful debugging code.  Leave it in for now. */
 
     HDfprintf(stdout, "check_flush_cache__pe_multi_entry_test: test %d\n",
-	      test_num);
+        test_num);
 #endif /* JRM */
 
     if(cache_ptr == NULL) {
@@ -5201,8 +5201,8 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
              (spec[u].entry_type >= NUMBER_OF_ENTRY_TYPES) ||
              (spec[u].entry_index < 0) ||
              (spec[u].entry_index > max_indices[spec[u].entry_type]) ||
-	     (spec[u].num_pins < 0) ||
-	     (spec[u].num_pins > MAX_PINS)) {
+        (spec[u].num_pins < 0) ||
+        (spec[u].num_pins > MAX_PINS)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
@@ -5231,14 +5231,14 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
 
         total_entry_size += entry_sizes[spec[u].entry_type];
 
-	for (j = 0; j < spec[u].num_pins; j++)
-	{
+    for (j = 0; j < spec[u].num_pins; j++)
+    {
             create_pinned_entry_dependency(file_ptr,
-		                           spec[u].entry_type,
-					   spec[u].entry_index,
-					   spec[u].pin_type[j],
-					   spec[u].pin_idx[j]);
-	}
+                                spec[u].entry_type,
+                    spec[u].entry_index,
+                    spec[u].pin_type[j],
+                    spec[u].pin_idx[j]);
+    }
 
         u++;
     }
@@ -5358,21 +5358,21 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
 
 } /* check_flush_cache__pe_multi_entry_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__flush_ops()
+ * Function:    check_flush_cache__flush_ops()
  *
- * Purpose:	Run the flush ops cache tests.
+ * Purpose:    Run the flush ops cache tests.
  *
- * 		These are tests that test the cache's ability to handle
- * 		the case in which the flush callback dirties, resizes,
- * 		and/or moves entries.
+ *         These are tests that test the cache's ability to handle
+ *         the case in which the flush callback dirties, resizes,
+ *         and/or moves entries.
  *
- * 		Do nothing if pass is FALSE on entry.
+ *         Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/3/06
  *
  * Modifications:
@@ -5399,468 +5399,468 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 
     if(pass) /* test #1 */
     {
-	/* start with a very simple test, in which there are two entries
-	 * resident in cache, and the second entry dirties the first in
-	 * the flush callback.  No size changes, and no flush flags.
-	 */
-        int test_num			= 1;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 2;
-	unsigned init_expected_index_len	= 2;
-	size_t init_expected_index_size	= 2 * PICO_ENTRY_SIZE;
-	unsigned expected_index_len		= 2;
-	size_t expected_index_size	= 2 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[2] =
-	{
+    /* start with a very simple test, in which there are two entries
+    * resident in cache, and the second entry dirties the first in
+    * the flush callback.  No size changes, and no flush flags.
+    */
+        int test_num            = 1;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 2;
+    unsigned init_expected_index_len    = 2;
+    size_t init_expected_index_size    = 2 * PICO_ENTRY_SIZE;
+    unsigned expected_index_len        = 2;
+    size_t expected_index_size    = 2 * PICO_ENTRY_SIZE;
+    struct fo_flush_cache_test_spec spec[2] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
           {
             /* entry_num          = */ 1,
             /* entry_type         = */ 0,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #2 */
     {
-	/* Same as test 1, only this time set the flush invalidate flag.
-	 * Note that we must repeat all tests with the flush invalidate flag
-	 * as this triggers a different set of code to execute the flush.
-	 *
-	 * Create two entries resident in cache, and have the second entry
-	 * dirty the first in the flush callback.
-	 */
-        int test_num			= 2;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 2;
-	unsigned init_expected_index_len	= 2;
-	size_t init_expected_index_size	= 2 * PICO_ENTRY_SIZE;
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[2] =
-	{
+    /* Same as test 1, only this time set the flush invalidate flag.
+    * Note that we must repeat all tests with the flush invalidate flag
+    * as this triggers a different set of code to execute the flush.
+    *
+    * Create two entries resident in cache, and have the second entry
+    * dirty the first in the flush callback.
+    */
+        int test_num            = 2;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 2;
+    unsigned init_expected_index_len    = 2;
+    size_t init_expected_index_size    = 2 * PICO_ENTRY_SIZE;
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = 0;
+    struct fo_flush_cache_test_spec spec[2] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
           {
             /* entry_num          = */ 1,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:	flag:	size: order_ptr*/
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:    flag:    size: order_ptr*/
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #3 */
     {
-	/* Single entry test verifying that the cache can handle the case in
-	 * which the call back function resizes the entry for which it has
-	 * been called.
-	 */
-        int test_num			= 3;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	unsigned expected_index_len		= 1;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Single entry test verifying that the cache can handle the case in
+    * which the call back function resizes the entry for which it has
+    * been called.
+    */
+        int test_num            = 3;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = VARIABLE_ENTRY_SIZE / 4;
+    unsigned expected_index_len        = 1;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE / 2;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:			idx:	flag:	size: order_ptr:*/
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:            idx:    flag:    size: order_ptr:*/
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #4 */
     {
-	/* Repeat test #4 with the flush invalidate flag.
-	 *
-	 * Single entry test verifying that the cache can handle the case in
-	 * which the call back function resizes the entry for which it has
-	 * been called.
-	 */
-        int test_num			= 4;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Repeat test #4 with the flush invalidate flag.
+    *
+    * Single entry test verifying that the cache can handle the case in
+    * which the call back function resizes the entry for which it has
+    * been called.
+    */
+        int test_num            = 4;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = VARIABLE_ENTRY_SIZE / 4;
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = 0;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:			idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:            idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #5 & #6 */
     {
-	/* Single entry test verifying that the cache can handle the case in
-	 * which the call back function first resizes and then moves the
-	 * entry for which it has been called.
-	 *
-	 * Run this entry twice, as the first run moves the entry to its
-	 * alternate address, and the second moves it back.
+    /* Single entry test verifying that the cache can handle the case in
+    * which the call back function first resizes and then moves the
+    * entry for which it has been called.
+    *
+    * Run this entry twice, as the first run moves the entry to its
+    * alternate address, and the second moves it back.
          *
          * 10/8/07 -- JRM
          * Added a resize operation to this test to satisfy the new
          * requiremnt that any resize of an entry on flush will always
          * be accompanied by a resize.  Note that as a result, this
          * test becomes redundant with later tests.
-	 */
-        int test_num			= 5; /* and 6 */
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 1;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    */
+        int test_num            = 5; /* and 6 */
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 1;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE / 2;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 2,
-	    /* flush_ops          = */
-	    /*	op_code:		type:			idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 2,    NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 2,
+        /* flush_ops          = */
+        /*    op_code:        type:            idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 2,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-
-	/* this change forces the move to move the target entry back to its
-	 * main address.  The first test moved it to its alternate address.
-	 *
-	 * Note that these two tests are not the same, as in the first test,
-	 * the moved entry is moved forward in the slist.  In the second
-	 * it is moved backwards.
-	 *
-	 * Since there is only one entry in the cache, this doesn't really
-	 * matter in this case.  But we will do similar tests later with
-	 * other entries in the cache.
-	 */
-	if(pass) {
-
-	    spec[0].flush_ops[1].flag = TRUE;
-	    test_num = 6;
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+
+    /* this change forces the move to move the target entry back to its
+    * main address.  The first test moved it to its alternate address.
+    *
+    * Note that these two tests are not the same, as in the first test,
+    * the moved entry is moved forward in the slist.  In the second
+    * it is moved backwards.
+    *
+    * Since there is only one entry in the cache, this doesn't really
+    * matter in this case.  But we will do similar tests later with
+    * other entries in the cache.
+    */
+    if(pass) {
+
+        spec[0].flush_ops[1].flag = TRUE;
+        test_num = 6;
 
             check_flush_cache__flush_op_test(file_ptr,
                                              test_num,
@@ -5871,118 +5871,118 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
                                              init_expected_index_size,
                                              expected_index_len,
                                              expected_index_size,
-					     check_size,
-					     checks);
-	}
+                        check_size,
+                        checks);
+    }
     }
 
     if(pass) /* test #7 & #8 */
     {
-	/* Run tests 5 & 6 again, using the flush invalidate flag on the
-	 * second test.
-	 *
-	 * Single entry test verifying that the cache can handle the case in
-	 * which the call back function moves the entry for which it has
-	 * been called.
-	 *
-	 * Run this entry twice, as the first run moves the entry to its
-	 * alternate address, and the second moves it back.
+    /* Run tests 5 & 6 again, using the flush invalidate flag on the
+    * second test.
+    *
+    * Single entry test verifying that the cache can handle the case in
+    * which the call back function moves the entry for which it has
+    * been called.
+    *
+    * Run this entry twice, as the first run moves the entry to its
+    * alternate address, and the second moves it back.
          *
          * 10/8/07 -- JRM
          * Added a resize operation to this test to satisfy the new
          * requiremnt that any resize of an entry on flush will always
          * be accompanied by a resize.  Note that as a result, this
          * test becomes redundant with later tests.
-	 */
-        int test_num			= 7; /* and 8 */
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 1;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    */
+        int test_num            = 7; /* and 8 */
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 1;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE / 2;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 2,
-	    /* flush_ops          = */
-	    /*	op_code:		type:			idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 2,    NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 2,
+        /* flush_ops          = */
+        /*    op_code:        type:            idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 2,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-
-	/* this change forces the move to move the target entry back to its
-	 * main address.  The first test moved it to its alternate address.
-	 *
-	 * Note that these two tests are not the same, as in the first test,
-	 * the moved entry is moved forward in the slist.  In the second
-	 * it is moved backwards.
-	 *
-	 * Since there is only one entry in the cache, this doesn't really
-	 * matter in this case.  But we will do similar tests later with
-	 * other entries in the cache.
-	 */
-
-	if(pass) {
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+
+    /* this change forces the move to move the target entry back to its
+    * main address.  The first test moved it to its alternate address.
+    *
+    * Note that these two tests are not the same, as in the first test,
+    * the moved entry is moved forward in the slist.  In the second
+    * it is moved backwards.
+    *
+    * Since there is only one entry in the cache, this doesn't really
+    * matter in this case.  But we will do similar tests later with
+    * other entries in the cache.
+    */
+
+    if(pass) {
 
             test_num = 8;
-	    flush_flags = H5C__FLUSH_INVALIDATE_FLAG;
-	    expected_index_len = 0;
-	    expected_index_size	= 0;
-	    spec[0].flush_ops[1].flag = TRUE;
-	    spec[0].expected_destroyed = TRUE;
+        flush_flags = H5C__FLUSH_INVALIDATE_FLAG;
+        expected_index_len = 0;
+        expected_index_size    = 0;
+        spec[0].flush_ops[1].flag = TRUE;
+        spec[0].expected_destroyed = TRUE;
 
             check_flush_cache__flush_op_test(file_ptr,
                                              test_num,
@@ -5993,104 +5993,104 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
                                              init_expected_index_size,
                                              expected_index_len,
                                              expected_index_size,
-					     check_size,
-					     checks);
-	}
+                        check_size,
+                        checks);
+    }
     }
 
     if(pass) /* test #9 & #10 */
     {
-	/* Single entry test verifying that the cache can handle the case in
-	 * which the call back function both resizes and moves the entry
-	 * for which it has been called.
-	 *
-	 * Again, we run this entry twice, as the first run moves the entry
+    /* Single entry test verifying that the cache can handle the case in
+    * which the call back function both resizes and moves the entry
+    * for which it has been called.
+    *
+    * Again, we run this entry twice, as the first run moves the entry
          * to its alternate address, and the second moves it back.
-	 */
-        int test_num			= 9; /* and 10 */
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	unsigned expected_index_len		= 1;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    */
+        int test_num            = 9; /* and 10 */
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = VARIABLE_ENTRY_SIZE / 2;
+    unsigned expected_index_len        = 1;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE / 4;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 2,
-	    /* flush_ops          = */
-	    /*	op_code:		type:			idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 2,
+        /* flush_ops          = */
+        /*    op_code:        type:            idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-
-	/* this change forces the move to move the target entry back to its
-	 * main address.  The first test moved it to its alternate address.
-	 *
-	 * Note that these two tests are not the same, as in the first test,
-	 * the moved entry is moved forward in the slist.  In the second
-	 * it is moved backwards.
-	 *
-	 * Since there is only one entry in the cache, this doesn't really
-	 * matter in this case.  But we will do similar tests later with
-	 * other entries in the cache.
-	 */
-	if(pass) {
-
-	    spec[0].flush_ops[1].flag = TRUE;
-	    test_num = 10;
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+
+    /* this change forces the move to move the target entry back to its
+    * main address.  The first test moved it to its alternate address.
+    *
+    * Note that these two tests are not the same, as in the first test,
+    * the moved entry is moved forward in the slist.  In the second
+    * it is moved backwards.
+    *
+    * Since there is only one entry in the cache, this doesn't really
+    * matter in this case.  But we will do similar tests later with
+    * other entries in the cache.
+    */
+    if(pass) {
+
+        spec[0].flush_ops[1].flag = TRUE;
+        test_num = 10;
 
             check_flush_cache__flush_op_test(file_ptr,
                                              test_num,
@@ -6101,111 +6101,111 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
                                              init_expected_index_size,
                                              expected_index_len,
                                              expected_index_size,
-					     check_size,
-					     checks);
-	}
+                        check_size,
+                        checks);
+    }
     }
 
     if(pass) /* test #11 & #12 */
     {
-	/* Repeat the previous test with the flush invalidate flag on the
-	 * second test.
-	 *
-	 * Single entry test verifying that the cache can handle the case in
-	 * which the call back function both resizes and moves the entry
-	 * for which it has been called.
-	 *
-	 * Again, we run this entry twice, as the first run moves the entry to its
-	 * alternate address, and the second moves it back.
-	 */
-        int test_num			= 11; /* and 12 */
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	unsigned expected_index_len		= 1;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Repeat the previous test with the flush invalidate flag on the
+    * second test.
+    *
+    * Single entry test verifying that the cache can handle the case in
+    * which the call back function both resizes and moves the entry
+    * for which it has been called.
+    *
+    * Again, we run this entry twice, as the first run moves the entry to its
+    * alternate address, and the second moves it back.
+    */
+        int test_num            = 11; /* and 12 */
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = VARIABLE_ENTRY_SIZE / 2;
+    unsigned expected_index_len        = 1;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE / 4;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 2,
-	    /* flush_ops          = */
-	    /*	op_code:		type:			idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4,    NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 2,
+        /* flush_ops          = */
+        /*    op_code:        type:            idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-
-	/* this change forces the move to move the target entry back to its
-	 * main address.  The first test moved it to its alternate address.
-	 *
-	 * Note that these two tests are not the same, as in the first test,
-	 * the moved entry is moved forward in the slist.  In the second
-	 * it is moved backwards.
-	 *
-	 * Since there is only one entry in the cache, this doesn't really
-	 * matter in this case.  But we will do similar tests later with
-	 * other entries in the cache.
-	 */
-	if(pass) {
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+
+    /* this change forces the move to move the target entry back to its
+    * main address.  The first test moved it to its alternate address.
+    *
+    * Note that these two tests are not the same, as in the first test,
+    * the moved entry is moved forward in the slist.  In the second
+    * it is moved backwards.
+    *
+    * Since there is only one entry in the cache, this doesn't really
+    * matter in this case.  But we will do similar tests later with
+    * other entries in the cache.
+    */
+    if(pass) {
 
             test_num = 12;
-	    flush_flags = H5C__FLUSH_INVALIDATE_FLAG;
-	    expected_index_len = 0;
-	    expected_index_size	= 0;
-	    spec[0].flush_ops[1].flag = TRUE;
-	    spec[0].expected_destroyed = TRUE;
+        flush_flags = H5C__FLUSH_INVALIDATE_FLAG;
+        expected_index_len = 0;
+        expected_index_size    = 0;
+        spec[0].flush_ops[1].flag = TRUE;
+        spec[0].expected_destroyed = TRUE;
 
 
             check_flush_cache__flush_op_test(file_ptr,
@@ -6217,500 +6217,500 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
                                              init_expected_index_size,
                                              expected_index_len,
                                              expected_index_size,
-					     check_size,
-					     checks);
-	}
+                        check_size,
+                        checks);
+    }
     }
 
     if(pass) /* test #13 */
     {
-	/* Test the ability of the cache to handle the case in which
-	 * the flush function of an entry that is resident in cache
-	 * dirties two entries that are not in cache.  No size
-	 * changes.
-	 *
-	 * At present, I am assured that this case will never occur, but
-	 * lets make sure we can handle it regardless.
-	 */
-        int test_num			= 13;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= 1 * PICO_ENTRY_SIZE;
-	unsigned expected_index_len		= 3;
-	size_t expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Test the ability of the cache to handle the case in which
+    * the flush function of an entry that is resident in cache
+    * dirties two entries that are not in cache.  No size
+    * changes.
+    *
+    * At present, I am assured that this case will never occur, but
+    * lets make sure we can handle it regardless.
+    */
+        int test_num            = 13;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = 1 * PICO_ENTRY_SIZE;
+    unsigned expected_index_len        = 3;
+    size_t expected_index_size    = 3 * PICO_ENTRY_SIZE;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 2,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__DIRTY,	0,	2,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 2,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    0,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 2;
-	struct fo_flush_entry_check checks[2] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ PICO_ENTRY_SIZE,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ PICO_ENTRY_SIZE,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 2;
+    struct fo_flush_entry_check checks[2] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ PICO_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ PICO_ENTRY_SIZE,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ PICO_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ PICO_ENTRY_SIZE,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #14 */
     {
-	/* Repeat previous test with the flush invalidate flag.
-	 *
-	 * Test the ability of the cache to handle the case in which
-	 * the flush function of an entry that is resident in cache
-	 * dirties two entries that are not in cache.  No size
-	 * changes.
-	 *
-	 * At present, I am assured that this case will never occur, but
-	 * lets make sure we can handle it regardless.
-	 */
-        int test_num			= 14;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= 1 * PICO_ENTRY_SIZE;
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Repeat previous test with the flush invalidate flag.
+    *
+    * Test the ability of the cache to handle the case in which
+    * the flush function of an entry that is resident in cache
+    * dirties two entries that are not in cache.  No size
+    * changes.
+    *
+    * At present, I am assured that this case will never occur, but
+    * lets make sure we can handle it regardless.
+    */
+        int test_num            = 14;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = 1 * PICO_ENTRY_SIZE;
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = (size_t)0;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 2,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__DIRTY,	0,	2,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 2,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    0,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 2;
-	struct fo_flush_entry_check checks[2] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ PICO_ENTRY_SIZE,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ PICO_ENTRY_SIZE,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  }
-	};
+    };
+    int check_size = 2;
+    struct fo_flush_entry_check checks[2] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ PICO_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ PICO_ENTRY_SIZE,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ PICO_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ PICO_ENTRY_SIZE,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #15 */
     {
-	/* Test the ability of the cache to handle the case in which
-	 * the flush function of an entry that is resident in cache
-	 * resizes and dirties two entries that are not in cache.
-	 *
-	 * At present, I am assured that this case will never occur, but
-	 * lets make sure we can handle it regardless.
-	 */
-        int test_num			= 15;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= 1 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 3;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
-		                          (VARIABLE_ENTRY_SIZE / 4) +
-					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Test the ability of the cache to handle the case in which
+    * the flush function of an entry that is resident in cache
+    * resizes and dirties two entries that are not in cache.
+    *
+    * At present, I am assured that this case will never occur, but
+    * lets make sure we can handle it regardless.
+    */
+        int test_num            = 15;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = 1 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 3;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE +
+                                (VARIABLE_ENTRY_SIZE / 4) +
+                    (VARIABLE_ENTRY_SIZE / 2);
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 4,
-	    /* flush_ops          = */
-	    /*	op_code:		type:			idx:	flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,			0,	FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 4,
+        /* flush_ops          = */
+        /*    op_code:        type:            idx:    flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,            0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 2;
-	struct fo_flush_entry_check checks[2] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 2;
+    struct fo_flush_entry_check checks[2] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #16 */
     {
-	/* Repeat previous test with the flush invalidate flag.
-	 *
-	 * Test the ability of the cache to handle the case in which
-	 * the flush function of an entry that is resident in cache
-	 * resizes and dirties two entries that are not in cache.
-	 *
-	 * At present, I am assured that this case will never occur, but
-	 * lets make sure we can handle it regardless.
-	 */
-        int test_num			= 16;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= 1 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Repeat previous test with the flush invalidate flag.
+    *
+    * Test the ability of the cache to handle the case in which
+    * the flush function of an entry that is resident in cache
+    * resizes and dirties two entries that are not in cache.
+    *
+    * At present, I am assured that this case will never occur, but
+    * lets make sure we can handle it regardless.
+    */
+        int test_num            = 16;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = 1 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = (size_t)0;
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 4,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 4,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 2;
-	struct fo_flush_entry_check checks[2] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  }
-	};
+    };
+    int check_size = 2;
+    struct fo_flush_entry_check checks[2] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #17 & #18 */
     {
-	/* Test the ability of the cache to handle the case in which
-	 * the flush function of an entry that is resident in cache
-	 * resizes, dirties, and moves two entries that are not in cache.
-	 *
-	 * At present, I am assured that this case will never occur, but
-	 * lets make sure we can handle it regardless.
-	 */
-        int test_num			= 17; /* and 18 */
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= 1 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 3;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
-		                          (VARIABLE_ENTRY_SIZE / 4) +
-					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Test the ability of the cache to handle the case in which
+    * the flush function of an entry that is resident in cache
+    * resizes, dirties, and moves two entries that are not in cache.
+    *
+    * At present, I am assured that this case will never occur, but
+    * lets make sure we can handle it regardless.
+    */
+        int test_num            = 17; /* and 18 */
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = 1 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 3;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE +
+                                (VARIABLE_ENTRY_SIZE / 4) +
+                    (VARIABLE_ENTRY_SIZE / 2);
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 2;
-	struct fo_flush_entry_check checks[2] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 2;
+    struct fo_flush_entry_check checks[2] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-
-	/* this change forces the moves to move the target entries back to
-	 * their main address.  The first test moved them to their alternate
-	 * address.
-	 *
-	 * Note that these two tests are not the same, as in the first test,
-	 * the moved entries are moved forward in the slist.  In the second
-	 * they are moved backwards.
-	 */
-	if(pass) {
-
-	    test_num = 18;
-	    spec[0].flush_ops[2].flag = TRUE;
-	    spec[0].flush_ops[5].flag = TRUE;
-	    checks[0].at_main_addr = TRUE;
-	    checks[1].at_main_addr = TRUE;
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+
+    /* this change forces the moves to move the target entries back to
+    * their main address.  The first test moved them to their alternate
+    * address.
+    *
+    * Note that these two tests are not the same, as in the first test,
+    * the moved entries are moved forward in the slist.  In the second
+    * they are moved backwards.
+    */
+    if(pass) {
+
+        test_num = 18;
+        spec[0].flush_ops[2].flag = TRUE;
+        spec[0].flush_ops[5].flag = TRUE;
+        checks[0].at_main_addr = TRUE;
+        checks[1].at_main_addr = TRUE;
 
             check_flush_cache__flush_op_test(file_ptr,
                                              test_num,
@@ -6721,131 +6721,131 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
                                              init_expected_index_size,
                                              expected_index_len,
                                              expected_index_size,
-					     check_size,
-					     checks);
-	}
+                        check_size,
+                        checks);
+    }
     }
 
     if(pass) /* test #19 & #20 */
     {
-	/* Repeat the above test with the flush invalidate flag on the
-	 * second test.
-	 *
-	 * Test the ability of the cache to handle the case in which
-	 * the flush function of an entry that is resident in cache
-	 * resizes, dirties, and moves two entries that are not in cache.
-	 *
-	 * At present, I am assured that this case will never occur, but
-	 * lets make sure we can handle it regardless.
-	 */
-        int test_num			= 19; /* and 20 */
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 1;
-	unsigned init_expected_index_len	= 1;
-	size_t init_expected_index_size	= 1 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 3;
-	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
-		                          (VARIABLE_ENTRY_SIZE / 4) +
-					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] =
-	{
+    /* Repeat the above test with the flush invalidate flag on the
+    * second test.
+    *
+    * Test the ability of the cache to handle the case in which
+    * the flush function of an entry that is resident in cache
+    * resizes, dirties, and moves two entries that are not in cache.
+    *
+    * At present, I am assured that this case will never occur, but
+    * lets make sure we can handle it regardless.
+    */
+        int test_num            = 19; /* and 20 */
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 1;
+    unsigned init_expected_index_len    = 1;
+    size_t init_expected_index_size    = 1 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 3;
+    size_t expected_index_size    = VARIABLE_ENTRY_SIZE +
+                                (VARIABLE_ENTRY_SIZE / 4) +
+                    (VARIABLE_ENTRY_SIZE / 2);
+    struct fo_flush_cache_test_spec spec[1] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 2;
-	struct fo_flush_entry_check checks[2] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 2;
+    struct fo_flush_entry_check checks[2] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-
-	/* this change forces the moves to move the target entries back to
-	 * their main address.  The first test moved them to their alternate
-	 * address.
-	 *
-	 * Note that these two tests are not the same, as in the first test,
-	 * the moved entries are moved forward in the slist.  In the second
-	 * they are moved backwards.
-	 */
-	if(pass) {
-
-	    test_num = 20;
-	    flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	    expected_index_len = 0;
-	    expected_index_size	= (size_t)0;
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+
+    /* this change forces the moves to move the target entries back to
+    * their main address.  The first test moved them to their alternate
+    * address.
+    *
+    * Note that these two tests are not the same, as in the first test,
+    * the moved entries are moved forward in the slist.  In the second
+    * they are moved backwards.
+    */
+    if(pass) {
+
+        test_num = 20;
+        flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+        expected_index_len = 0;
+        expected_index_size    = (size_t)0;
             spec[0].expected_destroyed = TRUE;
-	    spec[0].flush_ops[2].flag = TRUE;
-	    spec[0].flush_ops[5].flag = TRUE;
-	    checks[0].at_main_addr = TRUE;
-	    checks[0].in_cache = FALSE;
-	    checks[0].expected_destroyed = TRUE;
-	    checks[1].at_main_addr = TRUE;
-	    checks[1].in_cache = FALSE;
-	    checks[1].expected_destroyed = TRUE;
+        spec[0].flush_ops[2].flag = TRUE;
+        spec[0].flush_ops[5].flag = TRUE;
+        checks[0].at_main_addr = TRUE;
+        checks[0].in_cache = FALSE;
+        checks[0].expected_destroyed = TRUE;
+        checks[1].at_main_addr = TRUE;
+        checks[1].in_cache = FALSE;
+        checks[1].expected_destroyed = TRUE;
 
             check_flush_cache__flush_op_test(file_ptr,
                                              test_num,
@@ -6856,757 +6856,757 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
                                              init_expected_index_size,
                                              expected_index_len,
                                              expected_index_size,
-					     check_size,
-					     checks);
-	}
+                        check_size,
+                        checks);
+    }
     }
 
     if(pass) /* test #21 */
     {
-	/* Now mix things up a bit.
-	 *
-	 * Load several entries, two of which have flush functions that
-	 * resize, dirty, and move two entries that are not in the
-	 * cache.  Mark only one of these entries, and then flush the
-	 * cache with the flush marked entries flag.
-	 *
-	 * This is the only test in which we test the
-	 * H5C__FLUSH_MARKED_ENTRIES_FLAG.  The hope is that since
-	 * we test the two features extensively by themselves, so
-	 * it should be sufficient to verify that they play together
-	 * as expected.
-	 */
-        int test_num			= 21;
-	unsigned int flush_flags	= H5C__FLUSH_MARKED_ENTRIES_FLAG;
-	int spec_size			= 4;
-	unsigned init_expected_index_len	= 4;
-	size_t init_expected_index_size	= (2 * VARIABLE_ENTRY_SIZE) + (2 * PICO_ENTRY_SIZE);
-	unsigned expected_index_len		= 6;
-	size_t expected_index_size	= (2 * VARIABLE_ENTRY_SIZE) +
-		                          (VARIABLE_ENTRY_SIZE / 4) +
-					  (VARIABLE_ENTRY_SIZE / 2) +
-					  (2 * PICO_ENTRY_SIZE);
-	struct fo_flush_cache_test_spec spec[4] =
-	{
+    /* Now mix things up a bit.
+    *
+    * Load several entries, two of which have flush functions that
+    * resize, dirty, and move two entries that are not in the
+    * cache.  Mark only one of these entries, and then flush the
+    * cache with the flush marked entries flag.
+    *
+    * This is the only test in which we test the
+    * H5C__FLUSH_MARKED_ENTRIES_FLAG.  The hope is that since
+    * we test the two features extensively by themselves, so
+    * it should be sufficient to verify that they play together
+    * as expected.
+    */
+        int test_num            = 21;
+    unsigned int flush_flags    = H5C__FLUSH_MARKED_ENTRIES_FLAG;
+    int spec_size            = 4;
+    unsigned init_expected_index_len    = 4;
+    size_t init_expected_index_size    = (2 * VARIABLE_ENTRY_SIZE) + (2 * PICO_ENTRY_SIZE);
+    unsigned expected_index_len        = 6;
+    size_t expected_index_size    = (2 * VARIABLE_ENTRY_SIZE) +
+                                (VARIABLE_ENTRY_SIZE / 4) +
+                    (VARIABLE_ENTRY_SIZE / 2) +
+                    (2 * PICO_ENTRY_SIZE);
+    struct fo_flush_cache_test_spec spec[4] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 11,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	10,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	10,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	10,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	12,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	12,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	12,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 11,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    10,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    10,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    10,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    12,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    12,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    12,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG | H5C__SET_FLUSH_MARKER_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 4;
-	struct fo_flush_entry_check checks[4] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ TRUE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ TRUE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 2,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 10,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 3,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 12,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 4;
+    struct fo_flush_entry_check checks[4] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ TRUE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ TRUE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 2,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 10,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 3,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 12,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-	reset_entries();
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+    reset_entries();
     }
 
     if(pass) /* test #22 */
     {
-	/* Mix things up some more.
-	 *
-	 * Load lots of entries, some of which have flush functions that
-	 * resize, dirty, and move two entries that are not in the
-	 * cache.
-	 *
-	 * Also load entries that have flush ops on entries that are in
-	 * cache.
-	 */
-        int test_num			= 22;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 6;
-	unsigned init_expected_index_len	= 6;
-	size_t init_expected_index_size	= (2 * VARIABLE_ENTRY_SIZE) + (4 * PICO_ENTRY_SIZE);
-	unsigned expected_index_len		= 10;
-	size_t expected_index_size	= (2 * VARIABLE_ENTRY_SIZE) +
-		                          (2 * (VARIABLE_ENTRY_SIZE / 4)) +
-					  (2 * (VARIABLE_ENTRY_SIZE / 2)) +
-					  (4 * PICO_ENTRY_SIZE);
-	struct fo_flush_cache_test_spec spec[6] =
-	{
+    /* Mix things up some more.
+    *
+    * Load lots of entries, some of which have flush functions that
+    * resize, dirty, and move two entries that are not in the
+    * cache.
+    *
+    * Also load entries that have flush ops on entries that are in
+    * cache.
+    */
+        int test_num            = 22;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 6;
+    unsigned init_expected_index_len    = 6;
+    size_t init_expected_index_size    = (2 * VARIABLE_ENTRY_SIZE) + (4 * PICO_ENTRY_SIZE);
+    unsigned expected_index_len        = 10;
+    size_t expected_index_size    = (2 * VARIABLE_ENTRY_SIZE) +
+                                (2 * (VARIABLE_ENTRY_SIZE / 4)) +
+                    (2 * (VARIABLE_ENTRY_SIZE / 2)) +
+                    (4 * PICO_ENTRY_SIZE);
+    struct fo_flush_cache_test_spec spec[6] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 11,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	10,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	10,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	10,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	12,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	12,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	12,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 11,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    10,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    10,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    10,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    12,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    12,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    12,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 4,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 10,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 10,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
           {
             /* entry_num          = */ 5,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 20,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 20,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 4;
-	struct fo_flush_entry_check checks[4] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 2,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 10,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 3,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 12,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 4;
+    struct fo_flush_entry_check checks[4] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 2,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 10,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 3,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 12,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-	reset_entries();
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+    reset_entries();
     }
 
     if(pass) /* test #23 */
     {
-	/* Repeat test #23 with the flush invalidate flag set.
-	 *
-	 * Mix things up some more.
-	 *
-	 * Load lots of entries, some of which have flush functions that
-	 * resize, dirty, and move two entries that are not in the
-	 * cache.
-	 *
-	 * Also load entries that have flush ops on entries that are in
-	 * cache.
-	 */
-        int test_num			= 23;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 6;
-	unsigned init_expected_index_len	= 6;
-	size_t init_expected_index_size	= (2 * VARIABLE_ENTRY_SIZE) + (4 * PICO_ENTRY_SIZE);
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[6] =
-	{
+    /* Repeat test #23 with the flush invalidate flag set.
+    *
+    * Mix things up some more.
+    *
+    * Load lots of entries, some of which have flush functions that
+    * resize, dirty, and move two entries that are not in the
+    * cache.
+    *
+    * Also load entries that have flush ops on entries that are in
+    * cache.
+    */
+        int test_num            = 23;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 6;
+    unsigned init_expected_index_len    = 6;
+    size_t init_expected_index_size    = (2 * VARIABLE_ENTRY_SIZE) + (4 * PICO_ENTRY_SIZE);
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = 0;
+    struct fo_flush_cache_test_spec spec[6] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	0,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	2,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    2,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
           {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 11,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 6,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	10,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	10,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	10,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	12,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	12,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	12,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 11,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 6,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    10,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    10,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    10,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    12,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    12,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    12,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
           {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 0,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
           {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 1,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 1,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ TRUE
           },
           {
             /* entry_num          = */ 4,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 10,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 10,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
           {
             /* entry_num          = */ 5,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 20,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 20,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,0,FALSE,0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 4;
-	struct fo_flush_entry_check checks[4] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
-	  {
-	    /* entry_num          = */ 2,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 10,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
-	  {
-	    /* entry_num          = */ 3,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 12,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  }
-	};
+    };
+    int check_size = 4;
+    struct fo_flush_entry_check checks[4] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
+    {
+        /* entry_num          = */ 2,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 10,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 4,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
+    {
+        /* entry_num          = */ 3,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 12,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
-	reset_entries();
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
+    reset_entries();
     }
 
     /* So much for tests involving only flush operations.
@@ -7615,1512 +7615,1512 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
      */
     if(pass) /* test #24 */
     {
-	/* Pico entries 50 and 150 pin pico entry 100, and also dirty
-	 * pico entry 100 on flush.
-	 */
-        int test_num			= 24;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 3;
-	unsigned init_expected_index_len	= 3;
-	size_t init_expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	unsigned expected_index_len		= 3;
-	size_t expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[3] =
-	{
+    /* Pico entries 50 and 150 pin pico entry 100, and also dirty
+    * pico entry 100 on flush.
+    */
+        int test_num            = 24;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 3;
+    unsigned init_expected_index_len    = 3;
+    size_t init_expected_index_size    = 3 * PICO_ENTRY_SIZE;
+    unsigned expected_index_len        = 3;
+    size_t expected_index_size    = 3 * PICO_ENTRY_SIZE;
+    struct fo_flush_cache_test_spec spec[3] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 100,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 100,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 1,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 50,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 50,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 150,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
-	      { FLUSH_OP__DIRTY,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 150,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
+        { FLUSH_OP__DIRTY,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #25 */
     {
-	/* Repeat the previous test with the flush invalidate flag.
-	 *
-	 * Pico entries 50 and 150 pin pico entry 100, and also dirty
-	 * pico entry 100 on flush.
-	 */
-        int test_num			= 25;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 3;
-	unsigned init_expected_index_len	= 3;
-	size_t init_expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[3] =
-	{
+    /* Repeat the previous test with the flush invalidate flag.
+    *
+    * Pico entries 50 and 150 pin pico entry 100, and also dirty
+    * pico entry 100 on flush.
+    */
+        int test_num            = 25;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 3;
+    unsigned init_expected_index_len    = 3;
+    size_t init_expected_index_size    = 3 * PICO_ENTRY_SIZE;
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = (size_t)0;
+    struct fo_flush_cache_test_spec spec[3] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 100,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 100,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 1,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 50,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 50,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
-	    /* entry_index        = */ 150,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 1,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__DIRTY,	PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
-	      { FLUSH_OP__DIRTY,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 150,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {PICO_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 1,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__DIRTY,    PICO_ENTRY_TYPE,100,FALSE,0,  NULL },
+        { FLUSH_OP__DIRTY,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ (size_t)0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ (size_t)0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
     }
 
     if(pass) /* test #26 */
     {
-	/* This one is complex.
-	 *
-	 * In the following overvies table, VET stands for
-	 * VARIABLE_ENTRY_TYPE.
-	 *
-	 * In trying to follow what happens when we flush the
-	 * set of entries constructed below, recall that each
-	 * flush operation is executed the first time the
-	 * entry is flushed, and then not executed again.
-	 * This may be a weakness in the tests, but that
-	 * is the way it is for now.
-	 *
-	 * After thinking about it for a while, I'm not sure that
-	 * the interaction between pins and flush operations needs
-	 * all that much testing, as the two are essentially
-	 * orthoginal.  Thus this is a bit of a smoke check to
-	 * verify that we get the expected results.
-	 *
-	 * (VET, 100)	initially not resident in cache
-	 *
-	 * (VET, 200)	initially clean and resident in cache
-	 *
-	 * (VET, 300)	initially not resident in cache
-	 *
-	 * (VET, 2100)	initially clean and resident in cache
-	 *
-	 * (VET, 2200)	initially not resident in cache
-	 *
-	 * (VET, 2300)	initially clean and resident in cache
-	 *
-	 * (VET, 1000)	initially clean, and in cache
-	 * 		dirties (VET, 100)
-	 * 		resizes (VET, 200)
-	 * 		dirty	(VET, 300) -- dirty first to bring into cache.
-	 * 		moves (VET, 300)
-	 *
-	 * (VET, 2000)	initially clean, and in cache
-	 * 		dirties (VET, 2100)
-	 * 		resizes (VET, 2200)
-	 * 		moves (VET, 2300)
-	 *
-	 * (VET, 350)	initially clean, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties (VET, 1000)
-	 * 		resizes (VET, 350)
-	 * 		pins	(VET, 2000)
-	 * 		dirties (VET, 2000)
-	 *
-	 * (VET, 450)	initially dirty, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties	(VET, 1000)
-	 * 		moves (VET, 450)
-	 * 		pins	(VET, 2000)
-	 * 		dirties (VET, 2000)
-	 *
-	 * (VET, 650)	initially clean, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties (VET, 1000)
-	 * 		resizes (VET, 650)
-	 * 		pins	(VET, 2000)
-	 * 		dirties (VET, 2000)
-	 *
-	 * (VET, 750)	initially dirty, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties (VET, 1000)
-	 * 		resizes (VET, 750)
-	 * 		pins	(VET, 2000)
-	 * 		dirties	(VET, 2000)
-	 *
-	 * (VET, 500)	initially dirty, and in cache
-	 * 		dirties	(VET, 350)
-	 * 		dirties	(VET, 450)
-	 * 		dirties	(VET, 650)
-	 * 		dirties (VET, 750)
-	 */
-        int test_num			= 26;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 10;
-	unsigned init_expected_index_len	= 10;
-	size_t init_expected_index_size	= 10 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 13;
-	size_t expected_index_size	= 9 * VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[10] =
-	{
+    /* This one is complex.
+    *
+    * In the following overvies table, VET stands for
+    * VARIABLE_ENTRY_TYPE.
+    *
+    * In trying to follow what happens when we flush the
+    * set of entries constructed below, recall that each
+    * flush operation is executed the first time the
+    * entry is flushed, and then not executed again.
+    * This may be a weakness in the tests, but that
+    * is the way it is for now.
+    *
+    * After thinking about it for a while, I'm not sure that
+    * the interaction between pins and flush operations needs
+    * all that much testing, as the two are essentially
+    * orthoginal.  Thus this is a bit of a smoke check to
+    * verify that we get the expected results.
+    *
+    * (VET, 100)    initially not resident in cache
+    *
+    * (VET, 200)    initially clean and resident in cache
+    *
+    * (VET, 300)    initially not resident in cache
+    *
+    * (VET, 2100)    initially clean and resident in cache
+    *
+    * (VET, 2200)    initially not resident in cache
+    *
+    * (VET, 2300)    initially clean and resident in cache
+    *
+    * (VET, 1000)    initially clean, and in cache
+    *         dirties (VET, 100)
+    *         resizes (VET, 200)
+    *         dirty    (VET, 300) -- dirty first to bring into cache.
+    *         moves (VET, 300)
+    *
+    * (VET, 2000)    initially clean, and in cache
+    *         dirties (VET, 2100)
+    *         resizes (VET, 2200)
+    *         moves (VET, 2300)
+    *
+    * (VET, 350)    initially clean, and in cache
+    *         pins    (VET, 1000)
+    *         dirties (VET, 1000)
+    *         resizes (VET, 350)
+    *         pins    (VET, 2000)
+    *         dirties (VET, 2000)
+    *
+    * (VET, 450)    initially dirty, and in cache
+    *         pins    (VET, 1000)
+    *         dirties    (VET, 1000)
+    *         moves (VET, 450)
+    *         pins    (VET, 2000)
+    *         dirties (VET, 2000)
+    *
+    * (VET, 650)    initially clean, and in cache
+    *         pins    (VET, 1000)
+    *         dirties (VET, 1000)
+    *         resizes (VET, 650)
+    *         pins    (VET, 2000)
+    *         dirties (VET, 2000)
+    *
+    * (VET, 750)    initially dirty, and in cache
+    *         pins    (VET, 1000)
+    *         dirties (VET, 1000)
+    *         resizes (VET, 750)
+    *         pins    (VET, 2000)
+    *         dirties    (VET, 2000)
+    *
+    * (VET, 500)    initially dirty, and in cache
+    *         dirties    (VET, 350)
+    *         dirties    (VET, 450)
+    *         dirties    (VET, 650)
+    *         dirties (VET, 750)
+    */
+        int test_num            = 26;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 10;
+    unsigned init_expected_index_len    = 10;
+    size_t init_expected_index_size    = 10 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 13;
+    size_t expected_index_size    = 9 * VARIABLE_ENTRY_SIZE;
+    struct fo_flush_cache_test_spec spec[10] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 200,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 200,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2100,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 2100,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 2,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2300,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 2300,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 3,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1000,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 4,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	200,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 1000,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 4,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    200,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    300,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    300,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 4,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2000,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2200,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	2300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 2000,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2200,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    2300,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 5,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 350,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	350,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 350,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    350,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 6,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 450,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	450,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 450,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    450,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 7,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 650,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	650,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 650,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    650,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 8,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 750,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	750,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 750,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    750,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 9,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 500,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 4,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	350,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	450,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	650,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	750,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 500,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 4,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    350,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    450,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    650,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    750,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 3;
-	struct fo_flush_entry_check checks[3] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 100,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 300,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  },
-	  {
-	    /* entry_num          = */ 2,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2200,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ TRUE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
-	  }
-
-	};
+    };
+    int check_size = 3;
+    struct fo_flush_entry_check checks[3] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 100,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 300,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    },
+    {
+        /* entry_num          = */ 2,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2200,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ TRUE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
+    }
+
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
 
-	reset_entries();
+    reset_entries();
     }
 
     if(pass) /* test #27 */
     {
-	/* Repeat test #26 with the flush invalidate flag.
-	 *
-	 * In the following overview table, VET stands for
-	 * VARIABLE_ENTRY_TYPE.
-	 *
-	 * In trying to follow what happens when we flush the
-	 * set of entries constructed below, recall that each
-	 * flush operation is executed the first time the
-	 * entry is flushed, and then not executed again.
-	 * This may be a weakness in the tests, but that
-	 * is the way it is for now.
-	 *
-	 * After thinking about it for a while, I'm not sure that
-	 * the interaction between pins and flush operations needs
-	 * all that much testing, as the two are essentially
-	 * orthoginal.  The big thing is to verify that flushes of
-	 * pinned entries with flush ops result in the expected
-	 * updates of the cache.
-	 *
-	 * Thus this is a bit of a smoke check to * verify that we
-	 * get the expected results.
-	 *
-	 * (VET, 100)	initially not resident in cache
-	 *
-	 * (VET, 200)	initially clean and resident in cache
-	 *
-	 * (VET, 300)	initially not resident in cache
-	 *
-	 * (VET, 2100)	initially clean and resident in cache
-	 *
-	 * (VET, 2200)	initially not resident in cache
-	 *
-	 * (VET, 2300)	initially clean and resident in cache
-	 *
-	 * (VET, 1000)	initially clean, and in cache
-	 * 		dirties (VET, 100)
-	 * 		resizes (VET, 200)
-	 * 		dirty	(VET, 300) -- dirty first to bring into cache.
-	 * 		moves (VET, 300)
-	 *
-	 * (VET, 2000)	initially clean, and in cache
-	 * 		dirties (VET, 2100)
-	 * 		resizes (VET, 2200)
-	 * 		moves (VET, 2300)
-	 *
-	 * (VET, 350)	initially clean, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties (VET, 1000)
-	 * 		resizes (VET, 350)
-	 * 		pins	(VET, 2000)
-	 * 		dirties (VET, 2000)
-	 *
-	 * (VET, 450)	initially dirty, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties	(VET, 1000)
-	 * 		moves (VET, 450)
-	 * 		pins	(VET, 2000)
-	 * 		dirties (VET, 2000)
-	 *
-	 * (VET, 650)	initially clean, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties (VET, 1000)
-	 * 		resizes (VET, 650)
-	 * 		pins	(VET, 2000)
-	 * 		dirties (VET, 2000)
-	 *
-	 * (VET, 750)	initially dirty, and in cache
-	 * 		pins	(VET, 1000)
-	 * 		dirties (VET, 1000)
-	 * 		resizes (VET, 750)
-	 * 		pins	(VET, 2000)
-	 * 		dirties	(VET, 2000)
-	 *
-	 * (VET, 500)	initially dirty, and in cache
-	 * 		dirties	(VET, 350)
-	 * 		dirties	(VET, 450)
-	 * 		dirties	(VET, 650)
-	 * 		dirties (VET, 750)
-	 */
-        int test_num			= 27;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 10;
-	unsigned init_expected_index_len	= 10;
-	size_t init_expected_index_size	= 10 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[10] =
-	{
+    /* Repeat test #26 with the flush invalidate flag.
+    *
+    * In the following overview table, VET stands for
+    * VARIABLE_ENTRY_TYPE.
+    *
+    * In trying to follow what happens when we flush the
+    * set of entries constructed below, recall that each
+    * flush operation is executed the first time the
+    * entry is flushed, and then not executed again.
+    * This may be a weakness in the tests, but that
+    * is the way it is for now.
+    *
+    * After thinking about it for a while, I'm not sure that
+    * the interaction between pins and flush operations needs
+    * all that much testing, as the two are essentially
+    * orthoginal.  The big thing is to verify that flushes of
+    * pinned entries with flush ops result in the expected
+    * updates of the cache.
+    *
+    * Thus this is a bit of a smoke check to * verify that we
+    * get the expected results.
+    *
+    * (VET, 100)    initially not resident in cache
+    *
+    * (VET, 200)    initially clean and resident in cache
+    *
+    * (VET, 300)    initially not resident in cache
+    *
+    * (VET, 2100)    initially clean and resident in cache
+    *
+    * (VET, 2200)    initially not resident in cache
+    *
+    * (VET, 2300)    initially clean and resident in cache
+    *
+    * (VET, 1000)    initially clean, and in cache
+    *         dirties (VET, 100)
+    *         resizes (VET, 200)
+    *         dirty    (VET, 300) -- dirty first to bring into cache.
+    *         moves (VET, 300)
+    *
+    * (VET, 2000)    initially clean, and in cache
+    *         dirties (VET, 2100)
+    *         resizes (VET, 2200)
+    *         moves (VET, 2300)
+    *
+    * (VET, 350)    initially clean, and in cache
+    *         pins    (VET, 1000)
+    *         dirties (VET, 1000)
+    *         resizes (VET, 350)
+    *         pins    (VET, 2000)
+    *         dirties (VET, 2000)
+    *
+    * (VET, 450)    initially dirty, and in cache
+    *         pins    (VET, 1000)
+    *         dirties    (VET, 1000)
+    *         moves (VET, 450)
+    *         pins    (VET, 2000)
+    *         dirties (VET, 2000)
+    *
+    * (VET, 650)    initially clean, and in cache
+    *         pins    (VET, 1000)
+    *         dirties (VET, 1000)
+    *         resizes (VET, 650)
+    *         pins    (VET, 2000)
+    *         dirties (VET, 2000)
+    *
+    * (VET, 750)    initially dirty, and in cache
+    *         pins    (VET, 1000)
+    *         dirties (VET, 1000)
+    *         resizes (VET, 750)
+    *         pins    (VET, 2000)
+    *         dirties    (VET, 2000)
+    *
+    * (VET, 500)    initially dirty, and in cache
+    *         dirties    (VET, 350)
+    *         dirties    (VET, 450)
+    *         dirties    (VET, 650)
+    *         dirties (VET, 750)
+    */
+        int test_num            = 27;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 10;
+    unsigned init_expected_index_len    = 10;
+    size_t init_expected_index_size    = 10 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = (size_t)0;
+    struct fo_flush_cache_test_spec spec[10] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 200,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 200,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2100,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 2100,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 2,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2300,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 2300,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 3,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 1000,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 4,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	200,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 1000,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 4,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    200,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    300,    FALSE,    0,    NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    300,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 4,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2000,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	2200,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	2300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 2000,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    2200,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    2300,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 5,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 350,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	350,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 350,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    350,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 6,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 450,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	450,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 450,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    450,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 7,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 650,
-	    /* insert_flag        = */ TRUE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	650,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 650,
+        /* insert_flag        = */ TRUE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    650,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 8,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 750,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 2,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	1000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	2000,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	750,	FALSE,	VARIABLE_ENTRY_SIZE / 4, NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 750,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 2,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    1000,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    2000,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    750,    FALSE,    VARIABLE_ENTRY_SIZE / 4, NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 9,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 500,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 4,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	350,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	450,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	650,	FALSE,	0,	NULL },
-	      { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	750,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 500,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 4,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    350,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    450,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    650,    FALSE,    0,    NULL },
+        { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    750,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 3;
-	struct fo_flush_entry_check checks[3] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 100,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
-	  {
-	    /* entry_num          = */ 1,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 300,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  },
-	  {
-	    /* entry_num          = */ 2,
-	    /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 2200,
-	    /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ TRUE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
-	  }
-
-	};
+    };
+    int check_size = 3;
+    struct fo_flush_entry_check checks[3] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 100,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
+    {
+        /* entry_num          = */ 1,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 300,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    },
+    {
+        /* entry_num          = */ 2,
+        /* entry_type         = */ VARIABLE_ENTRY_TYPE,
+        /* entry_index        = */ 2200,
+        /* expected_size      = */ VARIABLE_ENTRY_SIZE / 2,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ TRUE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
+    }
+
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
 
-	reset_entries();
+    reset_entries();
     }
 
     if(pass) /* test #28 */
     {
-	/* Test the expected fheap case, in which an entry dirties
-	 * and resizes itself, and dirties an entry which it has
-	 * pinned.
-	 */
-        int test_num			= 28;
-	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
-	int spec_size			= 5;
-	unsigned init_expected_index_len	= 5;
-	size_t init_expected_index_size	= 3 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 5;
-	size_t expected_index_size	= 4 * VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[5] =
-	{
+    /* Test the expected fheap case, in which an entry dirties
+    * and resizes itself, and dirties an entry which it has
+    * pinned.
+    */
+        int test_num            = 28;
+    unsigned int flush_flags    = H5C__NO_FLAGS_SET;
+    int spec_size            = 5;
+    unsigned init_expected_index_len    = 5;
+    size_t init_expected_index_size    = 3 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 5;
+    size_t expected_index_size    = 4 * VARIABLE_ENTRY_SIZE;
+    struct fo_flush_cache_test_spec spec[5] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 100,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 100,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 200,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	200,	FALSE,	VARIABLE_ENTRY_SIZE, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	200,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 200,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    200,    FALSE,    VARIABLE_ENTRY_SIZE, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    200,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 2,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 300,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {400, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	400,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	300,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 300,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {400, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    400,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    300,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    300,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 3,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 400,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 400,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           },
-	  {
+    {
             /* entry_num          = */ 4,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 500,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	500,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	500,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ FALSE
+        /* entry_index        = */ 500,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    500,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    500,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ FALSE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ 0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ 0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
 
-	reset_entries();
+    reset_entries();
     }
 
     if(pass) /* test #29 */
     {
-	/* Repeat test #28 with the flush invalidate flag.
-	 *
-	 * Test the expected fheap case, in which an entry dirties
-	 * and resizes itself, and dirties an entry which it has
-	 * pinned.
-	 */
-        int test_num			= 29;
-	unsigned int flush_flags	= H5C__FLUSH_INVALIDATE_FLAG;
-	int spec_size			= 5;
-	unsigned init_expected_index_len	= 5;
-	size_t init_expected_index_size	= 3 * VARIABLE_ENTRY_SIZE;
-	unsigned expected_index_len		= 0;
-	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[5] =
-	{
+    /* Repeat test #28 with the flush invalidate flag.
+    *
+    * Test the expected fheap case, in which an entry dirties
+    * and resizes itself, and dirties an entry which it has
+    * pinned.
+    */
+        int test_num            = 29;
+    unsigned int flush_flags    = H5C__FLUSH_INVALIDATE_FLAG;
+    int spec_size            = 5;
+    unsigned init_expected_index_len    = 5;
+    size_t init_expected_index_size    = 3 * VARIABLE_ENTRY_SIZE;
+    unsigned expected_index_len        = 0;
+    size_t expected_index_size    = 0;
+    struct fo_flush_cache_test_spec spec[5] =
+    {
           {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 100,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 100,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 200,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	200,	FALSE,	VARIABLE_ENTRY_SIZE, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	200,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 200,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 2,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    200,    FALSE,    VARIABLE_ENTRY_SIZE, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    200,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 2,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 300,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {400, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	400,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	300,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	300,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 300,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {400, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    400,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    300,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    300,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 3,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 400,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__NO_FLAGS_SET,
-	    /* resize_flag        = */ FALSE,
-	    /* new_size           = */ 0,
-	    /* num_pins           = */ 0,
-	    /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 0,
-	    /* flush_ops          = */
-	    /*	op_code:		type:	idx:	flag:	size: order_ptr: */
-	    { { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL },
-	      { FLUSH_OP__NO_OP,	0,	0,	FALSE,	0,    NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 400,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__NO_FLAGS_SET,
+        /* resize_flag        = */ FALSE,
+        /* new_size           = */ 0,
+        /* num_pins           = */ 0,
+        /* pin_type           = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {0, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 0,
+        /* flush_ops          = */
+        /*    op_code:        type:    idx:    flag:    size: order_ptr: */
+        { { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,    0,    FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           },
-	  {
+    {
             /* entry_num          = */ 4,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
-	    /* entry_index        = */ 500,
-	    /* insert_flag        = */ FALSE,
-	    /* flags		  = */ H5C__DIRTIED_FLAG,
-	    /* resize_flag        = */ TRUE,
-	    /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
-	    /* num_pins           = */ 1,
-	    /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
-	    /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
-	    /* num_flush_ops      = */ 3,
-	    /* flush_ops          = */
-	    /*	op_code:		type:		idx:		flag:	size:	order_ptr: */
-	    { { FLUSH_OP__DIRTY,	VARIABLE_ENTRY_TYPE,	100,	FALSE,	0,	NULL },
-	      { FLUSH_OP__RESIZE,	VARIABLE_ENTRY_TYPE,	500,	FALSE,	VARIABLE_ENTRY_SIZE / 2, NULL },
-	      { FLUSH_OP__MOVE,		VARIABLE_ENTRY_TYPE,	500,	FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL },
-	      { FLUSH_OP__NO_OP,	0,		0,		FALSE,	0,	NULL } },
-	    /* expected_deserialized = */ TRUE,
-	    /* expected_serialized = */ TRUE,
-	    /* expected_destroyed = */ TRUE
+        /* entry_index        = */ 500,
+        /* insert_flag        = */ FALSE,
+        /* flags          = */ H5C__DIRTIED_FLAG,
+        /* resize_flag        = */ TRUE,
+        /* new_size           = */ VARIABLE_ENTRY_SIZE / 4,
+        /* num_pins           = */ 1,
+        /* pin_type           = */ {VARIABLE_ENTRY_TYPE, 0, 0, 0, 0, 0, 0, 0},
+        /* pin_idx            = */ {100, 0, 0, 0, 0, 0, 0, 0},
+        /* num_flush_ops      = */ 3,
+        /* flush_ops          = */
+        /*    op_code:        type:        idx:        flag:    size:    order_ptr: */
+        { { FLUSH_OP__DIRTY,    VARIABLE_ENTRY_TYPE,    100,    FALSE,    0,    NULL },
+        { FLUSH_OP__RESIZE,    VARIABLE_ENTRY_TYPE,    500,    FALSE,    VARIABLE_ENTRY_SIZE / 2, NULL },
+        { FLUSH_OP__MOVE,        VARIABLE_ENTRY_TYPE,    500,    FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL },
+        { FLUSH_OP__NO_OP,    0,        0,        FALSE,    0,    NULL } },
+        /* expected_deserialized = */ TRUE,
+        /* expected_serialized = */ TRUE,
+        /* expected_destroyed = */ TRUE
           }
-	};
-	int check_size = 0;
-	struct fo_flush_entry_check checks[1] =
-	{
-	  {
-	    /* entry_num          = */ 0,
-	    /* entry_type         = */ 0,
-	    /* entry_index        = */ 0,
-	    /* expected_size      = */ 0,
-	    /* in_cache           = */ FALSE,
-	    /* at_main_addr       = */ FALSE,
-	    /* is_dirty	          = */ FALSE,
-	    /* is_protected       = */ FALSE,
-	    /* is_pinned          = */ FALSE,
-	    /* expected_deserialized = */ FALSE,
-	    /* expected_serialized = */ FALSE,
-	    /* expected_destroyed = */ FALSE
-	  }
-	};
+    };
+    int check_size = 0;
+    struct fo_flush_entry_check checks[1] =
+    {
+    {
+        /* entry_num          = */ 0,
+        /* entry_type         = */ 0,
+        /* entry_index        = */ 0,
+        /* expected_size      = */ 0,
+        /* in_cache           = */ FALSE,
+        /* at_main_addr       = */ FALSE,
+        /* is_dirty              = */ FALSE,
+        /* is_protected       = */ FALSE,
+        /* is_pinned          = */ FALSE,
+        /* expected_deserialized = */ FALSE,
+        /* expected_serialized = */ FALSE,
+        /* expected_destroyed = */ FALSE
+    }
+    };
 
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
                                          spec_size,
                                          spec,
-				         init_expected_index_len,
-				         init_expected_index_size,
-				         expected_index_len,
-				         expected_index_size,
-					 check_size,
-					 checks);
+                        init_expected_index_len,
+                        init_expected_index_size,
+                        expected_index_len,
+                        expected_index_size,
+                    check_size,
+                    checks);
 
-	reset_entries();
+    reset_entries();
     }
 
     /* finally finish up with the flush ops eviction test */
@@ -9130,16 +9130,16 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 
 } /* check_flush_cache__flush_ops() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__flush_op_test()
+ * Function:    check_flush_cache__flush_op_test()
  *
- * Purpose:	Run a flush op flush cache test.  Of the nature of
- * 		flush operations, this is a multi-entry test.
+ * Purpose:    Run a flush op flush cache test.  Of the nature of
+ *         flush operations, this is a multi-entry test.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/3/06
  *
  * Modifications:
@@ -9153,16 +9153,16 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
                                  unsigned int flush_flags,
                                  int spec_size,
                                  const struct fo_flush_cache_test_spec spec[],
-				 unsigned init_expected_index_len,
-				 size_t init_expected_index_size,
-				 unsigned expected_index_len,
-				 size_t expected_index_size,
-				 int check_size,
-				 struct fo_flush_entry_check check[])
+                unsigned init_expected_index_len,
+                size_t init_expected_index_size,
+                unsigned expected_index_len,
+                size_t expected_index_size,
+                int check_size,
+                struct fo_flush_entry_check check[])
 {
     H5C_t *       cache_ptr = file_ptr->shared->cache;
     static char    msg[128];
-    herr_t	   result;
+    herr_t       result;
     int            i;
     int            j;
     test_entry_t * base_addr;
@@ -9170,7 +9170,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
 #if 0 /* This is useful debugging code -- lets keep it around. */
     HDfprintf(stdout, "check_flush_cache__flush_op_test: test %d\n",
-	      test_num);
+        test_num);
 #endif
 
     if(cache_ptr == NULL) {
@@ -9208,10 +9208,10 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
              (spec[i].entry_type >= NUMBER_OF_ENTRY_TYPES) ||
              (spec[i].entry_index < 0) ||
              (spec[i].entry_index > max_indices[spec[i].entry_type]) ||
-	     (spec[i].num_pins < 0) ||
-	     (spec[i].num_pins > MAX_PINS) ||
-	     (spec[i].num_flush_ops < 0) ||
-	     (spec[i].num_flush_ops > MAX_FLUSH_OPS)) {
+        (spec[i].num_pins < 0) ||
+        (spec[i].num_pins > MAX_PINS) ||
+        (spec[i].num_flush_ops < 0) ||
+        (spec[i].num_flush_ops > MAX_FLUSH_OPS)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
@@ -9234,22 +9234,22 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
                 /* Check for nonsense values if hbool_t is an integral
                  * type instead of a real Boolean.
                  */
-	         ((check[i].in_cache != TRUE) &&
-	           (check[i].in_cache != FALSE)) ||
-	         ((check[i].at_main_addr != TRUE) &&
-	           (check[i].at_main_addr != FALSE)) ||
-	         ((check[i].is_dirty != TRUE) &&
-	           (check[i].is_dirty != FALSE)) ||
-	         ((check[i].is_protected != TRUE) &&
-	           (check[i].is_protected != FALSE)) ||
-	         ((check[i].is_pinned != TRUE) &&
-	           (check[i].is_pinned != FALSE)) ||
-	         ((check[i].expected_deserialized != TRUE) &&
-	           (check[i].expected_deserialized != FALSE)) ||
-	         ((check[i].expected_serialized != TRUE) &&
-	           (check[i].expected_serialized != FALSE)) ||
-	         ((check[i].expected_destroyed != TRUE) &&
-	           (check[i].expected_destroyed != FALSE)) ||
+            ((check[i].in_cache != TRUE) &&
+            (check[i].in_cache != FALSE)) ||
+            ((check[i].at_main_addr != TRUE) &&
+            (check[i].at_main_addr != FALSE)) ||
+            ((check[i].is_dirty != TRUE) &&
+            (check[i].is_dirty != FALSE)) ||
+            ((check[i].is_protected != TRUE) &&
+            (check[i].is_protected != FALSE)) ||
+            ((check[i].is_pinned != TRUE) &&
+            (check[i].is_pinned != FALSE)) ||
+            ((check[i].expected_deserialized != TRUE) &&
+            (check[i].expected_deserialized != FALSE)) ||
+            ((check[i].expected_serialized != TRUE) &&
+            (check[i].expected_serialized != FALSE)) ||
+            ((check[i].expected_destroyed != TRUE) &&
+            (check[i].expected_destroyed != FALSE)) ||
 #endif /* H5_HAVE_STDBOOL_H */
              (check[i].expected_size <= (size_t)0)
         ) {
@@ -9277,32 +9277,32 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
             if(spec[i].resize_flag)
                 resize_entry(file_ptr, spec[i].entry_type, spec[i].entry_index,
-					     spec[i].new_size, TRUE);
+                        spec[i].new_size, TRUE);
 
             unprotect_entry(file_ptr, spec[i].entry_type, spec[i].entry_index,
-					     spec[i].flags);
+                        spec[i].flags);
         }
 
-	for (j = 0; j < spec[i].num_pins; j++)
-	{
+    for (j = 0; j < spec[i].num_pins; j++)
+    {
             create_pinned_entry_dependency(file_ptr,
-		                           spec[i].entry_type,
-					   spec[i].entry_index,
-					   spec[i].pin_type[j],
-					   spec[i].pin_idx[j]);
-	}
-
-	for (j = 0; j < spec[i].num_flush_ops; j++)
-	{
-	    add_flush_op(spec[i].entry_type,
-			 spec[i].entry_index,
-			 spec[i].flush_ops[j].op_code,
-			 spec[i].flush_ops[j].type,
-			 spec[i].flush_ops[j].idx,
-			 spec[i].flush_ops[j].flag,
-			 spec[i].flush_ops[j].size,
+                                spec[i].entry_type,
+                    spec[i].entry_index,
+                    spec[i].pin_type[j],
+                    spec[i].pin_idx[j]);
+    }
+
+    for (j = 0; j < spec[i].num_flush_ops; j++)
+    {
+        add_flush_op(spec[i].entry_type,
+            spec[i].entry_index,
+            spec[i].flush_ops[j].op_code,
+            spec[i].flush_ops[j].type,
+            spec[i].flush_ops[j].idx,
+            spec[i].flush_ops[j].flag,
+            spec[i].flush_ops[j].size,
                          spec[i].flush_ops[j].order_ptr);
-	}
+    }
 
         i++;
     }
@@ -9356,8 +9356,8 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
               (int)(entry_ptr->destroyed),
               (int)(spec[i].expected_destroyed));
 
-	    HDfprintf(stdout, "entry_ptr->header.is_dirty = %d\n",
-		      (int)(entry_ptr->header.is_dirty));
+        HDfprintf(stdout, "entry_ptr->header.is_dirty = %d\n",
+            (int)(entry_ptr->header.is_dirty));
 #endif
 
             pass = FALSE;
@@ -9374,113 +9374,113 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
         i = 0;
         while(pass && (i < check_size))
         {
-	    if(check[i].in_cache != entry_in_cache(cache_ptr,
-				                     check[i].entry_type,
-						     check[i].entry_index)) {
+        if(check[i].in_cache != entry_in_cache(cache_ptr,
+                                    check[i].entry_type,
+                            check[i].entry_index)) {
 
                 pass = FALSE;
                 HDsnprintf(msg, (size_t)128,
                            "Check1 failed on entry %d after flush op test #%d.",
                            i, test_num);
                 failure_mssg = msg;
-	    }
+        }
 
             base_addr = entries[check[i].entry_type];
             entry_ptr = &(base_addr[check[i].entry_index]);
 
-	    if((entry_ptr->size != check[i].expected_size) ||
-		 ((!entry_ptr->header.destroy_in_progress) &&
-		   (check[i].in_cache) &&
-		   (entry_ptr->header.size != check[i].expected_size)) ||
-		 (entry_ptr->at_main_addr != check[i].at_main_addr) ||
-		 (entry_ptr->is_dirty != check[i].is_dirty) ||
-		 (entry_ptr->header.is_dirty != check[i].is_dirty) ||
-		 (entry_ptr->is_protected != check[i].is_protected) ||
-		 (entry_ptr->header.is_protected != check[i].is_protected) ||
+        if((entry_ptr->size != check[i].expected_size) ||
+        ((!entry_ptr->header.destroy_in_progress) &&
+        (check[i].in_cache) &&
+        (entry_ptr->header.size != check[i].expected_size)) ||
+        (entry_ptr->at_main_addr != check[i].at_main_addr) ||
+        (entry_ptr->is_dirty != check[i].is_dirty) ||
+        (entry_ptr->header.is_dirty != check[i].is_dirty) ||
+        (entry_ptr->is_protected != check[i].is_protected) ||
+        (entry_ptr->header.is_protected != check[i].is_protected) ||
                  (entry_ptr->is_pinned != check[i].is_pinned) ||
                  (entry_ptr->header.is_pinned != check[i].is_pinned) ||
-		 (entry_ptr->deserialized != check[i].expected_deserialized) ||
-		 (entry_ptr->serialized != check[i].expected_serialized) ||
-		 (entry_ptr->destroyed != check[i].expected_destroyed)) {
+        (entry_ptr->deserialized != check[i].expected_deserialized) ||
+        (entry_ptr->serialized != check[i].expected_serialized) ||
+        (entry_ptr->destroyed != check[i].expected_destroyed)) {
 
 #if 0 /* This is useful debugging code.  Lets keep it around for a while. */
 
-		if(entry_ptr->size != check[i].expected_size) {
-		    HDfprintf(stdout, "entry_ptr->size (expected) = %d (%d).\n",
-			      (int)(entry_ptr->size),
-			      (int)(check[i].expected_size));
-		}
-		if((!entry_ptr->header.destroy_in_progress) &&
-		     (check[i].in_cache) &&
+        if(entry_ptr->size != check[i].expected_size) {
+            HDfprintf(stdout, "entry_ptr->size (expected) = %d (%d).\n",
+                (int)(entry_ptr->size),
+                (int)(check[i].expected_size));
+        }
+        if((!entry_ptr->header.destroy_in_progress) &&
+            (check[i].in_cache) &&
                      (entry_ptr->header.size != check[i].expected_size)) {
                     HDfprintf(stdout,
                               "(!destroy in progress and in cache and size (expected) = %d (%d).\n",
                               (int)(entry_ptr->header.size),
-			      (int)(check[i].expected_size));
-		}
-		if(entry_ptr->at_main_addr != check[i].at_main_addr) {
-		    HDfprintf(stdout, "(%d,%d) at main addr (expected) = %d (%d).\n",
-			      (int)(check[i].entry_type),
-			      (int)(check[i].entry_index),
+                (int)(check[i].expected_size));
+        }
+        if(entry_ptr->at_main_addr != check[i].at_main_addr) {
+            HDfprintf(stdout, "(%d,%d) at main addr (expected) = %d (%d).\n",
+                (int)(check[i].entry_type),
+                (int)(check[i].entry_index),
                               (int)(entry_ptr->at_main_addr),
-			      (int)(check[i].at_main_addr));
+                (int)(check[i].at_main_addr));
                 }
-		if(entry_ptr->is_dirty != check[i].is_dirty) {
-		    HDfprintf(stdout, "entry_ptr->is_dirty (expected) = %d (%d).\n",
-		              (int)(entry_ptr->is_dirty),
-			      (int)(check[i].is_dirty));
-		}
-		if(entry_ptr->header.is_dirty != check[i].is_dirty) {
-		    HDfprintf(stdout, "entry_ptr->header.is_dirty (expected) = %d (%d).\n",
-		              (int)(entry_ptr->header.is_dirty),
-			      (int)(check[i].is_dirty));
-		}
-	        if(entry_ptr->is_protected != check[i].is_protected) {
+        if(entry_ptr->is_dirty != check[i].is_dirty) {
+            HDfprintf(stdout, "entry_ptr->is_dirty (expected) = %d (%d).\n",
+                    (int)(entry_ptr->is_dirty),
+                (int)(check[i].is_dirty));
+        }
+        if(entry_ptr->header.is_dirty != check[i].is_dirty) {
+            HDfprintf(stdout, "entry_ptr->header.is_dirty (expected) = %d (%d).\n",
+                    (int)(entry_ptr->header.is_dirty),
+                (int)(check[i].is_dirty));
+        }
+            if(entry_ptr->is_protected != check[i].is_protected) {
                     HDfprintf(stdout, "entry_ptr->is_protected (expected) = %d (%d).\n",
-			      (int)(entry_ptr->is_protected),
-			      (int)(check[i].is_protected));
-		}
-	        if(entry_ptr->header.is_protected != check[i].is_protected) {
+                (int)(entry_ptr->is_protected),
+                (int)(check[i].is_protected));
+        }
+            if(entry_ptr->header.is_protected != check[i].is_protected) {
                     HDfprintf(stdout, "entry_ptr->header.is_protected (expected) = %d (%d).\n",
-			      (int)(entry_ptr->is_protected),
-			      (int)(check[i].is_protected));
-		}
-		if(entry_ptr->is_pinned != check[i].is_pinned) {
-		    HDfprintf(stdout, "entry_ptr->is_pinned (expected) = %d (%d).\n",
-			      (int)(entry_ptr->is_pinned),
-			      (int)(check[i].is_pinned));
-		}
-		if(entry_ptr->header.is_pinned != check[i].is_pinned) {
-		    HDfprintf(stdout, "entry_ptr->header.is_pinned (expected) = %d (%d).\n",
-			      (int)(entry_ptr->header.is_pinned),
-			      (int)(check[i].is_pinned));
-		}
-		if(entry_ptr->deserialized !=
-				check[i].expected_deserialized) {
-		    HDfprintf(stdout,
-		 	      "entry_ptr->deserialized (expected) = %d (%d).\n",
-			      (int)(entry_ptr->deserialized),
-			      (int)(check[i].expected_deserialized));
-		}
-		if(entry_ptr->serialized != check[i].expected_serialized) {
-		    HDfprintf(stdout,
-			      "entry_ptr->serialized (expected) = %d (%d).\n",
-			      (int)(entry_ptr->serialized),
-			      (int)(check[i].expected_serialized));
-		}
-		if(entry_ptr->destroyed != check[i].expected_destroyed) {
-		    HDfprintf(stdout, "entry_ptr->destroyed (expected) = %d (%d).\n",
-			      (int)(entry_ptr->destroyed),
-			      (int)(check[i].expected_destroyed));
-		}
+                (int)(entry_ptr->is_protected),
+                (int)(check[i].is_protected));
+        }
+        if(entry_ptr->is_pinned != check[i].is_pinned) {
+            HDfprintf(stdout, "entry_ptr->is_pinned (expected) = %d (%d).\n",
+                (int)(entry_ptr->is_pinned),
+                (int)(check[i].is_pinned));
+        }
+        if(entry_ptr->header.is_pinned != check[i].is_pinned) {
+            HDfprintf(stdout, "entry_ptr->header.is_pinned (expected) = %d (%d).\n",
+                (int)(entry_ptr->header.is_pinned),
+                (int)(check[i].is_pinned));
+        }
+        if(entry_ptr->deserialized !=
+                check[i].expected_deserialized) {
+            HDfprintf(stdout,
+                "entry_ptr->deserialized (expected) = %d (%d).\n",
+                (int)(entry_ptr->deserialized),
+                (int)(check[i].expected_deserialized));
+        }
+        if(entry_ptr->serialized != check[i].expected_serialized) {
+            HDfprintf(stdout,
+                "entry_ptr->serialized (expected) = %d (%d).\n",
+                (int)(entry_ptr->serialized),
+                (int)(check[i].expected_serialized));
+        }
+        if(entry_ptr->destroyed != check[i].expected_destroyed) {
+            HDfprintf(stdout, "entry_ptr->destroyed (expected) = %d (%d).\n",
+                (int)(entry_ptr->destroyed),
+                (int)(check[i].expected_destroyed));
+        }
 #endif
                 pass = FALSE;
                 HDsnprintf(msg, (size_t)128,
                            "Check2 failed on entry %d after flush op test #%d.",
                            i, test_num);
                 failure_mssg = msg;
-	    }
-	    i++;
+        }
+        i++;
         }
     }
 
@@ -9526,8 +9526,8 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
         }
         else if((cache_ptr->index_len != 0) ||
                   (cache_ptr->index_size != 0) ||
-		  (cache_ptr->clean_index_size != 0) ||
-		  (cache_ptr->dirty_index_size != 0)) {
+        (cache_ptr->clean_index_size != 0) ||
+        (cache_ptr->dirty_index_size != 0)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
@@ -9544,7 +9544,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
         base_addr = entries[spec[i].entry_type];
         entry_ptr = &(base_addr[spec[i].entry_index]);
 
-	entry_ptr->size      = entry_sizes[spec[i].entry_type];
+    entry_ptr->size      = entry_sizes[spec[i].entry_type];
 
         entry_ptr->deserialized = FALSE;
         entry_ptr->serialized   = FALSE;
@@ -9559,7 +9559,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
         base_addr = entries[check[i].entry_type];
         entry_ptr = &(base_addr[check[i].entry_index]);
 
-	entry_ptr->size      = entry_sizes[check[i].entry_type];
+    entry_ptr->size      = entry_sizes[check[i].entry_type];
 
         entry_ptr->deserialized = FALSE;
         entry_ptr->serialized   = FALSE;
@@ -9572,26 +9572,26 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
 } /* check_flush_cache__flush_op_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__flush_op_eviction_test()
+ * Function:    check_flush_cache__flush_op_eviction_test()
  *
- * Purpose:	Verify that flush operations work as expected when an
+ * Purpose:    Verify that flush operations work as expected when an
  *              entry is evicted.
  *
  *              Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/3/06
  *
  * Modifications:
  *
- *		Updated test for minor changes in the behaviour
- *		of H5C__flush_single_entry().
+ *        Updated test for minor changes in the behaviour
+ *        of H5C__flush_single_entry().
  *
- *					JRM -- 2/16/15
+ *                    JRM -- 2/16/15
  *
  *-------------------------------------------------------------------------
  */
@@ -9600,11 +9600,11 @@ static void
 check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 {
     H5C_t *        cache_ptr = file_ptr->shared->cache;
-    int		   i;
-    int		   num_variable_entries = 10;
-    int		   num_monster_entries = 31;
-    int		   num_large_entries = 0;
-    herr_t	   result;
+    int           i;
+    int           num_variable_entries = 10;
+    int           num_monster_entries = 31;
+    int           num_large_entries = 0;
+    herr_t       result;
     test_entry_t * entry_ptr;
     test_entry_t * base_addr;
     struct expected_entry_status expected[10 + 31 + 14] =
@@ -9614,63 +9614,63 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
        * array only processes as much of it as it is told to, we don't have to
        * worry about maintaining the status of entries that we haven't used yet.
        */
-      /* entry			entry				in	at main                                                flush dep flush dep child flush   flush       flush */
-      /* type:			index:	size:			cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
-      { VARIABLE_ENTRY_TYPE,	0,	VARIABLE_ENTRY_SIZE/4,	TRUE,	TRUE,	TRUE,	FALSE,	TRUE,	TRUE,	FALSE,	FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	1,	VARIABLE_ENTRY_SIZE/4,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	2,	VARIABLE_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	3,	VARIABLE_ENTRY_SIZE/4,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	4,	VARIABLE_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	5,	VARIABLE_ENTRY_SIZE/4,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	6,	VARIABLE_ENTRY_SIZE/2,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	7,	VARIABLE_ENTRY_SIZE/2,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	8,	VARIABLE_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { VARIABLE_ENTRY_TYPE,	9,	VARIABLE_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	TRUE,	FALSE,	FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	0,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	1,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	2,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	3,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	4,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	5,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	6,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	7,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	8,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	9,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	10,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	11,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	12,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	13,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	14,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	15,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	16,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	17,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	18,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	19,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	20,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	21,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	22,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	23,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	24,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	25,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	26,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	27,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	28,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	29,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	30,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	0,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	1,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	2,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	3,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	4,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	5,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	6,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	7,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	8,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	9,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	10,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	11,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	12,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { LARGE_ENTRY_TYPE,	13,	LARGE_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,	{0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
+      /* entry            entry                in    at main                                                flush dep flush dep child flush   flush       flush */
+      /* type:            index:    size:            cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
+      { VARIABLE_ENTRY_TYPE,    0,    VARIABLE_ENTRY_SIZE/4,    TRUE,    TRUE,    TRUE,    FALSE,    TRUE,    TRUE,    FALSE,    FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    1,    VARIABLE_ENTRY_SIZE/4,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    2,    VARIABLE_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    3,    VARIABLE_ENTRY_SIZE/4,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    4,    VARIABLE_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    5,    VARIABLE_ENTRY_SIZE/4,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    6,    VARIABLE_ENTRY_SIZE/2,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    7,    VARIABLE_ENTRY_SIZE/2,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    8,    VARIABLE_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { VARIABLE_ENTRY_TYPE,    9,    VARIABLE_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    TRUE,    FALSE,    FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    0,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    1,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    2,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    3,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    4,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    5,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    6,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    7,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    8,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    9,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    10,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    11,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    12,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    13,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    14,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    15,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    16,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    17,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    18,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    19,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    20,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    21,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    22,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    23,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    24,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    25,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    26,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    27,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    28,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    29,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    30,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    0,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    1,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    2,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    3,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    4,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    5,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    6,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    7,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    8,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    9,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    10,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    11,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    12,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { LARGE_ENTRY_TYPE,    13,    LARGE_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,    {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
 
     if(pass) {
@@ -9689,15 +9689,15 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
         else if((cache_ptr->max_cache_size != (2 * 1024 * 1024)) ||
                   (cache_ptr->min_clean_size != (1 * 1024 * 1024))) {
 
-	    pass = FALSE;
-	    failure_mssg =
-	        "unexpected cache config at start of flush op eviction test.";
+        pass = FALSE;
+        failure_mssg =
+            "unexpected cache config at start of flush op eviction test.";
 
         } else {
 
             /* set min clean size to zero for this test as it simplifies
-	     * computing the expected cache size after each operation.
-	     */
+        * computing the expected cache size after each operation.
+        */
 
             cache_ptr->min_clean_size = 0;
         }
@@ -9710,112 +9710,112 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
          * other entries into the cache until the cache is full.  At
          * that point, load yet more entries into the cache, and see
          * if the flush operations are performed as expected.
-	 *
-	 * To make things a bit more interesting, we also include a
-	 * couple of pins.
+    *
+    * To make things a bit more interesting, we also include a
+    * couple of pins.
          */
 
-	/* reset the stats before we start.  If stats are enabled, we will
-	 * check to see if they are as expected at the end.
-	 */
-	H5C_stats__reset(cache_ptr);
+    /* reset the stats before we start.  If stats are enabled, we will
+    * check to see if they are as expected at the end.
+    */
+    H5C_stats__reset(cache_ptr);
 
 
-	/* load a few entries with pin relationships and flush ops.
-	 * Start by just loading the entries.
-	 */
+    /* load a few entries with pin relationships and flush ops.
+    * Start by just loading the entries.
+    */
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0,
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0,
                 (VARIABLE_ENTRY_SIZE / 4), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0, H5C__DIRTIED_FLAG);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0, H5C__DIRTIED_FLAG);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1,
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1,
                 (VARIABLE_ENTRY_SIZE / 4), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1, H5C__DIRTIED_FLAG);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1, H5C__DIRTIED_FLAG);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2, H5C__NO_FLAGS_SET);
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2, H5C__NO_FLAGS_SET);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3,
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3,
                 (VARIABLE_ENTRY_SIZE / 4), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3, H5C__DIRTIED_FLAG);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3, H5C__DIRTIED_FLAG);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4, H5C__NO_FLAGS_SET);
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4, H5C__NO_FLAGS_SET);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5,
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5,
                 (VARIABLE_ENTRY_SIZE / 4), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5, H5C__DIRTIED_FLAG);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5, H5C__DIRTIED_FLAG);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6,
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6,
                 (VARIABLE_ENTRY_SIZE / 2), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6, H5C__DIRTIED_FLAG);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6, H5C__DIRTIED_FLAG);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7,
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7,
                 (VARIABLE_ENTRY_SIZE / 2), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7, H5C__DIRTIED_FLAG);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7, H5C__DIRTIED_FLAG);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 8);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 8, H5C__NO_FLAGS_SET);
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 8);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 8, H5C__NO_FLAGS_SET);
 
-	protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 9);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 9, H5C__NO_FLAGS_SET);
+    protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 9);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 9, H5C__NO_FLAGS_SET);
 
-	if((cache_ptr->index_len != 10) ||
+    if((cache_ptr->index_len != 10) ||
              (cache_ptr->index_size != (4 * (VARIABLE_ENTRY_SIZE / 4)) +
-	                                (2 * (VARIABLE_ENTRY_SIZE / 2)) +
-	                                (4 * VARIABLE_ENTRY_SIZE))) {
-
-            pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 1.";
-	}
-    }
-
-    if(pass) {
-
-	/* Now set up the pinning relationships:
-	 *
-	 * Briefly, (VET, 0) is pinned by (VET, 1), (VET, 3), and (VET, 5)
-	 *          (VET, 9) is pinned by (VET, 5), and (VET, 7)
-	 */
-	create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 1,
-			               VARIABLE_ENTRY_TYPE, 0);
-	create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 3,
-			               VARIABLE_ENTRY_TYPE, 0);
-	create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 5,
-			               VARIABLE_ENTRY_TYPE, 0);
-	create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 5,
-			               VARIABLE_ENTRY_TYPE, 9);
-	create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 7,
-			               VARIABLE_ENTRY_TYPE, 9);
-
-	/* Next, set up the flush operations:
-	 *
-	 * Briefly, (VET, 1) dirties (VET, 0)
-	 *                   resizes (VET, 0) to 3/4 VARIABLE_ENTRY_SIZE
-	 *
-	 *          (VET, 3) dirties (VET, 0)
-	 *                   resizes (VET, 0) to VARIABLE_ENTRY_SIZE
-	 *                   moves (VET, 0) to its alternate address
-	 *
-	 *          (VET, 5) dirties (VET, 0)
-	 *                   resizes itself to VARIABLE_ENTRY_SIZE / 2
+                                    (2 * (VARIABLE_ENTRY_SIZE / 2)) +
+                                    (4 * VARIABLE_ENTRY_SIZE))) {
+
+            pass = FALSE;
+        failure_mssg = "unexpected size/len in flush op eviction test 1.";
+    }
+    }
+
+    if(pass) {
+
+    /* Now set up the pinning relationships:
+    *
+    * Briefly, (VET, 0) is pinned by (VET, 1), (VET, 3), and (VET, 5)
+    *          (VET, 9) is pinned by (VET, 5), and (VET, 7)
+    */
+    create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 1,
+                        VARIABLE_ENTRY_TYPE, 0);
+    create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 3,
+                        VARIABLE_ENTRY_TYPE, 0);
+    create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 5,
+                        VARIABLE_ENTRY_TYPE, 0);
+    create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 5,
+                        VARIABLE_ENTRY_TYPE, 9);
+    create_pinned_entry_dependency(file_ptr, VARIABLE_ENTRY_TYPE, 7,
+                        VARIABLE_ENTRY_TYPE, 9);
+
+    /* Next, set up the flush operations:
+    *
+    * Briefly, (VET, 1) dirties (VET, 0)
+    *                   resizes (VET, 0) to 3/4 VARIABLE_ENTRY_SIZE
+    *
+    *          (VET, 3) dirties (VET, 0)
+    *                   resizes (VET, 0) to VARIABLE_ENTRY_SIZE
+    *                   moves (VET, 0) to its alternate address
+    *
+    *          (VET, 5) dirties (VET, 0)
+    *                   resizes itself to VARIABLE_ENTRY_SIZE / 2
          *
          *          (VET, 7) dirties (VET, 9)
-	 *
-	 *          (VET, 9) dirties (VET, 8)
-	 */
+    *
+    *          (VET, 9) dirties (VET, 8)
+    */
         add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL);
         add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__RESIZE,
                      VARIABLE_ENTRY_TYPE, 0, TRUE,
-		     3 * VARIABLE_ENTRY_SIZE / 4, NULL);
+            3 * VARIABLE_ENTRY_SIZE / 4, NULL);
 
         add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL);
@@ -9838,648 +9838,648 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* to summarize, at present the following variable size entries
-	 * are in cache with the following characteristics:
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	Y	2.5 KB	Y	Y	-	-
-	 *
-	 * (VET, 1)	Y	2.5 KB	Y	N	0	dirty (VET, 0),
-	 * 							resize (VET, 0) to 7.5 KB
-	 *
-	 * (VET, 2) 	Y	10 KB	N	N	-	-
-	 *
-	 *
-	 * (VET, 3)	Y	2.5 KB	N	N	0	dirty (VET, 0)
-	 * 							resize (VET, 0) to 10 KB
-	 * 							move (VET, 0) to its alternate address
-	 *
-	 * (VET, 4) 	Y	10 KB	N	N	-	-
-	 *
-	 *
-	 * (VET, 5)	Y	2.5 KB	Y	N	0, 9	dirty (VET, 0)
-	 * 							resize (VET, 5) to 5 KB
-	 *
-	 * (VET, 6)	Y	 5 KB	Y	N	-	-
-	 *
-	 * (VET, 7)	Y	 5 KB	Y	N	9	dirty (VET, 9)
-	 *
-	 * (VET, 8)	Y	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	Y	10 KB	N	N	-	dirty (VET, 8)
-	 *
-	 * Recall that in this test bed, flush operations are excuted the
-	 * first time the associated entry is flushed, and are then
-	 * deleted.
-	 */
+    /* to summarize, at present the following variable size entries
+    * are in cache with the following characteristics:
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     Y    2.5 KB    Y    Y    -    -
+    *
+    * (VET, 1)    Y    2.5 KB    Y    N    0    dirty (VET, 0),
+    *                             resize (VET, 0) to 7.5 KB
+    *
+    * (VET, 2)     Y    10 KB    N    N    -    -
+    *
+    *
+    * (VET, 3)    Y    2.5 KB    N    N    0    dirty (VET, 0)
+    *                             resize (VET, 0) to 10 KB
+    *                             move (VET, 0) to its alternate address
+    *
+    * (VET, 4)     Y    10 KB    N    N    -    -
+    *
+    *
+    * (VET, 5)    Y    2.5 KB    Y    N    0, 9    dirty (VET, 0)
+    *                             resize (VET, 5) to 5 KB
+    *
+    * (VET, 6)    Y     5 KB    Y    N    -    -
+    *
+    * (VET, 7)    Y     5 KB    Y    N    9    dirty (VET, 9)
+    *
+    * (VET, 8)    Y    10 KB    N    N    -    -
+    *
+    * (VET, 9)    Y    10 KB    N    N    -    dirty (VET, 8)
+    *
+    * Recall that in this test bed, flush operations are excuted the
+    * first time the associated entry is flushed, and are then
+    * deleted.
+    */
 
         /* Now fill up the cache with other, unrelated entries */
-	for (i = 0; i < 31; i++)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    for (i = 0; i < 31; i++)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	for (i = 0; i < 1; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 0; i < 1; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	/* The cache should now be exactly full */
-	if((cache_ptr->index_len != 42) ||
+    /* The cache should now be exactly full */
+    if((cache_ptr->index_len != 42) ||
              (cache_ptr->index_size != 2 * 1024 * 1024) ||
-	     (cache_ptr->index_size != ((4 * VARIABLE_ENTRY_SIZE / 4) +
-					 (2 * VARIABLE_ENTRY_SIZE / 2) +
-	                                 (4 * VARIABLE_ENTRY_SIZE) +
-	                                 (31 * MONSTER_ENTRY_SIZE) +
-					 (1 * LARGE_ENTRY_SIZE)))) {
+        (cache_ptr->index_size != ((4 * VARIABLE_ENTRY_SIZE / 4) +
+                    (2 * VARIABLE_ENTRY_SIZE / 2) +
+                                    (4 * VARIABLE_ENTRY_SIZE) +
+                                    (31 * MONSTER_ENTRY_SIZE) +
+                    (1 * LARGE_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 2.";
+        failure_mssg = "unexpected size/len in flush op eviction test 2.";
 
-	} else {
+    } else {
 
-	    /* verify the expected status of all entries we have loaded to date: */
+        /* verify the expected status of all entries we have loaded to date: */
             num_large_entries = 1;
-	    verify_entry_status(cache_ptr,
-			        0,
-			        (num_variable_entries + num_monster_entries + num_large_entries),
-				expected);
-	}
-    }
-
-    if(pass) {
-
-	/* Now load a large entry.  This should result in the eviction
-	 * of (VET,2), and the increase in the size of (VET, 0) from .25
-	 * VARIABLE_ENTRY_SIZE to .75 VARIABLE_ENTRY_SIZE.
-	 *
-	 * The following table illustrates the intended state of affairs
-	 * after the eviction:
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	Y	7.5 KB	Y	Y	-	-
-	 *
-	 * (VET, 1)	Y	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	Y	2.5 KB	Y	N	0	dirty (VET, 0)
-	 * 							resize (VET, 0) to 10 KB
-	 * 							move (VET, 0) to its alternate address
-	 *
-	 * (VET, 4)	Y	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	Y	2.5 KB	Y	N	0, 9	dirty (VET, 0)
-	 * 							resize (VET, 5) to 5 KB
-	 *
-	 * (VET, 6)	Y	 5 KB	Y	N	-	-
-	 *
-	 * (VET, 7)	Y	 5 KB	Y	N	9	dirty (VET, 9)
-	 *
-	 * (VET, 8)	Y	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	Y	10 KB	N	Y	-	dirty (VET, 8)
-	 *
-	 * Start by updating the expected table for the expected changes in entry status:
-	 */
-	expected[0].size       = 3 * VARIABLE_ENTRY_SIZE / 4;
-	expected[1].is_dirty   = FALSE;
-	expected[1].serialized = TRUE;
-	expected[2].in_cache   = FALSE;
-	expected[2].destroyed  = TRUE;
+        verify_entry_status(cache_ptr,
+                    0,
+                    (num_variable_entries + num_monster_entries + num_large_entries),
+                expected);
+    }
+    }
+
+    if(pass) {
+
+    /* Now load a large entry.  This should result in the eviction
+    * of (VET,2), and the increase in the size of (VET, 0) from .25
+    * VARIABLE_ENTRY_SIZE to .75 VARIABLE_ENTRY_SIZE.
+    *
+    * The following table illustrates the intended state of affairs
+    * after the eviction:
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     Y    7.5 KB    Y    Y    -    -
+    *
+    * (VET, 1)    Y    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    Y    2.5 KB    Y    N    0    dirty (VET, 0)
+    *                             resize (VET, 0) to 10 KB
+    *                             move (VET, 0) to its alternate address
+    *
+    * (VET, 4)    Y    10 KB    N    N    -    -
+    *
+    * (VET, 5)    Y    2.5 KB    Y    N    0, 9    dirty (VET, 0)
+    *                             resize (VET, 5) to 5 KB
+    *
+    * (VET, 6)    Y     5 KB    Y    N    -    -
+    *
+    * (VET, 7)    Y     5 KB    Y    N    9    dirty (VET, 9)
+    *
+    * (VET, 8)    Y    10 KB    N    N    -    -
+    *
+    * (VET, 9)    Y    10 KB    N    Y    -    dirty (VET, 8)
+    *
+    * Start by updating the expected table for the expected changes in entry status:
+    */
+    expected[0].size       = 3 * VARIABLE_ENTRY_SIZE / 4;
+    expected[1].is_dirty   = FALSE;
+    expected[1].serialized = TRUE;
+    expected[2].in_cache   = FALSE;
+    expected[2].destroyed  = TRUE;
 
         num_large_entries = 2;
 
-	protect_entry(file_ptr, LARGE_ENTRY_TYPE, 1);
-	unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 1, H5C__DIRTIED_FLAG);
+    protect_entry(file_ptr, LARGE_ENTRY_TYPE, 1);
+    unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 1, H5C__DIRTIED_FLAG);
 
-	if((cache_ptr->index_len != 42) ||
+    if((cache_ptr->index_len != 42) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (VARIABLE_ENTRY_SIZE) +
-	                                (VARIABLE_ENTRY_SIZE / 2) +
-	                                (LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((1 * (3 * VARIABLE_ENTRY_SIZE / 4)) +
-					 (3 * VARIABLE_ENTRY_SIZE / 4) +
-					 (2 * VARIABLE_ENTRY_SIZE / 2) +
-	                                 (3 * VARIABLE_ENTRY_SIZE) +
-	                                 (31 * MONSTER_ENTRY_SIZE) +
-					 (2 * LARGE_ENTRY_SIZE)))) {
-            pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 3.";
-	}
-
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    1,
+                                    (VARIABLE_ENTRY_SIZE) +
+                                    (VARIABLE_ENTRY_SIZE / 2) +
+                                    (LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((1 * (3 * VARIABLE_ENTRY_SIZE / 4)) +
+                    (3 * VARIABLE_ENTRY_SIZE / 4) +
+                    (2 * VARIABLE_ENTRY_SIZE / 2) +
+                                    (3 * VARIABLE_ENTRY_SIZE) +
+                                    (31 * MONSTER_ENTRY_SIZE) +
+                    (2 * LARGE_ENTRY_SIZE)))) {
+            pass = FALSE;
+        failure_mssg = "unexpected size/len in flush op eviction test 3.";
+    }
+
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                1,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
-    }
-
-    if(pass) {
-
-	/* Now load another large entry.  This should result in the eviction
-	 * of (VET, 4), the increase in the size of (VET, 0) from .75
-	 * VARIABLE_ENTRY_SIZE to 1.0 VARIABLE_ENTRY_SIZE, and the renaming
-	 * of (VET, 0) to its alternate address.
-	 *
-	 * The following table shows the expected states of the variable
-	 * size entries after the test.
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	Y	10 KB	Y	Y	-	-
-	 *
-	 * (VET, 1)	Y	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	Y	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 4)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	Y	2.5 KB	Y	N	0, 9	dirty (VET, 0)
-	 * 							resize (VET, 5) to 5 KB
-	 *
-	 * (VET, 6)	Y	 5 KB	Y	N	-	-
-	 *
-	 * (VET, 7)	Y	 5 KB	Y	N	9	dirty (VET, 9)
-	 *
-	 * (VET, 8)	Y	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	Y	10 KB	N	Y	-	dirty (VET, 8)
-	 *
-	 * Start by updating the expected table for the expected changes in entry status:
-	 */
-	expected[0].size         = VARIABLE_ENTRY_SIZE;
-	expected[0].at_main_addr = FALSE;
-	expected[3].is_dirty     = FALSE;
-	expected[3].serialized   = TRUE;
-	expected[4].in_cache     = FALSE;
-	expected[4].destroyed    = TRUE;
+                expected);
+    }
+
+    if(pass) {
+
+    /* Now load another large entry.  This should result in the eviction
+    * of (VET, 4), the increase in the size of (VET, 0) from .75
+    * VARIABLE_ENTRY_SIZE to 1.0 VARIABLE_ENTRY_SIZE, and the renaming
+    * of (VET, 0) to its alternate address.
+    *
+    * The following table shows the expected states of the variable
+    * size entries after the test.
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     Y    10 KB    Y    Y    -    -
+    *
+    * (VET, 1)    Y    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    Y    2.5 KB    N    N    -    -
+    *
+    * (VET, 4)    N    10 KB    N    N    -    -
+    *
+    * (VET, 5)    Y    2.5 KB    Y    N    0, 9    dirty (VET, 0)
+    *                             resize (VET, 5) to 5 KB
+    *
+    * (VET, 6)    Y     5 KB    Y    N    -    -
+    *
+    * (VET, 7)    Y     5 KB    Y    N    9    dirty (VET, 9)
+    *
+    * (VET, 8)    Y    10 KB    N    N    -    -
+    *
+    * (VET, 9)    Y    10 KB    N    Y    -    dirty (VET, 8)
+    *
+    * Start by updating the expected table for the expected changes in entry status:
+    */
+    expected[0].size         = VARIABLE_ENTRY_SIZE;
+    expected[0].at_main_addr = FALSE;
+    expected[3].is_dirty     = FALSE;
+    expected[3].serialized   = TRUE;
+    expected[4].in_cache     = FALSE;
+    expected[4].destroyed    = TRUE;
 
         num_large_entries = 3;
 
-	protect_entry(file_ptr, LARGE_ENTRY_TYPE, 2);
-	unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 2, H5C__DIRTIED_FLAG);
+    protect_entry(file_ptr, LARGE_ENTRY_TYPE, 2);
+    unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 2, H5C__DIRTIED_FLAG);
 
-	if((cache_ptr->index_len != 42) ||
+    if((cache_ptr->index_len != 42) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (2 * VARIABLE_ENTRY_SIZE) +
-	                                (3 * VARIABLE_ENTRY_SIZE / 4) +
-	                                (2 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((3 * VARIABLE_ENTRY_SIZE / 4) +
-					 (2 * VARIABLE_ENTRY_SIZE / 2) +
-				         (3 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) +
-				         (3 * LARGE_ENTRY_SIZE)))) {
-
-            pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 4.";
-	}
-
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    2,
+                                    (2 * VARIABLE_ENTRY_SIZE) +
+                                    (3 * VARIABLE_ENTRY_SIZE / 4) +
+                                    (2 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((3 * VARIABLE_ENTRY_SIZE / 4) +
+                    (2 * VARIABLE_ENTRY_SIZE / 2) +
+                        (3 * VARIABLE_ENTRY_SIZE) +
+                        (31 * MONSTER_ENTRY_SIZE) +
+                        (3 * LARGE_ENTRY_SIZE)))) {
+
+            pass = FALSE;
+        failure_mssg = "unexpected size/len in flush op eviction test 4.";
+    }
+
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                2,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
+                expected);
     }
 
     if(pass) {
 
-	/* load two more large entries.  This should result in (VET, 5) being
-	 * flushed, and increasing its size from 1/4 VARIABLE_ENTRY_SIZE to
-	 * VARIABLE_ENTRY_SIZE.
-	 *
-	 * As a result of this size increase, the cache will have to look
-	 * for another entry to evict.  After flushing (VET, 6) and (VET, 7),
-	 * it should evict (VET, 8), yielding the needed memory and dirtying
+    /* load two more large entries.  This should result in (VET, 5) being
+    * flushed, and increasing its size from 1/4 VARIABLE_ENTRY_SIZE to
+    * VARIABLE_ENTRY_SIZE.
+    *
+    * As a result of this size increase, the cache will have to look
+    * for another entry to evict.  After flushing (VET, 6) and (VET, 7),
+    * it should evict (VET, 8), yielding the needed memory and dirtying
          * (VET, 9).
-	 *
-	 * The following table shows the expected states of the variable
-	 * size entries after the test.
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	Y	10 KB	Y	Y	-	-
-	 *
-	 * (VET, 1)	Y	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	Y	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 4)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	Y	 5 KB	N	N	0, 9	-
-	 *
-	 * (VET, 6)	Y	 5 KB	N	N	-	-
-	 *
-	 * (VET, 7)	Y	 5 KB	N	N	9	-
-	 *
-	 * (VET, 8)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	Y	10 KB	N	Y	-	dirty (VET, 8)
-	 *
-	 * Start by updating the expected table for the expected changes in entry status:
-	 */
-
-	expected[5].size         = VARIABLE_ENTRY_SIZE / 2;
-	expected[5].is_dirty	 = FALSE;
-	expected[5].serialized   = TRUE;
-	expected[6].is_dirty	 = FALSE;
-	expected[6].serialized	 = TRUE;
-	expected[7].is_dirty	 = FALSE;
-	expected[7].serialized	 = TRUE;
-	expected[8].in_cache	 = FALSE;
-        expected[8].destroyed	 = TRUE;
-        expected[9].is_dirty	 = TRUE;
+    *
+    * The following table shows the expected states of the variable
+    * size entries after the test.
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     Y    10 KB    Y    Y    -    -
+    *
+    * (VET, 1)    Y    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    Y    2.5 KB    N    N    -    -
+    *
+    * (VET, 4)    N    10 KB    N    N    -    -
+    *
+    * (VET, 5)    Y     5 KB    N    N    0, 9    -
+    *
+    * (VET, 6)    Y     5 KB    N    N    -    -
+    *
+    * (VET, 7)    Y     5 KB    N    N    9    -
+    *
+    * (VET, 8)    N    10 KB    N    N    -    -
+    *
+    * (VET, 9)    Y    10 KB    N    Y    -    dirty (VET, 8)
+    *
+    * Start by updating the expected table for the expected changes in entry status:
+    */
+
+    expected[5].size         = VARIABLE_ENTRY_SIZE / 2;
+    expected[5].is_dirty     = FALSE;
+    expected[5].serialized   = TRUE;
+    expected[6].is_dirty     = FALSE;
+    expected[6].serialized     = TRUE;
+    expected[7].is_dirty     = FALSE;
+    expected[7].serialized     = TRUE;
+    expected[8].in_cache     = FALSE;
+        expected[8].destroyed     = TRUE;
+        expected[9].is_dirty     = TRUE;
 
         num_large_entries = 5;
 
-	protect_entry(file_ptr, LARGE_ENTRY_TYPE, 3);
-	unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 3, H5C__DIRTIED_FLAG);
+    protect_entry(file_ptr, LARGE_ENTRY_TYPE, 3);
+    unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 3, H5C__DIRTIED_FLAG);
 
-	protect_entry(file_ptr, LARGE_ENTRY_TYPE, 4);
-	unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 4, H5C__DIRTIED_FLAG);
+    protect_entry(file_ptr, LARGE_ENTRY_TYPE, 4);
+    unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 4, H5C__DIRTIED_FLAG);
 
         /* verify cache size */
-	if((cache_ptr->index_len != 43) ||
+    if((cache_ptr->index_len != 43) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (3 * VARIABLE_ENTRY_SIZE) +
-	                                (1 * VARIABLE_ENTRY_SIZE / 4) +
-	                                (3 * VARIABLE_ENTRY_SIZE / 4) +
-	                                (4 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE / 4) +
-					 (3 * VARIABLE_ENTRY_SIZE / 2) +
-				         (2 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) +
-				         (5 * LARGE_ENTRY_SIZE)))) {
-
-            pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 5.";
-	}
-
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    3,
+                                    (3 * VARIABLE_ENTRY_SIZE) +
+                                    (1 * VARIABLE_ENTRY_SIZE / 4) +
+                                    (3 * VARIABLE_ENTRY_SIZE / 4) +
+                                    (4 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE / 4) +
+                    (3 * VARIABLE_ENTRY_SIZE / 2) +
+                        (2 * VARIABLE_ENTRY_SIZE) +
+                        (31 * MONSTER_ENTRY_SIZE) +
+                        (5 * LARGE_ENTRY_SIZE)))) {
+
+            pass = FALSE;
+        failure_mssg = "unexpected size/len in flush op eviction test 5.";
+    }
+
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                3,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
+                expected);
     }
 
     if(pass) {
 
         /* now touch all the non VARIABLE_ENTRY_TYPE entries in the
-	 * cache to bring all the VARIABLE_ENTRY_TYPE entries to the
-	 * end of the LRU list.
-	 *
-	 * Note that we don't have to worry about (VET, 0) and (VET, 9)
-	 * as they are pinned and thus not in the LRU list to begin with.
-	 */
-	for (i = 0; i < 31; i++)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    * cache to bring all the VARIABLE_ENTRY_TYPE entries to the
+    * end of the LRU list.
+    *
+    * Note that we don't have to worry about (VET, 0) and (VET, 9)
+    * as they are pinned and thus not in the LRU list to begin with.
+    */
+    for (i = 0; i < 31; i++)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	for (i = 0; i < 5; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 0; i < 5; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
         /* verify cache size */
-	if((cache_ptr->index_len != 43) ||
+    if((cache_ptr->index_len != 43) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (3 * VARIABLE_ENTRY_SIZE) +
-	                                (1 * VARIABLE_ENTRY_SIZE / 4) +
-	                                (3 * VARIABLE_ENTRY_SIZE / 4) +
-	                                (4 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE / 4) +
-					 (3 * VARIABLE_ENTRY_SIZE / 2) +
-				         (2 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) +
-				         (5 * LARGE_ENTRY_SIZE)))) {
-
-            pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 6.";
-	}
-
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    4,
+                                    (3 * VARIABLE_ENTRY_SIZE) +
+                                    (1 * VARIABLE_ENTRY_SIZE / 4) +
+                                    (3 * VARIABLE_ENTRY_SIZE / 4) +
+                                    (4 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE / 4) +
+                    (3 * VARIABLE_ENTRY_SIZE / 2) +
+                        (2 * VARIABLE_ENTRY_SIZE) +
+                        (31 * MONSTER_ENTRY_SIZE) +
+                        (5 * LARGE_ENTRY_SIZE)))) {
+
+            pass = FALSE;
+        failure_mssg = "unexpected size/len in flush op eviction test 6.";
+    }
+
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                4,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
+                expected);
     }
 
     if(pass) {
 
-	/* Now load three more large entries.  This should result
-	 * in the evictions of (VET, 1), (VET, 3), and (VET, 5), and the
+    /* Now load three more large entries.  This should result
+    * in the evictions of (VET, 1), (VET, 3), and (VET, 5), and the
          * unpinning of (VET, 0)
-	 *
-	 * The following table shows the expected states of the variable
-	 * size entries after the test.
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	Y	10 KB	Y	N	-	-
-	 *
-	 * (VET, 1)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 4)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 6)	Y	 5 KB	N	N	-	-
-	 *
-	 * (VET, 7)	Y	 5 KB	N	N	9	-
-	 *
-	 * (VET, 8)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	Y	10 KB	N	Y	-	dirty (VET, 8)
-	 *
-	 * Start by updating the expected table for the expected changes in entry status:
-	 */
-
-	expected[0].is_pinned    = FALSE;
-	expected[1].in_cache     = FALSE;
-	expected[1].destroyed    = TRUE;
-	expected[3].in_cache     = FALSE;
-	expected[3].destroyed    = TRUE;
-	expected[5].in_cache     = FALSE;
-	expected[5].destroyed    = TRUE;
+    *
+    * The following table shows the expected states of the variable
+    * size entries after the test.
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     Y    10 KB    Y    N    -    -
+    *
+    * (VET, 1)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 4)    N    10 KB    N    N    -    -
+    *
+    * (VET, 5)    N     5 KB    N    N    -    -
+    *
+    * (VET, 6)    Y     5 KB    N    N    -    -
+    *
+    * (VET, 7)    Y     5 KB    N    N    9    -
+    *
+    * (VET, 8)    N    10 KB    N    N    -    -
+    *
+    * (VET, 9)    Y    10 KB    N    Y    -    dirty (VET, 8)
+    *
+    * Start by updating the expected table for the expected changes in entry status:
+    */
+
+    expected[0].is_pinned    = FALSE;
+    expected[1].in_cache     = FALSE;
+    expected[1].destroyed    = TRUE;
+    expected[3].in_cache     = FALSE;
+    expected[3].destroyed    = TRUE;
+    expected[5].in_cache     = FALSE;
+    expected[5].destroyed    = TRUE;
 
         num_large_entries = 8;
 
-	for (i = 5; i < 8; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 5; i < 8; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
         /* verify cache size */
-	if((cache_ptr->index_len != 43) ||
+    if((cache_ptr->index_len != 43) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (4 * VARIABLE_ENTRY_SIZE) +
-	                                (1 * VARIABLE_ENTRY_SIZE / 4) +
-	                                (3 * VARIABLE_ENTRY_SIZE / 4) +
-	                                (7 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE / 2) +
-					 (2 * VARIABLE_ENTRY_SIZE) +
-					 (31 * MONSTER_ENTRY_SIZE) +
-					 (8 * LARGE_ENTRY_SIZE)))) {
-
-            pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 7.";
-	}
-
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    5,
+                                    (4 * VARIABLE_ENTRY_SIZE) +
+                                    (1 * VARIABLE_ENTRY_SIZE / 4) +
+                                    (3 * VARIABLE_ENTRY_SIZE / 4) +
+                                    (7 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE / 2) +
+                    (2 * VARIABLE_ENTRY_SIZE) +
+                    (31 * MONSTER_ENTRY_SIZE) +
+                    (8 * LARGE_ENTRY_SIZE)))) {
+
+            pass = FALSE;
+        failure_mssg = "unexpected size/len in flush op eviction test 7.";
+    }
+
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                5,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
-    }
-
-    if(pass) {
-
-	/* load another large entry.  (VET, 6) should be evicted.
-	 *
-	 * The following table shows the expected states of the variable
-	 * size entries after the test.
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	Y	10 KB	Y	N	-	-
-	 *
-	 * (VET, 1)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 4)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 6)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 7)	Y	 5 KB	N	N	9	-
-	 *
-	 * (VET, 8)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	Y	10 KB	N	Y	-	dirty (VET, 8)
-	 *
-	 * Start by updating the expected table for the expected changes in entry status:
-	 */
-
-	expected[6].in_cache     = FALSE;
-	expected[6].destroyed    = TRUE;
+                expected);
+    }
+
+    if(pass) {
+
+    /* load another large entry.  (VET, 6) should be evicted.
+    *
+    * The following table shows the expected states of the variable
+    * size entries after the test.
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     Y    10 KB    Y    N    -    -
+    *
+    * (VET, 1)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 4)    N    10 KB    N    N    -    -
+    *
+    * (VET, 5)    N     5 KB    N    N    -    -
+    *
+    * (VET, 6)    N     5 KB    N    N    -    -
+    *
+    * (VET, 7)    Y     5 KB    N    N    9    -
+    *
+    * (VET, 8)    N    10 KB    N    N    -    -
+    *
+    * (VET, 9)    Y    10 KB    N    Y    -    dirty (VET, 8)
+    *
+    * Start by updating the expected table for the expected changes in entry status:
+    */
+
+    expected[6].in_cache     = FALSE;
+    expected[6].destroyed    = TRUE;
 
         num_large_entries = 9;
 
-	for (i = 8; i < 9; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 8; i < 9; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
         /* verify cache size */
-	if((cache_ptr->index_len != 43) ||
+    if((cache_ptr->index_len != 43) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (3 * VARIABLE_ENTRY_SIZE) -
-					(VARIABLE_ENTRY_SIZE / 2) +
-	                                (8 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE / 2) +
-				         (2 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) +
-				         (9 * LARGE_ENTRY_SIZE)))) {
+                                    (3 * VARIABLE_ENTRY_SIZE) -
+                    (VARIABLE_ENTRY_SIZE / 2) +
+                                    (8 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE / 2) +
+                        (2 * VARIABLE_ENTRY_SIZE) +
+                        (31 * MONSTER_ENTRY_SIZE) +
+                        (9 * LARGE_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 8.";
-	}
+        failure_mssg = "unexpected size/len in flush op eviction test 8.";
+    }
 
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    6,
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                6,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
-    }
-
-    if(pass) {
-
-	/* Load another large entry.
-	 *
-	 * (VET, 7) should be evicted, and (VET, 9) should be unpinned.
-	 *
-	 * The following table shows the expected states of the variable
-	 * size entries after the test.
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	Y	10 KB	Y	N	-	-
-	 *
-	 * (VET, 1)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 4)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 6)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 7)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 8)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	Y	10 KB	Y	N	-	dirty (VET, 8)
-	 *
-	 * Start by updating the expected table for the expected changes in entry status:
-	 */
-
-	expected[7].in_cache     = FALSE;
-	expected[7].destroyed    = TRUE;
-	expected[9].is_pinned    = FALSE;
+                expected);
+    }
+
+    if(pass) {
+
+    /* Load another large entry.
+    *
+    * (VET, 7) should be evicted, and (VET, 9) should be unpinned.
+    *
+    * The following table shows the expected states of the variable
+    * size entries after the test.
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     Y    10 KB    Y    N    -    -
+    *
+    * (VET, 1)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 4)    N    10 KB    N    N    -    -
+    *
+    * (VET, 5)    N     5 KB    N    N    -    -
+    *
+    * (VET, 6)    N     5 KB    N    N    -    -
+    *
+    * (VET, 7)    N     5 KB    N    N    -    -
+    *
+    * (VET, 8)    N    10 KB    N    N    -    -
+    *
+    * (VET, 9)    Y    10 KB    Y    N    -    dirty (VET, 8)
+    *
+    * Start by updating the expected table for the expected changes in entry status:
+    */
+
+    expected[7].in_cache     = FALSE;
+    expected[7].destroyed    = TRUE;
+    expected[9].is_pinned    = FALSE;
 
         num_large_entries = 10;
 
-	for (i = 9; i < 10; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 9; i < 10; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
         /* verify cache size */
-	if((cache_ptr->index_len != 43) ||
+    if((cache_ptr->index_len != 43) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (4 * VARIABLE_ENTRY_SIZE) +
-	                                (9 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) +
-				         (10 * LARGE_ENTRY_SIZE)))) {
+                                    (4 * VARIABLE_ENTRY_SIZE) +
+                                    (9 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE) +
+                        (31 * MONSTER_ENTRY_SIZE) +
+                        (10 * LARGE_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 9.";
-	}
+        failure_mssg = "unexpected size/len in flush op eviction test 9.";
+    }
 
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    7,
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                7,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
+                expected);
     }
 
     if(pass) {
 
         /* Again, touch all the non VARIABLE_ENTRY_TYPE entries in the
-	 * cache to bring all the VARIABLE_ENTRY_TYPE entries to the
-	 * end of the LRU list.
-	 *
-	 * Both (VET, 0) and (VET, 7) have been unpinned, so they are
-	 * now in the LRU list.
-	 */
-	for (i = 0; i < 31; i++)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    * cache to bring all the VARIABLE_ENTRY_TYPE entries to the
+    * end of the LRU list.
+    *
+    * Both (VET, 0) and (VET, 7) have been unpinned, so they are
+    * now in the LRU list.
+    */
+    for (i = 0; i < 31; i++)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	for (i = 0; i < 10; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 0; i < 10; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
         /* verify cache size */
-	if((cache_ptr->index_len != 43) ||
+    if((cache_ptr->index_len != 43) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (4 * VARIABLE_ENTRY_SIZE) +
-	                                (9 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) +
-				         (10 * LARGE_ENTRY_SIZE)))) {
+                                    (4 * VARIABLE_ENTRY_SIZE) +
+                                    (9 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((2 * VARIABLE_ENTRY_SIZE) +
+                        (31 * MONSTER_ENTRY_SIZE) +
+                        (10 * LARGE_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 10.";
-	}
+        failure_mssg = "unexpected size/len in flush op eviction test 10.";
+    }
 
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    8,
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                8,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
+                expected);
     }
 
     if(pass) {
 
-	/* load two more large entries.  Things get a bit complicated here,
-	 * so I'll go through the operation step by step.
+    /* load two more large entries.  Things get a bit complicated here,
+    * so I'll go through the operation step by step.
          *
          * Initially, the cache has 4 KB of empty space, so the first entry
-	 * (LET, 10) is loaded via calls to H5C_protect() H5C_unprotect()
-	 * without causing any evictions.
+    * (LET, 10) is loaded via calls to H5C_protect() H5C_unprotect()
+    * without causing any evictions.
          *
          * However, this is not the case for the call of H5C_protect() on
-	 * (LET, 11).
+    * (LET, 11).
          *
          * Before inserting (LET, 11), H5C_protect(LET, 11) must try to
-	 * free up at least 4  KB of space.  To do this, it starts scanning
-	 * up the LRU list to find entries to evict.
+    * free up at least 4  KB of space.  To do this, it starts scanning
+    * up the LRU list to find entries to evict.
          *
          * (VET, 0) is at the bottom of the LRU list, and thus is the first
-	 * entry considered.  However, it is dirty, so it flushed to disk,
+    * entry considered.  However, it is dirty, so it flushed to disk,
          * moved to the top of the LRU list, and marked clean.
          *
          * (VET, 9) is the next entry on the bottom of the LRU list. It is
-	 * dirty too, calls its serialize callback function to construct an
-         * on disk image of the entry, and moves it to the top of the LRU 
+    * dirty too, calls its serialize callback function to construct an
+         * on disk image of the entry, and moves it to the top of the LRU
          * list after the serialize callback returns.
          *
-         * However, (VET 9)'s serialize function needs to modify (VET, 8), 
+         * However, (VET 9)'s serialize function needs to modify (VET, 8),
          * which is currently not in cache.  Thus it calls H5C_protect(VET, 8)
-	 * to gain access to it.  H5C_protect(VET, 8) loads (VET, 8), and
-	 * then attempts to evict entries to make space for it.  
+    * to gain access to it.  H5C_protect(VET, 8) loads (VET, 8), and
+    * then attempts to evict entries to make space for it.
          *
          * However, H5C_make_space_in_cache() now exits without taking
          * any action on re-entrant calls.  Thus H5C_protect(VET, 8) simply
          * loads the entry into the cache -- resulting in a cache that is
-         * 10 KB oversize.  The subsequent unprotect puts (VET, 8) at the 
+         * 10 KB oversize.  The subsequent unprotect puts (VET, 8) at the
          * head of the LRU and marks it dirty.
          *
-         * After (VET, 9) is serialized, it is flushed, and moved to the 
+         * After (VET, 9) is serialized, it is flushed, and moved to the
          * head of the LRU.
          *
-         * At this point, the H5C_make_space_in_cache() call made by 
+         * At this point, the H5C_make_space_in_cache() call made by
          * H5C_protect(LET, 11) now has 14 KB of space to make.
          *
          * The next entries on the LRU are (MET, 0) thru (MET, 30),
-         * (LET, 0) thru (LET, 10), and (VET, 8) -- all of which are dirty, 
+         * (LET, 0) thru (LET, 10), and (VET, 8) -- all of which are dirty,
          * and are therefore flushed and moved to the head of the LRU list.
          *
          * The next entry on the bottom of the LRU list is (VET, 0), which
-	 * is clean, and is therefore evicted, leaving H5C_make_space_in_cache()
+    * is clean, and is therefore evicted, leaving H5C_make_space_in_cache()
          * with 4 KB of space to create.
          *
-	 * This space is sufficient, so H5C_protect(VET, 8) inserts
-	 * (VET, 8) into the cache's index, marks it as protected, and
-	 * returns to the serialize function for (VET, 9).
+    * This space is sufficient, so H5C_protect(VET, 8) inserts
+    * (VET, 8) into the cache's index, marks it as protected, and
+    * returns to the serialize function for (VET, 9).
          *
          * When the serialize function for (VET, 9) is done with (VET, 8), it
          * calls H5C_unprotect(VET, 8), which markes (VET, 8) as dirty and
@@ -10489,101 +10489,101 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
          * evicted -- leaving 6 KB of free space after (LET, 11) is inserted
          * into the cache.
          *
-	 * H5C_unprotect(LET, 11) marks (LET, 11) as unprotected, and then
-	 * returns as well.
-	 *
-	 * The following table shows the expected states of the variable
-	 * size entries after the test.
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 1)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 4)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 6)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 7)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 8)	Y	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	N	10 KB	N	N	-	-
-	 *
-	 * Start by updating the expected table for the expected changes in
-	 * entry status:
-	 *
-	 * Note that we reset the loaded, flushed, and destroyed
-	 * fields of (VET,8) so we can track what is happening.
-	 */
-	base_addr = entries[VARIABLE_ENTRY_TYPE];
-	entry_ptr = &(base_addr[8]);
-	entry_ptr->deserialized = FALSE;
-	entry_ptr->deserialized = FALSE;
-	entry_ptr->destroyed    = FALSE;
-
-	expected[0].in_cache     = FALSE;
-	expected[0].is_dirty     = FALSE;
-	expected[0].serialized   = TRUE;
-	expected[0].destroyed    = TRUE;
-	expected[8].in_cache	 = TRUE;
-	expected[8].is_dirty     = FALSE;
-	expected[8].deserialized = TRUE;
-	expected[8].serialized   = TRUE;
-	expected[8].destroyed    = FALSE;
-	expected[9].in_cache     = FALSE;
-	expected[9].is_dirty     = FALSE;
-	expected[9].serialized   = TRUE;
-	expected[9].destroyed    = TRUE;
-
-	expected[10].in_cache     = TRUE;
-	expected[10].is_dirty     = FALSE;
-	expected[10].serialized   = TRUE;
-	expected[10].destroyed    = FALSE;
+    * H5C_unprotect(LET, 11) marks (LET, 11) as unprotected, and then
+    * returns as well.
+    *
+    * The following table shows the expected states of the variable
+    * size entries after the test.
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     N    10 KB    N    N    -    -
+    *
+    * (VET, 1)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 4)    N    10 KB    N    N    -    -
+    *
+    * (VET, 5)    N     5 KB    N    N    -    -
+    *
+    * (VET, 6)    N     5 KB    N    N    -    -
+    *
+    * (VET, 7)    N     5 KB    N    N    -    -
+    *
+    * (VET, 8)    Y    10 KB    N    N    -    -
+    *
+    * (VET, 9)    N    10 KB    N    N    -    -
+    *
+    * Start by updating the expected table for the expected changes in
+    * entry status:
+    *
+    * Note that we reset the loaded, flushed, and destroyed
+    * fields of (VET,8) so we can track what is happening.
+    */
+    base_addr = entries[VARIABLE_ENTRY_TYPE];
+    entry_ptr = &(base_addr[8]);
+    entry_ptr->deserialized = FALSE;
+    entry_ptr->deserialized = FALSE;
+    entry_ptr->destroyed    = FALSE;
+
+    expected[0].in_cache     = FALSE;
+    expected[0].is_dirty     = FALSE;
+    expected[0].serialized   = TRUE;
+    expected[0].destroyed    = TRUE;
+    expected[8].in_cache     = TRUE;
+    expected[8].is_dirty     = FALSE;
+    expected[8].deserialized = TRUE;
+    expected[8].serialized   = TRUE;
+    expected[8].destroyed    = FALSE;
+    expected[9].in_cache     = FALSE;
+    expected[9].is_dirty     = FALSE;
+    expected[9].serialized   = TRUE;
+    expected[9].destroyed    = TRUE;
+
+    expected[10].in_cache     = TRUE;
+    expected[10].is_dirty     = FALSE;
+    expected[10].serialized   = TRUE;
+    expected[10].destroyed    = FALSE;
 
         num_large_entries = 12;
 
-	for (i = num_variable_entries;
-	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
-	      i++)
-	{
+    for (i = num_variable_entries;
+        i < num_variable_entries + num_monster_entries + num_large_entries - 1;
+        i++)
+    {
             expected[i].is_dirty   = FALSE;
-	    expected[i].serialized = TRUE;
-	}
+        expected[i].serialized = TRUE;
+    }
 
-	for (i = 10; i < 12; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 10; i < 12; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
         /* verify cache size  */
-	if((cache_ptr->index_len != 44) ||
+    if((cache_ptr->index_len != 44) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
                                         (2 * 1024) -
                                         (1 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE) +
-					 (31 * MONSTER_ENTRY_SIZE) +
-					 (12 * LARGE_ENTRY_SIZE)))) {
+        (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE) +
+                    (31 * MONSTER_ENTRY_SIZE) +
+                    (12 * LARGE_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 11.";
-	}
+        failure_mssg = "unexpected size/len in flush op eviction test 11.";
+    }
 
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    9,
-                            (num_variable_entries + num_monster_entries + 
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                9,
+                            (num_variable_entries + num_monster_entries +
                              num_large_entries),
-			    expected);
+                expected);
     }
 
     if(pass) {
@@ -10592,8 +10592,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 9);
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 9, H5C__NO_FLAGS_SET);
 
-        /* protect and unprotect VET 8 to dirty it and move it to the 
-         * top of the LRU.  Since we are dirtying it again, reset its 
+        /* protect and unprotect VET 8 to dirty it and move it to the
+         * top of the LRU.  Since we are dirtying it again, reset its
          * serialized flag.
          */
         base_addr = entries[VARIABLE_ENTRY_TYPE];
@@ -10605,14 +10605,14 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
 
         /* Again, touch all the non VARIABLE_ENTRY_TYPE entries in the
-	 * cache to evict VET 9 and move VET 8 to the bottom of the LRU.
+    * cache to evict VET 9 and move VET 8 to the bottom of the LRU.
          *
          * Must do this twice to get the desired result.
-	 */
+    */
 
 
-        /* skip MET 0 in first pass so that we evict VET 9 when we 
-         * reload MET 0 
+        /* skip MET 0 in first pass so that we evict VET 9 when we
+         * reload MET 0
          *
          * Since we are reloading MET 0, reset its destroyed flag.
          */
@@ -10620,40 +10620,40 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
         entry_ptr = &(base_addr[0]);
         entry_ptr->destroyed = FALSE;
 
-	for (i = 1; i < num_monster_entries; i++)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    for (i = 1; i < num_monster_entries; i++)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	for (i = 0; i < num_large_entries; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 0; i < num_large_entries; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	for (i = 0; i < num_monster_entries; i++)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    for (i = 0; i < num_monster_entries; i++)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	for (i = 0; i < num_large_entries; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 0; i < num_large_entries; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	/* update the expected array to mark all these entries dirty again. */
-	for (i = num_variable_entries;
-	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
-	      i++)
-	{
+    /* update the expected array to mark all these entries dirty again. */
+    for (i = num_variable_entries;
+        i < num_variable_entries + num_monster_entries + num_large_entries - 1;
+        i++)
+    {
             expected[i].is_dirty = TRUE;
-	}
+    }
 
-        /* update MET 0 to set its in cache flag, and reset 
-         * its destroyed flag 
+        /* update MET 0 to set its in cache flag, and reset
+         * its destroyed flag
          */
         expected[10].in_cache     = TRUE;
 
@@ -10671,118 +10671,118 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
 
         /* verify cache size */
-	if((cache_ptr->index_len != 44) ||
+    if((cache_ptr->index_len != 44) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (5 * VARIABLE_ENTRY_SIZE) +
-	                                (11 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE) +
-					 (31 * MONSTER_ENTRY_SIZE) +
-					 (12 * LARGE_ENTRY_SIZE)))) {
+                                    (5 * VARIABLE_ENTRY_SIZE) +
+                                    (11 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((1 * VARIABLE_ENTRY_SIZE) +
+                    (31 * MONSTER_ENTRY_SIZE) +
+                    (12 * LARGE_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 12.";
-	}
+        failure_mssg = "unexpected size/len in flush op eviction test 12.";
+    }
 
-        /* modifications to the H5C__flush_single_entry() function have 
-         * changed the behavior of the cache slightly, causing 
-         * this test to fail.  Comment out for now -- come back and 
+        /* modifications to the H5C__flush_single_entry() function have
+         * changed the behavior of the cache slightly, causing
+         * this test to fail.  Comment out for now -- come back and
          * fix if all goes well.
          */
 
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    10,
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                10,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
+                expected);
     }
 
     if(pass) {
 
         /* Load two more large entries.
-	 *
-	 * Since (VET, 8) is dirty, at first this will just cause (VET, 8)
-	 * to be flushed.
-	 *
-	 * But all other entries in the cache are dirty, so the cache will
-	 * flush them all, and then evict (VET, 8) on the second pass.
-	 *
-	 * The following table shows the expected states of the variable
-	 * size entries after the test.
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (VET, 0) 	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 1)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 2)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 3)	N	2.5 KB	N	N	-	-
-	 *
-	 * (VET, 4)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 5)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 6)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 7)	N	 5 KB	N	N	-	-
-	 *
-	 * (VET, 8)	N	10 KB	N	N	-	-
-	 *
-	 * (VET, 9)	N	10 KB	N	N	-	-
-	 *
-	 * Start by updating the expected table for the expected changes in
-	 * entry status:
-	 */
-
-	expected[8].in_cache	 = FALSE;
-	expected[8].is_dirty     = FALSE;
-	expected[8].serialized   = TRUE;
-	expected[8].destroyed    = TRUE;
+    *
+    * Since (VET, 8) is dirty, at first this will just cause (VET, 8)
+    * to be flushed.
+    *
+    * But all other entries in the cache are dirty, so the cache will
+    * flush them all, and then evict (VET, 8) on the second pass.
+    *
+    * The following table shows the expected states of the variable
+    * size entries after the test.
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (VET, 0)     N    10 KB    N    N    -    -
+    *
+    * (VET, 1)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 2)    N    10 KB    N    N    -    -
+    *
+    * (VET, 3)    N    2.5 KB    N    N    -    -
+    *
+    * (VET, 4)    N    10 KB    N    N    -    -
+    *
+    * (VET, 5)    N     5 KB    N    N    -    -
+    *
+    * (VET, 6)    N     5 KB    N    N    -    -
+    *
+    * (VET, 7)    N     5 KB    N    N    -    -
+    *
+    * (VET, 8)    N    10 KB    N    N    -    -
+    *
+    * (VET, 9)    N    10 KB    N    N    -    -
+    *
+    * Start by updating the expected table for the expected changes in
+    * entry status:
+    */
+
+    expected[8].in_cache     = FALSE;
+    expected[8].is_dirty     = FALSE;
+    expected[8].serialized   = TRUE;
+    expected[8].destroyed    = TRUE;
 
         num_large_entries = 14;
 
-	/* a newly loaded entry is not inserted in the cache until after
-	 * space has been made for it.  Thus (LET, 13) will not be flushed.
-	 */
-	for (i = num_variable_entries;
-	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
-	      i++)
-	{
+    /* a newly loaded entry is not inserted in the cache until after
+    * space has been made for it.  Thus (LET, 13) will not be flushed.
+    */
+    for (i = num_variable_entries;
+        i < num_variable_entries + num_monster_entries + num_large_entries - 1;
+        i++)
+    {
             expected[i].is_dirty   = FALSE;
-	    expected[i].serialized = TRUE;
-	}
+        expected[i].serialized = TRUE;
+    }
 
-	for (i = 12; i < 14; i++)
-	{
-	    protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
+    for (i = 12; i < 14; i++)
+    {
+        protect_entry(file_ptr, LARGE_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
         /* verify cache size  */
-	if((cache_ptr->index_len != 45) ||
+    if((cache_ptr->index_len != 45) ||
              (cache_ptr->index_size != (2 * 1024 * 1024) -
-	                                (6 * VARIABLE_ENTRY_SIZE) +
-	                                (13 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->index_size != ((31 * MONSTER_ENTRY_SIZE) +
-					 (14 * LARGE_ENTRY_SIZE)))) {
+                                    (6 * VARIABLE_ENTRY_SIZE) +
+                                    (13 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->index_size != ((31 * MONSTER_ENTRY_SIZE) +
+                    (14 * LARGE_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in flush op eviction test 13.";
-	}
+        failure_mssg = "unexpected size/len in flush op eviction test 13.";
+    }
 
-        /* modifications to the H5C__flush_single_entry() function have 
-         * changed the behavior of the cache slightly, causing 
-         * this test to fail.  Comment out for now -- come back and 
+        /* modifications to the H5C__flush_single_entry() function have
+         * changed the behavior of the cache slightly, causing
+         * this test to fail.  Comment out for now -- come back and
          * fix if all goes well.
          */
 
-	/* verify entry status */
-	verify_entry_status(cache_ptr,
-			    11,
+    /* verify entry status */
+    verify_entry_status(cache_ptr,
+                11,
                             (num_variable_entries + num_monster_entries + num_large_entries),
-			    expected);
+                expected);
     }
 
     /* at this point we have cycled all the variable size entries through
@@ -10820,7 +10820,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
      */
     if(pass) {
 
-	if((cache_ptr->insertions[VARIABLE_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[VARIABLE_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[VARIABLE_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[VARIABLE_ENTRY_TYPE] != 0) ||
              (cache_ptr->flushes[VARIABLE_ENTRY_TYPE] != 9) ||
@@ -10846,7 +10846,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
     if(pass) {
 
-	if((cache_ptr->insertions[LARGE_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[LARGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[LARGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[LARGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->flushes[LARGE_ENTRY_TYPE] != 25) ||
@@ -10872,7 +10872,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
     if(pass) {
 
-	if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->flushes[MONSTER_ENTRY_TYPE] != 62) ||
@@ -10899,33 +10899,33 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
     if(pass) {
 
-	reset_entries();
+    reset_entries();
     }
 
     return;
 
 } /* check_flush_cache__flush_op_eviction_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__single_entry()
+ * Function:    check_flush_cache__single_entry()
  *
- * Purpose:	Verify that flush_cache behaves as expected when the cache
- *		contains only one element.
+ * Purpose:    Verify that flush_cache behaves as expected when the cache
+ *        contains only one element.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              1/12/05
  *
  * Modifications:
  *
- * 		JRM -- 3/29/06
- * 		Added tests for pinned entries.
+ *         JRM -- 3/29/06
+ *         Added tests for pinned entries.
  *
- * 		JRM -- 5/17/06
- * 		Complete reqrite of pinned entry tests to accomodate
- * 		the new H5C_mark_entry_dirty() call.
+ *         JRM -- 5/17/06
+ *         Complete reqrite of pinned entry tests to accomodate
+ *         the new H5C_mark_entry_dirty() call.
  *
  *-------------------------------------------------------------------------
  */
@@ -12079,22 +12079,22 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
     /* Now run single entry tests for pinned entries.  Test all combinations
      * of:
      *
-     * 	1) Unpin by unprotect vs. unpin by call to H5C_unpin_entry().
+     *     1) Unpin by unprotect vs. unpin by call to H5C_unpin_entry().
      *
-     * 	2) Marked dirty by unprotect or not.
+     *     2) Marked dirty by unprotect or not.
      *
-     * 	3) Marked dirty by call to H5C_mark_entry_dirty() or not.
+     *     3) Marked dirty by call to H5C_mark_entry_dirty() or not.
      *
      *  4) Marked dirty by call to H5C_mark_entry_dirty() while protected
      *     or not.
      *
      *  5) Marked dirty by call to H5C_mark_entry_dirty() while pinned or not.
      *
-     * 	6) Entry marked for flush or not.
+     *     6) Entry marked for flush or not.
      *
-     * 	7) Call flush with H5C__FLUSH_MARKED_ENTRIES_FLAG or not.
+     *     7) Call flush with H5C__FLUSH_MARKED_ENTRIES_FLAG or not.
      *
-     * 	8) Call flush with H5C__FLUSH_CLEAR_ONLY_FLAG or not.
+     *     8) Call flush with H5C__FLUSH_CLEAR_ONLY_FLAG or not.
      *
      * This yields a total of 256 tests.
      *
@@ -12137,320 +12137,320 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
 
     if(pass) {
 
-	int i;
-	struct pinned_single_entry_test_spec
-	{
-            int 		test_num;
-            int			entry_type;
-            int			entry_idx;
-            hbool_t		dirty_flag;
-            hbool_t		mark_dirty;
-            hbool_t		pop_mark_dirty_prot;
-            hbool_t		pop_mark_dirty_pinned;
-            hbool_t		unprotect_unpin;
-            unsigned int	flags;
-            unsigned int	flush_flags;
-            hbool_t		expected_serialized;
-            hbool_t		expected_destroyed;
-	} spec[256] =
-	/*                                           pop    pop
-	 *                         ent unprot        mark   mark
-	 *  test  entry            -ry dirty  mark   dirty  dirty  unprot                             flush                                                         expect expect
+    int i;
+    struct pinned_single_entry_test_spec
+    {
+            int         test_num;
+            int            entry_type;
+            int            entry_idx;
+            hbool_t        dirty_flag;
+            hbool_t        mark_dirty;
+            hbool_t        pop_mark_dirty_prot;
+            hbool_t        pop_mark_dirty_pinned;
+            hbool_t        unprotect_unpin;
+            unsigned int    flags;
+            unsigned int    flush_flags;
+            hbool_t        expected_serialized;
+            hbool_t        expected_destroyed;
+    } spec[256] =
+    /*                                           pop    pop
+    *                         ent unprot        mark   mark
+    *  test  entry            -ry dirty  mark   dirty  dirty  unprot                             flush                                                         expect expect
          *  num   type             idx  flag  dirty  prot   pinned unpin  flags                       flags                                                         srlzd  destroy
-	 */
-	{ {   1,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
-	  {   2,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
-	  {   3,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {   4,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {   5,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {   6,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {   7,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {   8,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {   9,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  10,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  11,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  12,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  13,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  14,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  15,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  16,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  17,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  18,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  19,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  20,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  21,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  22,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  23,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  24,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  25,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  26,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  27,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  28,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  29,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  30,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  31,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  32,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  33,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
-	  {  34,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
-	  {  35,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  36,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  37,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  38,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  39,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  40,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  41,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  42,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  43,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  44,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  45,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  46,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  47,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  48,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  49,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  50,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  51,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  52,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  53,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  54,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  55,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  56,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  57,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  58,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  59,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  60,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  61,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  62,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  63,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  64,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
-	  {  65,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  66,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  67,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  68,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  69,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  70,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  71,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  72,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  73,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  74,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  75,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  76,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  77,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  78,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  79,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  80,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  81,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  82,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  83,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  84,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  85,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  86,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  87,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  88,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  89,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  90,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  91,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  92,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  93,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  94,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  95,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  96,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  97,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  98,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  {  99,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  { 100,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  { 101,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 102,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 103,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 104,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 105,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  { 106,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  { 107,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  { 108,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
-	  { 109,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 110,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 111,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 112,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 113,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 114,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 115,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 116,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 117,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 118,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 119,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 120,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 121,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 122,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 123,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 124,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 125,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 126,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 127,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 128,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
-	  { 129,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 130,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 131,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 132,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 133,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 134,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 135,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 136,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 137,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 138,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 139,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 140,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 141,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 142,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 143,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 144,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 145,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 146,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 147,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 148,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 149,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 150,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 151,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 152,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 153,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 154,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 155,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 156,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 157,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 158,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 159,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 160,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 161,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 162,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 163,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 164,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 165,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 166,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 167,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 168,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 169,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 170,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 171,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 172,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 173,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 174,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 175,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 176,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 177,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 178,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 179,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 180,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 181,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 182,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 183,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 184,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 185,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 186,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 187,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 188,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 189,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 190,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 191,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 192,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
-	  { 193,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 194,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 195,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 196,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 197,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 198,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 199,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 200,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 201,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 202,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 203,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 204,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 205,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 206,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 207,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 208,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 209,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 210,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 211,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 212,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 213,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 214,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 215,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 216,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 217,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 218,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 219,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 220,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 221,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 222,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 223,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 224,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 225,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 226,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 227,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 228,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 229,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 230,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 231,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 232,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 233,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 234,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 235,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 236,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 237,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 238,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 239,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 240,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 241,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 242,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 243,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 244,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 245,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 246,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 247,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 248,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 249,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 250,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 251,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 252,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 253,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 254,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 255,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
-	  { 256,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE } };
-
-	i = 0;
-	while(pass && (i < 256))
-	{
-	    check_flush_cache__pinned_single_entry_test
-	    (
+    */
+    { {   1,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
+    {   2,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
+    {   3,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {   4,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {   5,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {   6,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {   7,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {   8,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {   9,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  10,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  11,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  12,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  13,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  14,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  15,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  16,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  17,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  18,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  19,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  20,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  21,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  22,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  23,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  24,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  25,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  26,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  27,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  28,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  29,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  30,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  31,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  32,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  33,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
+    {  34,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                           FALSE, FALSE },
+    {  35,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  36,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  37,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  38,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  39,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  40,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  41,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  42,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  43,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  44,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  45,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  46,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  47,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  48,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  49,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  50,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  51,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  52,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  53,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  54,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  55,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  56,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  57,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  58,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  59,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  60,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  61,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  62,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  63,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  64,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__NO_FLAGS_SET,                                            TRUE, FALSE },
+    {  65,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  66,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  67,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  68,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  69,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  70,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  71,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  72,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  73,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  74,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  75,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  76,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  77,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  78,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  79,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  80,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  81,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  82,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  83,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  84,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  85,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  86,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  87,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  88,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  89,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  90,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  91,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  92,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  93,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  94,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  95,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  96,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  97,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  98,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    {  99,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    { 100,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    { 101,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 102,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 103,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 104,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 105,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    { 106,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    { 107,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    { 108,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                              FALSE, FALSE },
+    { 109,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 110,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 111,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 112,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 113,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 114,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 115,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 116,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 117,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 118,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 119,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 120,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 121,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 122,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 123,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 124,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 125,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 126,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 127,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 128,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG,                               TRUE, FALSE },
+    { 129,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 130,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 131,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 132,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 133,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 134,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 135,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 136,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 137,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 138,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 139,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 140,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 141,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 142,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 143,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 144,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 145,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 146,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 147,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 148,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 149,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 150,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 151,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 152,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 153,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 154,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 155,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 156,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 157,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 158,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 159,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 160,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 161,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 162,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 163,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 164,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 165,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 166,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 167,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 168,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 169,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 170,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 171,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 172,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 173,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 174,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 175,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 176,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 177,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 178,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 179,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 180,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 181,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 182,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 183,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 184,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 185,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 186,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 187,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 188,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 189,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 190,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 191,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 192,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_CLEAR_ONLY_FLAG,                                  FALSE, FALSE },
+    { 193,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 194,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 195,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 196,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 197,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 198,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 199,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 200,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 201,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 202,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 203,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 204,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 205,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 206,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 207,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 208,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 209,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 210,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 211,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 212,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 213,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 214,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 215,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 216,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 217,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 218,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 219,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 220,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 221,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 222,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 223,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 224,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__NO_FLAGS_SET,          H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 225,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 226,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 227,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 228,  PICO_ENTRY_TYPE,  0, FALSE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 229,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 230,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 231,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 232,  PICO_ENTRY_TYPE,  0, FALSE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 233,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 234,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 235,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 236,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 237,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 238,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 239,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 240,  PICO_ENTRY_TYPE,  0, FALSE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 241,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 242,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 243,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 244,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 245,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 246,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 247,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 248,  PICO_ENTRY_TYPE,  0,  TRUE, FALSE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 249,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 250,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 251,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 252,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE, FALSE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 253,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 254,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE, FALSE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 255,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE },
+    { 256,  PICO_ENTRY_TYPE,  0,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, H5C__SET_FLUSH_MARKER_FLAG, H5C__FLUSH_MARKED_ENTRIES_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, FALSE, FALSE } };
+
+    i = 0;
+    while(pass && (i < 256))
+    {
+        check_flush_cache__pinned_single_entry_test
+        (
                 /* file_ptr             */ file_ptr,
                 /* test_num              */ spec[i].test_num,
                 /* entry_type            */ spec[i].entry_type,
                 /* entry_idx             */ spec[i].entry_idx,
                 /* dirty_flag            */ spec[i].dirty_flag,
-	        /* mark_dirty            */ spec[i].mark_dirty,
+            /* mark_dirty            */ spec[i].mark_dirty,
                 /* pop_mark_dirty_prot   */ spec[i].pop_mark_dirty_prot,
                 /* pop_mark_dirty_pinned */ spec[i].pop_mark_dirty_pinned,
-	        /* unprotect_unpin       */ spec[i].unprotect_unpin,
+            /* unprotect_unpin       */ spec[i].unprotect_unpin,
                 /* flags                 */ spec[i].flags,
                 /* flush_flags           */ spec[i].flush_flags,
                 /* expected_serialized   */ spec[i].expected_serialized,
                 /* expected_destroyed    */ spec[i].expected_destroyed
            );
-	    i++;
-	}
+        i++;
+    }
     }
 
     return;
 
 } /* check_flush_cache__single_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__single_entry_test()
+ * Function:    check_flush_cache__single_entry_test()
  *
- * Purpose:	Run a single entry flush cache test.
+ * Purpose:    Run a single entry flush cache test.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              1/12/05
  *
  * Modifications:
@@ -12472,7 +12472,7 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
 {
     H5C_t *        cache_ptr = file_ptr->shared->cache;
     static char    msg[128];
-    herr_t	   result;
+    herr_t       result;
     test_entry_t * base_addr;
     test_entry_t * entry_ptr = NULL;
 
@@ -12612,26 +12612,26 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
 
 } /* check_flush_cache__single_entry_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_cache__pinned_single_entry_test()
+ * Function:    check_flush_cache__pinned_single_entry_test()
  *
- * Purpose:	Run a pinned single entry flush cache test.
+ * Purpose:    Run a pinned single entry flush cache test.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              3/28/06
  *
  * Modifications:
  *
- * 		JRM -- 5/17/06
- * 		Added the pop_mark_dirty_prot and pop_mark_dirty_pinned
- * 		flags and supporting code to allow us to test the
- * 		H5C_mark_entry_dirty() call.  Use the
- * 		call to mark the entry dirty while the entry is protected
- * 		if pop_mark_dirty_prot is TRUE, and to mark the entry
- * 		dirty while it is pinned if pop_mark_dirty_pinned is TRUE.
+ *         JRM -- 5/17/06
+ *         Added the pop_mark_dirty_prot and pop_mark_dirty_pinned
+ *         flags and supporting code to allow us to test the
+ *         H5C_mark_entry_dirty() call.  Use the
+ *         call to mark the entry dirty while the entry is protected
+ *         if pop_mark_dirty_prot is TRUE, and to mark the entry
+ *         dirty while it is pinned if pop_mark_dirty_pinned is TRUE.
  *
  *-------------------------------------------------------------------------
  */
@@ -12642,10 +12642,10 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
                                             int entry_type,
                                             int entry_idx,
                                             hbool_t unprot_dirty_flag,
-					    hbool_t mark_dirty,
-					    hbool_t pop_mark_dirty_prot,
-					    hbool_t pop_mark_dirty_pinned,
-					    hbool_t unprotect_unpin,
+                        hbool_t mark_dirty,
+                        hbool_t pop_mark_dirty_prot,
+                        hbool_t pop_mark_dirty_pinned,
+                        hbool_t unprotect_unpin,
                                             unsigned int flags,
                                             unsigned int flush_flags,
                                             hbool_t expected_serialized,
@@ -12654,7 +12654,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
     H5C_t *       cache_ptr = file_ptr->shared->cache;
     static char    msg[128];
     hbool_t        expected_deserialized = TRUE;
-    herr_t	   result;
+    herr_t       result;
     test_entry_t * base_addr;
     test_entry_t * entry_ptr = NULL;
 
@@ -12692,24 +12692,24 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
 
         protect_entry(file_ptr, entry_type, entry_idx);
 
-	if(pop_mark_dirty_prot) {
+    if(pop_mark_dirty_prot) {
 
-	    mark_entry_dirty(entry_type, entry_idx);
-	}
+        mark_entry_dirty(entry_type, entry_idx);
+    }
 
         unprotect_entry(file_ptr, entry_type, entry_idx,
                 (unprot_dirty_flag ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET) |
                 (flags | H5C__PIN_ENTRY_FLAG));
 
-	if(mark_dirty) {
+    if(mark_dirty) {
 
             mark_entry_dirty(entry_type, entry_idx);
-	}
+    }
 
-	if(pop_mark_dirty_pinned) {
+    if(pop_mark_dirty_pinned) {
 
-	    mark_entry_dirty(entry_type, entry_idx);
-	}
+        mark_entry_dirty(entry_type, entry_idx);
+    }
     }
 
     if(pass) {
@@ -12820,15 +12820,15 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
 
 } /* check_flush_cache__pinned_single_entry_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_get_entry_status()
+ * Function:    check_get_entry_status()
  *
- * Purpose:	Verify that H5C_get_entry_status() behaves as expected.
+ * Purpose:    Verify that H5C_get_entry_status() behaves as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/28/06
  *
  * Modifications:
@@ -12841,11 +12841,11 @@ check_get_entry_status(unsigned paged)
 {
     static char   msg[128];
     herr_t        result;
-    hbool_t	  in_cache;
-    hbool_t	  is_dirty;
-    hbool_t	  is_protected;
-    hbool_t	  is_pinned;
-    size_t	  entry_size;
+    hbool_t      in_cache;
+    hbool_t      is_dirty;
+    hbool_t      is_protected;
+    hbool_t      is_pinned;
+    size_t      entry_size;
     H5F_t *       file_ptr = NULL;
     test_entry_t * base_addr = NULL;
     test_entry_t * entry_ptr = NULL;
@@ -12886,14 +12886,14 @@ check_get_entry_status(unsigned paged)
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 1.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 1.");
@@ -12914,14 +12914,14 @@ check_get_entry_status(unsigned paged)
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 2.");
             failure_mssg = msg;
 
-	} else if(!in_cache || is_dirty || is_protected || is_pinned) {
+    } else if(!in_cache || is_dirty || is_protected || is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 2.");
@@ -12940,14 +12940,14 @@ check_get_entry_status(unsigned paged)
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 3.");
             failure_mssg = msg;
 
-	} else if(!in_cache || is_dirty || !is_protected || is_pinned) {
+    } else if(!in_cache || is_dirty || !is_protected || is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 3.");
@@ -12966,14 +12966,14 @@ check_get_entry_status(unsigned paged)
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 4.");
             failure_mssg = msg;
 
-	} else if(!in_cache || is_dirty || is_protected || !is_pinned) {
+    } else if(!in_cache || is_dirty || is_protected || !is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 4.");
@@ -12992,14 +12992,14 @@ check_get_entry_status(unsigned paged)
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 5.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || !is_pinned) {
+    } else if(!in_cache || !is_dirty || is_protected || !is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 5.");
@@ -13018,14 +13018,14 @@ check_get_entry_status(unsigned paged)
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 6.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || is_pinned) {
+    } else if(!in_cache || !is_dirty || is_protected || is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 6.");
@@ -13050,15 +13050,15 @@ check_get_entry_status(unsigned paged)
 
 } /* check_get_entry_status() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_expunge_entry()
+ * Function:    check_expunge_entry()
  *
- * Purpose:	Verify that H5C_expunge_entry() behaves as expected.
+ * Purpose:    Verify that H5C_expunge_entry() behaves as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              7/5/06
  *
  * Modifications:
@@ -13072,11 +13072,11 @@ check_expunge_entry(unsigned paged)
 {
     static char   msg[128];
     herr_t        result;
-    hbool_t	  in_cache;
-    hbool_t	  is_dirty;
-    hbool_t	  is_protected;
-    hbool_t	  is_pinned;
-    size_t	  entry_size;
+    hbool_t      in_cache;
+    hbool_t      is_dirty;
+    hbool_t      is_protected;
+    hbool_t      is_pinned;
+    size_t      entry_size;
     H5F_t *       file_ptr = NULL;
     test_entry_t * base_addr;
     test_entry_t * entry_ptr;
@@ -13106,30 +13106,30 @@ check_expunge_entry(unsigned paged)
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned, NULL, NULL, NULL, NULL);
+                    &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 1.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 1.");
             failure_mssg = msg;
 
         } else if((entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 1.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     /* protect an entry to force the cache to load it, and then unprotect
@@ -13149,28 +13149,28 @@ check_expunge_entry(unsigned paged)
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 2.");
             failure_mssg = msg;
 
-	} else if(!in_cache || is_dirty || is_protected || is_pinned) {
+    } else if(!in_cache || is_dirty || is_protected || is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 2.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 2.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     /* Expunge the entry and then verify that it is no longer in the cache.
@@ -13186,34 +13186,34 @@ check_expunge_entry(unsigned paged)
     if(pass) {
 
         /* entry shouldn't be in cache -- only in_cache should be touched
-	 * by the status call.  Thus, only check that boolean.
+    * by the status call.  Thus, only check that boolean.
          */
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                 &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 3.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 3.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 3.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     /* now repeat the process with a different entry.  On unprotect
@@ -13231,30 +13231,30 @@ check_expunge_entry(unsigned paged)
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned, NULL, NULL, NULL, NULL);
+                    &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 4.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 4.");
             failure_mssg = msg;
 
         } else if((entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 4.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     /* protect the entry to force the cache to load it, and then unprotect
@@ -13273,30 +13273,30 @@ check_expunge_entry(unsigned paged)
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned, NULL, NULL, NULL, NULL);
+                    &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 5.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || is_pinned) {
+    } else if(!in_cache || !is_dirty || is_protected || is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 5.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 5.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     /* Expunge the entry and then verify that it is no longer in the cache.
@@ -13312,35 +13312,35 @@ check_expunge_entry(unsigned paged)
     if(pass) {
 
         /* entry shouldn't be in cache -- only in_cache should be touched
-	 * by the status call.  Thus, only check that boolean.
+    * by the status call.  Thus, only check that boolean.
          */
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned, NULL, NULL, NULL, NULL);
+                    &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 6.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 6.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 6.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -13360,21 +13360,21 @@ check_expunge_entry(unsigned paged)
 
 } /* check_expunge_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_multiple_read_protect()
+ * Function:    check_multiple_read_protect()
  *
- * Purpose:	Verify that multiple, simultaneous read protects of a
- * 		single entry perform as expectd.
+ * Purpose:    Verify that multiple, simultaneous read protects of a
+ *         single entry perform as expectd.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/1/07
  *
  * Modifications:
  *
- * 		None.
+ *         None.
  *
  *-------------------------------------------------------------------------
  */
@@ -13427,8 +13427,8 @@ check_multiple_read_protect(unsigned paged)
         entry_ptr = &((entries[0])[0]);
 
         if((entry_ptr->header.is_protected) ||
- 	     (entry_ptr->header.is_read_only) ||
-	     (entry_ptr->header.ro_ref_count != 0)) {
+        (entry_ptr->header.is_read_only) ||
+        (entry_ptr->header.ro_ref_count != 0)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 1.\n";
@@ -13437,11 +13437,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 0) ||
-	 (cache_ptr->max_read_protects[0] != 0)) {
+    (cache_ptr->read_protects[0] != 0) ||
+    (cache_ptr->max_read_protects[0] != 0)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 1.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 1.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13450,8 +13450,8 @@ check_multiple_read_protect(unsigned paged)
         protect_entry_ro(file_ptr, 0, 0);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (!(entry_ptr->header.is_read_only)) ||
-	     (entry_ptr->header.ro_ref_count != 1)) {
+        (!(entry_ptr->header.is_read_only)) ||
+        (entry_ptr->header.ro_ref_count != 1)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 2.\n";
@@ -13460,11 +13460,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 1) ||
-	 (cache_ptr->max_read_protects[0] != 1)) {
+    (cache_ptr->read_protects[0] != 1) ||
+    (cache_ptr->max_read_protects[0] != 1)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 2.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 2.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13473,8 +13473,8 @@ check_multiple_read_protect(unsigned paged)
         protect_entry_ro(file_ptr, 0, 0);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (!(entry_ptr->header.is_read_only)) ||
-	     (entry_ptr->header.ro_ref_count != 2)) {
+        (!(entry_ptr->header.is_read_only)) ||
+        (entry_ptr->header.ro_ref_count != 2)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 3.\n";
@@ -13483,11 +13483,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 2) ||
-	 (cache_ptr->max_read_protects[0] != 2)) {
+    (cache_ptr->read_protects[0] != 2) ||
+    (cache_ptr->max_read_protects[0] != 2)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 3.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 3.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13496,8 +13496,8 @@ check_multiple_read_protect(unsigned paged)
         unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (!(entry_ptr->header.is_read_only)) ||
-	     (entry_ptr->header.ro_ref_count != 1)) {
+        (!(entry_ptr->header.is_read_only)) ||
+        (entry_ptr->header.ro_ref_count != 1)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 4.\n";
@@ -13506,11 +13506,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 2) ||
-	 (cache_ptr->max_read_protects[0] != 2)) {
+    (cache_ptr->read_protects[0] != 2) ||
+    (cache_ptr->max_read_protects[0] != 2)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 4.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 4.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13519,8 +13519,8 @@ check_multiple_read_protect(unsigned paged)
         protect_entry_ro(file_ptr, 0, 0);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (!(entry_ptr->header.is_read_only)) ||
-	     (entry_ptr->header.ro_ref_count != 2)) {
+        (!(entry_ptr->header.is_read_only)) ||
+        (entry_ptr->header.ro_ref_count != 2)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 5.\n";
@@ -13529,11 +13529,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 3) ||
-	 (cache_ptr->max_read_protects[0] != 2)) {
+    (cache_ptr->read_protects[0] != 3) ||
+    (cache_ptr->max_read_protects[0] != 2)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 5.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 5.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13542,8 +13542,8 @@ check_multiple_read_protect(unsigned paged)
         protect_entry_ro(file_ptr, 0, 0);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (!(entry_ptr->header.is_read_only)) ||
-	     (entry_ptr->header.ro_ref_count != 3)) {
+        (!(entry_ptr->header.is_read_only)) ||
+        (entry_ptr->header.ro_ref_count != 3)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 6.\n";
@@ -13552,11 +13552,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 4) ||
-	 (cache_ptr->max_read_protects[0] != 3)) {
+    (cache_ptr->read_protects[0] != 4) ||
+    (cache_ptr->max_read_protects[0] != 3)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 6.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 6.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13565,8 +13565,8 @@ check_multiple_read_protect(unsigned paged)
         unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (!(entry_ptr->header.is_read_only)) ||
-	     (entry_ptr->header.ro_ref_count != 2)) {
+        (!(entry_ptr->header.is_read_only)) ||
+        (entry_ptr->header.ro_ref_count != 2)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 7.\n";
@@ -13575,11 +13575,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 4) ||
-	 (cache_ptr->max_read_protects[0] != 3)) {
+    (cache_ptr->read_protects[0] != 4) ||
+    (cache_ptr->max_read_protects[0] != 3)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 7.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 7.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13588,8 +13588,8 @@ check_multiple_read_protect(unsigned paged)
         unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (!(entry_ptr->header.is_read_only)) ||
-	     (entry_ptr->header.ro_ref_count != 1)) {
+        (!(entry_ptr->header.is_read_only)) ||
+        (entry_ptr->header.ro_ref_count != 1)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 8.\n";
@@ -13598,11 +13598,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 4) ||
-	 (cache_ptr->max_read_protects[0] != 3)) {
+    (cache_ptr->read_protects[0] != 4) ||
+    (cache_ptr->max_read_protects[0] != 3)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 8.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 8.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13611,8 +13611,8 @@ check_multiple_read_protect(unsigned paged)
         unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
         if((entry_ptr->header.is_protected) ||
- 	     (entry_ptr->header.is_read_only) ||
-	     (entry_ptr->header.ro_ref_count != 0)) {
+        (entry_ptr->header.is_read_only) ||
+        (entry_ptr->header.ro_ref_count != 0)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 9.\n";
@@ -13621,11 +13621,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 0) ||
-	 (cache_ptr->read_protects[0] != 4) ||
-	 (cache_ptr->max_read_protects[0] != 3)) {
+    (cache_ptr->read_protects[0] != 4) ||
+    (cache_ptr->max_read_protects[0] != 3)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 9.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 9.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13639,8 +13639,8 @@ check_multiple_read_protect(unsigned paged)
         protect_entry(file_ptr, 0, 0);
 
         if((!(entry_ptr->header.is_protected)) ||
- 	     (entry_ptr->header.is_read_only) ||
-	     (entry_ptr->header.ro_ref_count != 0)) {
+        (entry_ptr->header.is_read_only) ||
+        (entry_ptr->header.ro_ref_count != 0)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 10.\n";
@@ -13649,11 +13649,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 1) ||
-	 (cache_ptr->read_protects[0] != 4) ||
-	 (cache_ptr->max_read_protects[0] != 3)) {
+    (cache_ptr->read_protects[0] != 4) ||
+    (cache_ptr->max_read_protects[0] != 3)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 10.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 10.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13662,8 +13662,8 @@ check_multiple_read_protect(unsigned paged)
         unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
         if((entry_ptr->header.is_protected) ||
- 	     (entry_ptr->header.is_read_only) ||
-	     (entry_ptr->header.ro_ref_count != 0)) {
+        (entry_ptr->header.is_read_only) ||
+        (entry_ptr->header.ro_ref_count != 0)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected ro protected status 11.\n";
@@ -13672,11 +13672,11 @@ check_multiple_read_protect(unsigned paged)
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 1) ||
-	 (cache_ptr->read_protects[0] != 4) ||
-	 (cache_ptr->max_read_protects[0] != 3)) {
+    (cache_ptr->read_protects[0] != 4) ||
+    (cache_ptr->max_read_protects[0] != 3)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 11.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 11.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13691,80 +13691,80 @@ check_multiple_read_protect(unsigned paged)
 
     if(pass) {
 
-        protect_entry(file_ptr, 0, 2);		/* (0,2) write */
+        protect_entry(file_ptr, 0, 2);        /* (0,2) write */
         protect_entry_ro(file_ptr, 0, 4);      /* (0,4) read only (1) */
-	protect_entry(file_ptr, 0, 6);		/* (0,6) write */
+    protect_entry(file_ptr, 0, 6);        /* (0,6) write */
 
         unprotect_entry(file_ptr, 0, 2,         /* (0,2) unprotect */
-			H5C__NO_FLAGS_SET);
+            H5C__NO_FLAGS_SET);
 
-        protect_entry_ro(file_ptr, 0, 2);	/* (0,2) read only (1) */
-	protect_entry(file_ptr, 0, 1);         /* (0,1) write */
-        protect_entry_ro(file_ptr, 0, 4);	/* (0,4) read only (2) */
-	protect_entry(file_ptr, 0, 0);		/* (0,0) write */
-        protect_entry_ro(file_ptr, 0, 2);	/* (0,2) read only (2) */
+        protect_entry_ro(file_ptr, 0, 2);    /* (0,2) read only (1) */
+    protect_entry(file_ptr, 0, 1);         /* (0,1) write */
+        protect_entry_ro(file_ptr, 0, 4);    /* (0,4) read only (2) */
+    protect_entry(file_ptr, 0, 0);        /* (0,0) write */
+        protect_entry_ro(file_ptr, 0, 2);    /* (0,2) read only (2) */
 
         unprotect_entry(file_ptr, 0, 2,         /* (0,2) read only (1) pin */
-			H5C__PIN_ENTRY_FLAG);
+            H5C__PIN_ENTRY_FLAG);
         unprotect_entry(file_ptr, 0, 6,         /* (0,6) unprotect */
-			H5C__NO_FLAGS_SET);
+            H5C__NO_FLAGS_SET);
 
-        protect_entry_ro(file_ptr, 0, 4);	/* (0,4) read only (3) */
+        protect_entry_ro(file_ptr, 0, 4);    /* (0,4) read only (3) */
 
         unprotect_entry(file_ptr, 0, 2,         /* (0,2) unprotect */
-			H5C__NO_FLAGS_SET);
+            H5C__NO_FLAGS_SET);
         unprotect_entry(file_ptr, 0, 1,         /* (0,1) unprotect */
-			H5C__NO_FLAGS_SET);
+            H5C__NO_FLAGS_SET);
 
-	if(pass) {
+    if(pass) {
 
-	    entry_ptr = &((entries[0])[4]);
+        entry_ptr = &((entries[0])[4]);
 
-	    if(H5C_pin_protected_entry((void *)entry_ptr) < 0) {
+        if(H5C_pin_protected_entry((void *)entry_ptr) < 0) {
 
-	        pass = FALSE;
-	        failure_mssg = "H5C_pin_protected_entry() failed.\n";
+            pass = FALSE;
+            failure_mssg = "H5C_pin_protected_entry() failed.\n";
 
-	    } else if(!(entry_ptr->header.is_pinned)) {
+        } else if(!(entry_ptr->header.is_pinned)) {
 
-	        pass = FALSE;
-	        failure_mssg = "entry (0,4) not pinned.\n";
+            pass = FALSE;
+            failure_mssg = "entry (0,4) not pinned.\n";
 
-	    } else {
+        } else {
 
-		/* keep test bed sanity checks happy */
-		entry_ptr->is_pinned = TRUE;
+        /* keep test bed sanity checks happy */
+        entry_ptr->is_pinned = TRUE;
 
-	    }
-	}
+        }
+    }
 
         unprotect_entry(file_ptr, 0, 4,         /* (0,4) read only (2) */
-			H5C__NO_FLAGS_SET);
+            H5C__NO_FLAGS_SET);
         unprotect_entry(file_ptr, 0, 4,         /* (0,4) read only (1) */
-			H5C__UNPIN_ENTRY_FLAG);
+            H5C__UNPIN_ENTRY_FLAG);
 
         if(pass && (entry_ptr->header.is_pinned)) {
 
             pass = FALSE;
             failure_mssg = "enty (0,4) still pinned.\n";
 
-	}
+    }
 
         unprotect_entry(file_ptr, 0, 4,         /* (0,4) unprotect */
-			H5C__NO_FLAGS_SET);
+            H5C__NO_FLAGS_SET);
         unprotect_entry(file_ptr, 0, 0,         /* (0,0) unprotect */
-			H5C__NO_FLAGS_SET);
+            H5C__NO_FLAGS_SET);
 
-	unpin_entry(0, 2);
+    unpin_entry(0, 2);
     }
 
 #if H5C_COLLECT_CACHE_STATS
     if((cache_ptr->write_protects[0] != 5) ||
-	 (cache_ptr->read_protects[0] != 9) ||
-	 (cache_ptr->max_read_protects[0] != 3)) {
+    (cache_ptr->read_protects[0] != 9) ||
+    (cache_ptr->max_read_protects[0] != 3)) {
 
-	pass = FALSE;
-	failure_mssg = "Unexpected protect stats 11.\n";
+    pass = FALSE;
+    failure_mssg = "Unexpected protect stats 11.\n";
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -13786,17 +13786,17 @@ check_multiple_read_protect(unsigned paged)
 
 } /* check_multiple_read_protect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_move_entry()
+ * Function:    check_move_entry()
  *
- * Purpose:	Verify that H5C_move_entry behaves as expected.  In
- * 		particular, verify that it works correctly with pinned
- * 		entries.
+ * Purpose:    Verify that H5C_move_entry behaves as expected.  In
+ *         particular, verify that it works correctly with pinned
+ *         entries.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/26/06
  *
  *-------------------------------------------------------------------------
@@ -13812,26 +13812,26 @@ check_move_entry(unsigned paged)
       {
         /* int     entry_type      = */ PICO_ENTRY_TYPE,
         /* int     entry_index     = */ 10,
-	/* hbool_t is_pinned       = */ FALSE,
-	/* hbool_t is_protected    = */ FALSE
+    /* hbool_t is_pinned       = */ FALSE,
+    /* hbool_t is_protected    = */ FALSE
       },
       {
         /* int     entry_type      = */ PICO_ENTRY_TYPE,
         /* int     entry_index     = */ 20,
-	/* hbool_t is_pinned       = */ TRUE,
-	/* hbool_t is_protected    = */ FALSE
+    /* hbool_t is_pinned       = */ TRUE,
+    /* hbool_t is_protected    = */ FALSE
       },
       {
         /* int     entry_type      = */ PICO_ENTRY_TYPE,
         /* int     entry_index     = */ 30,
-	/* hbool_t is_pinned       = */ FALSE,
-	/* hbool_t is_protected    = */ TRUE
+    /* hbool_t is_pinned       = */ FALSE,
+    /* hbool_t is_protected    = */ TRUE
       },
       {
         /* int     entry_type      = */ PICO_ENTRY_TYPE,
         /* int     entry_index     = */ 40,
-	/* hbool_t is_pinned       = */ TRUE,
-	/* hbool_t is_protected    = */ TRUE
+    /* hbool_t is_pinned       = */ TRUE,
+    /* hbool_t is_protected    = */ TRUE
       },
     };
 
@@ -13878,7 +13878,7 @@ check_move_entry(unsigned paged)
     while(pass && (u < NELMTS(test_specs)))
     {
         check_move_entry__run_test(file_ptr, u, &(test_specs[u]));
-	u++;
+    u++;
     }
 
     if(pass)
@@ -13896,13 +13896,13 @@ check_move_entry(unsigned paged)
     return (unsigned)!pass;
 } /* check_move_entry() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_move_entry__run_test()
  *
  * Purpose:     Run a move entry test.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
  * Return:      void
  *
@@ -13911,7 +13911,7 @@ check_move_entry(unsigned paged)
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -14080,15 +14080,15 @@ check_move_entry__run_test(H5F_t * file_ptr,
 
 } /* check_move_entry__run_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_pin_protected_entry()
+ * Function:    check_pin_protected_entry()
  *
- * Purpose:	Verify that H5C_pin_protected_entry behaves as expected.
+ * Purpose:    Verify that H5C_pin_protected_entry behaves as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/28/06
  *
  * Modifications:
@@ -14142,25 +14142,25 @@ check_pin_protected_entry(unsigned paged)
         base_addr = entries[0];
         entry_ptr = &(base_addr[0]);
 
-	result = H5C_pin_protected_entry((void *)entry_ptr);
+    result = H5C_pin_protected_entry((void *)entry_ptr);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_pin_protected_entry() reports failure.");
             failure_mssg = msg;
 
-	} else if(!(entry_ptr->header.is_pinned)) {
+    } else if(!(entry_ptr->header.is_pinned)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "entry not pinned when it should be.");
             failure_mssg = msg;
 
-	} else {
+    } else {
 
-	    entry_ptr->is_pinned = TRUE;
-	}
+        entry_ptr->is_pinned = TRUE;
+    }
     }
 
     unprotect_entry(file_ptr, 0, 0, H5C__UNPIN_ENTRY_FLAG);
@@ -14182,16 +14182,16 @@ check_pin_protected_entry(unsigned paged)
 
 } /* check_pin_protected_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_resize_entry()
+ * Function:    check_resize_entry()
  *
- * Purpose:	Verify that H5C_resize_entry() and H5C_unprotect() resize
- * 		entries as expected.
+ * Purpose:    Verify that H5C_resize_entry() and H5C_unprotect() resize
+ *         entries as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              7/7/06
  *
  *-------------------------------------------------------------------------
@@ -14202,12 +14202,12 @@ check_resize_entry(unsigned paged)
 {
     static char    msg[128];
     herr_t         result;
-    hbool_t	   in_cache;
-    hbool_t	   is_dirty;
-    hbool_t	   is_protected;
-    hbool_t	   is_pinned;
-    size_t	   entry_size;
-    size_t	   reported_entry_size;
+    hbool_t       in_cache;
+    hbool_t       is_dirty;
+    hbool_t       is_protected;
+    hbool_t       is_pinned;
+    size_t       entry_size;
+    size_t       reported_entry_size;
     H5F_t *        file_ptr = NULL;
     H5C_t *        cache_ptr = NULL;
     test_entry_t * base_addr;
@@ -14262,8 +14262,8 @@ check_resize_entry(unsigned paged)
             pass = FALSE;
             failure_mssg = "file_ptr NULL from setup_cache.";
 
-        } 
-        else  
+        }
+        else
         {
             cache_ptr = file_ptr->shared->cache;
 
@@ -14275,16 +14275,16 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 0) ||
-	     (cache_ptr->index_size != 0) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0)) {
+    if((cache_ptr->index_len != 0) ||
+        (cache_ptr->index_size != 0) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 1.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14295,48 +14295,48 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 1) ||
-	     (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0)) {
+    if((cache_ptr->index_len != 1) ||
+        (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0)) {
 
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 2.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 1.");
             failure_mssg = msg;
 
-	} else if(!in_cache || is_dirty || !is_protected || is_pinned) {
+    } else if(!in_cache || is_dirty || !is_protected || is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 1.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 1.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14374,48 +14374,48 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 1) ||
-	     (cache_ptr->index_size != (LARGE_ENTRY_SIZE / 2)) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != (LARGE_ENTRY_SIZE / 2))) {
+    if((cache_ptr->index_len != 1) ||
+        (cache_ptr->index_size != (LARGE_ENTRY_SIZE / 2)) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != (LARGE_ENTRY_SIZE / 2))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 3.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 2.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || is_pinned ||
-		    (reported_entry_size != (LARGE_ENTRY_SIZE / 2))) {
+    } else if(!in_cache || !is_dirty || is_protected || is_pinned ||
+            (reported_entry_size != (LARGE_ENTRY_SIZE / 2))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 2.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 2.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14459,48 +14459,48 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 1) ||
-	     (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
+    if((cache_ptr->index_len != 1) ||
+        (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 4.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 3.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || is_pinned ||
-		    (reported_entry_size != LARGE_ENTRY_SIZE)) {
+    } else if(!in_cache || !is_dirty || is_protected || is_pinned ||
+            (reported_entry_size != LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 3.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 3.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14515,120 +14515,120 @@ check_resize_entry(unsigned paged)
 
         result = H5C_resize_entry((void *)entry_ptr, (LARGE_ENTRY_SIZE / 4));
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
-		       "H5C_resize_entry() reports failure 1.");
+            "H5C_resize_entry() reports failure 1.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
-	if((cache_ptr->index_len != 1) ||
-	     (cache_ptr->index_size != (LARGE_ENTRY_SIZE / 4)) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != (LARGE_ENTRY_SIZE / 4))) {
+    if((cache_ptr->index_len != 1) ||
+        (cache_ptr->index_size != (LARGE_ENTRY_SIZE / 4)) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != (LARGE_ENTRY_SIZE / 4))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 5.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 4.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
-		    (reported_entry_size != (LARGE_ENTRY_SIZE / 4))) {
+    } else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
+            (reported_entry_size != (LARGE_ENTRY_SIZE / 4))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 4.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 4.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_resize_entry((void *)entry_ptr, LARGE_ENTRY_SIZE);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
-		       "H5C_resize_entry() reports failure 2.");
+            "H5C_resize_entry() reports failure 2.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
-	if((cache_ptr->index_len != 1) ||
-	     (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
+    if((cache_ptr->index_len != 1) ||
+        (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 6.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 5.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
-		    (reported_entry_size != LARGE_ENTRY_SIZE)) {
+    } else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
+            (reported_entry_size != LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 5.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 5.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14644,44 +14644,44 @@ check_resize_entry(unsigned paged)
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned, NULL, NULL, NULL, NULL);
+                    &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 6.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 6.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 6.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
-	if((cache_ptr->index_len != 0) ||
-	     (cache_ptr->index_size != 0) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0)) {
+    if((cache_ptr->index_len != 0) ||
+        (cache_ptr->index_size != 0) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 7.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
 
@@ -14689,19 +14689,19 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 0) ||
-	     (cache_ptr->index_size != 0) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0)) {
+    if((cache_ptr->index_len != 0) ||
+        (cache_ptr->index_size != 0) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 8.");
             failure_mssg = msg;
 
-	}
+    }
         base_addr = entries[LARGE_ENTRY_TYPE];
         entry_ptr = &(base_addr[3]);
-	entry_size = LARGE_ENTRY_SIZE;
+    entry_size = LARGE_ENTRY_SIZE;
     }
 
     if(pass) {
@@ -14719,17 +14719,17 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 3) ||
-	     (cache_ptr->index_size != 3 * LARGE_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
+    if((cache_ptr->index_len != 3) ||
+        (cache_ptr->index_size != 3 * LARGE_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
 
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 9.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14740,48 +14740,48 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 4) ||
-	     (cache_ptr->index_size != 4 * LARGE_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
+    if((cache_ptr->index_len != 4) ||
+        (cache_ptr->index_size != 4 * LARGE_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
 
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 10.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 7.");
             failure_mssg = msg;
 
-	} else if(!in_cache || is_dirty || !is_protected || is_pinned) {
+    } else if(!in_cache || is_dirty || !is_protected || is_pinned) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 7.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 7.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14819,50 +14819,50 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 4) ||
-	     (cache_ptr->index_size !=
-	       ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 2))) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size !=
-	       (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 2)))) {
+    if((cache_ptr->index_len != 4) ||
+        (cache_ptr->index_size !=
+        ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 2))) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size !=
+        (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 2)))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 11.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 8.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || is_pinned ||
-		    (reported_entry_size != (LARGE_ENTRY_SIZE / 2))) {
+    } else if(!in_cache || !is_dirty || is_protected || is_pinned ||
+            (reported_entry_size != (LARGE_ENTRY_SIZE / 2))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 8.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 8.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14906,48 +14906,48 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 4) ||
-	     (cache_ptr->index_size != 4 * LARGE_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size != 2 * LARGE_ENTRY_SIZE)) {
+    if((cache_ptr->index_len != 4) ||
+        (cache_ptr->index_size != 4 * LARGE_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size != 2 * LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 12.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 9.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || is_pinned ||
-		    (reported_entry_size != LARGE_ENTRY_SIZE)) {
+    } else if(!in_cache || !is_dirty || is_protected || is_pinned ||
+            (reported_entry_size != LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 9.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 9.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -14962,129 +14962,129 @@ check_resize_entry(unsigned paged)
 
         result = H5C_resize_entry((void *)entry_ptr, (LARGE_ENTRY_SIZE / 4));
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
-		       "H5C_resize_entry() reports failure 3.");
+            "H5C_resize_entry() reports failure 3.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
-	if((cache_ptr->index_len != 4) ||
-	     (cache_ptr->index_size !=
-	       ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 4))) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size !=
-	       (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 4)))) {
+    if((cache_ptr->index_len != 4) ||
+        (cache_ptr->index_size !=
+        ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 4))) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size !=
+        (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 4)))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 13.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 10.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
-		    (reported_entry_size != (LARGE_ENTRY_SIZE / 4))) {
+    } else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
+            (reported_entry_size != (LARGE_ENTRY_SIZE / 4))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 10.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 10.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_resize_entry((void *)entry_ptr, LARGE_ENTRY_SIZE);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
-		       "H5C_resize_entry() reports failure 4.");
+            "H5C_resize_entry() reports failure 4.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
-	if((cache_ptr->index_len != 4) ||
-	     (cache_ptr->index_size != (4 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size != (2 * LARGE_ENTRY_SIZE))) {
+    if((cache_ptr->index_len != 4) ||
+        (cache_ptr->index_size != (4 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size != (2 * LARGE_ENTRY_SIZE))) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 14.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned,
+                        &reported_entry_size, &in_cache,
+                    &is_dirty, &is_protected, &is_pinned,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 11.");
             failure_mssg = msg;
 
-	} else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
-		    (reported_entry_size != LARGE_ENTRY_SIZE)) {
+    } else if(!in_cache || !is_dirty || is_protected || !is_pinned ||
+            (reported_entry_size != LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 11.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 11.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
         protect_entry(file_ptr, LARGE_ENTRY_TYPE, 3);
 
-        unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 3, 
+        unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 3,
                         H5C__UNPIN_ENTRY_FLAG | H5C__DELETED_FLAG);
 
     }
@@ -15093,44 +15093,44 @@ check_resize_entry(unsigned paged)
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned, NULL, NULL, NULL, NULL);
+                    &is_pinned, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 12.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 12.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 12.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
 
-	if((cache_ptr->index_len != 3) ||
-	     (cache_ptr->index_size != (3 * LARGE_ENTRY_SIZE)) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
+    if((cache_ptr->index_len != 3) ||
+        (cache_ptr->index_size != (3 * LARGE_ENTRY_SIZE)) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != LARGE_ENTRY_SIZE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 15.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -15148,16 +15148,16 @@ check_resize_entry(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 0) ||
-	     (cache_ptr->index_size != 0) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0)) {
+    if((cache_ptr->index_len != 0) ||
+        (cache_ptr->index_size != 0) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 16.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(pass) {
@@ -15177,16 +15177,16 @@ check_resize_entry(unsigned paged)
 
 } /* check_resize_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_evictions_enabled()
+ * Function:    check_evictions_enabled()
  *
- * Purpose:	Verify that H5C_get_evictions_enabled() and
- * 		H5C_set_evictions_enabled() functions perform as expected.
+ * Purpose:    Verify that H5C_get_evictions_enabled() and
+ *         H5C_set_evictions_enabled() functions perform as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              8/2/07
  *
  * Modifications:
@@ -15200,11 +15200,11 @@ check_evictions_enabled(unsigned paged)
 {
     static char    msg[128];
     herr_t         result;
-    hbool_t	   show_progress = FALSE;
-    hbool_t	   evictions_enabled;
-    hbool_t	   in_cache;
-    int 	   i;
-    int		   mile_stone = 1;
+    hbool_t       show_progress = FALSE;
+    hbool_t       evictions_enabled;
+    hbool_t       in_cache;
+    int        i;
+    int           mile_stone = 1;
     H5F_t *        file_ptr = NULL;
     H5C_t *        cache_ptr = NULL;
     test_entry_t * base_addr = NULL;
@@ -15268,8 +15268,8 @@ check_evictions_enabled(unsigned paged)
             pass = FALSE;
             failure_mssg = "file_ptr NULL from setup_cache.";
 
-        } 
-        else  
+        }
+        else
         {
             cache_ptr = file_ptr->shared->cache;
 
@@ -15284,17 +15284,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that it is empty */
     if(pass) {
 
-	if((cache_ptr->index_len != 0) ||
-	     (cache_ptr->index_size != 0) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0) ||
-	     (cache_ptr->evictions_enabled != TRUE)) {
+    if((cache_ptr->index_len != 0) ||
+        (cache_ptr->index_size != 0) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0) ||
+        (cache_ptr->evictions_enabled != TRUE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 1.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 3 */
@@ -15306,12 +15306,12 @@ check_evictions_enabled(unsigned paged)
 
         result = H5C_get_evictions_enabled(cache_ptr, &evictions_enabled);
 
-	if((result != SUCCEED) || (evictions_enabled != TRUE)) {
+    if((result != SUCCEED) || (evictions_enabled != TRUE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected evictions enabled 1.");
             failure_mssg = msg;
-	}
+    }
     }
 
     if(show_progress) /* 4 */
@@ -15336,18 +15336,18 @@ check_evictions_enabled(unsigned paged)
     /* verify that the cache is full */
     if(pass) {
 
-	if((cache_ptr->index_len != 16) ||
-	     (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0) ||
-	     (cache_ptr->evictions_enabled != TRUE)) {
+    if((cache_ptr->index_len != 16) ||
+        (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0) ||
+        (cache_ptr->evictions_enabled != TRUE)) {
 
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 2.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 6 */
@@ -15369,17 +15369,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that an entry has been evicted */
     if(pass) {
 
-	if((cache_ptr->index_len != 16) ||
-	     (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 0) ||
-	     (cache_ptr->slist_size != 0) ||
-	     (cache_ptr->evictions_enabled != TRUE)) {
+    if((cache_ptr->index_len != 16) ||
+        (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 0) ||
+        (cache_ptr->slist_size != 0) ||
+        (cache_ptr->evictions_enabled != TRUE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 3.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 8 */
@@ -15391,31 +15391,31 @@ check_evictions_enabled(unsigned paged)
         entry_ptr = &(base_addr[0]);
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL,
+                        NULL, &in_cache, NULL, NULL, NULL,
                                       NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 1.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 1.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 1.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 9 */
@@ -15436,17 +15436,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that another entry has been evicted */
     if(pass) {
 
-	if((cache_ptr->index_len != 16) ||
-	     (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != TRUE)) {
+    if((cache_ptr->index_len != 16) ||
+        (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != TRUE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 4.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 11 */
@@ -15458,30 +15458,30 @@ check_evictions_enabled(unsigned paged)
         entry_ptr = &(base_addr[1]);
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                        NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 2.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 2.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 2.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 12 */
@@ -15493,12 +15493,12 @@ check_evictions_enabled(unsigned paged)
 
         result = H5C_set_evictions_enabled(cache_ptr, FALSE);
 
-	if(result != SUCCEED) {
+    if(result != SUCCEED) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "can't disable evictions 1.");
             failure_mssg = msg;
-	}
+    }
     }
 
     if(show_progress) /* 13 */
@@ -15508,17 +15508,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that evictions are disabled */
     if(pass) {
 
-	if((cache_ptr->index_len != 16) ||
-	     (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != FALSE)) {
+    if((cache_ptr->index_len != 16) ||
+        (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != FALSE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 5.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 14 */
@@ -15540,17 +15540,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that no entry has been evicted */
     if(pass) {
 
-	if((cache_ptr->index_len != 17) ||
-	     (cache_ptr->index_size != 17 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 1) ||
-	     (cache_ptr->slist_size != MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != FALSE)) {
+    if((cache_ptr->index_len != 17) ||
+        (cache_ptr->index_size != 17 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 1) ||
+        (cache_ptr->slist_size != MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != FALSE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 6.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 16 */
@@ -15571,17 +15571,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that no entry has been evicted */
     if(pass) {
 
-	if((cache_ptr->index_len != 18) ||
-	     (cache_ptr->index_size != 18 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != FALSE)) {
+    if((cache_ptr->index_len != 18) ||
+        (cache_ptr->index_size != 18 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != FALSE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 7.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 18 */
@@ -15593,12 +15593,12 @@ check_evictions_enabled(unsigned paged)
 
         result = H5C_set_evictions_enabled(cache_ptr, TRUE);
 
-	if(result != SUCCEED) {
+    if(result != SUCCEED) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "can't enable evictions 1.");
             failure_mssg = msg;
-	}
+    }
     }
 
     if(show_progress) /* 19 */
@@ -15620,17 +15620,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that no entries have been evicted */
     if(pass) {
 
-	if((cache_ptr->index_len != 18) ||
-	     (cache_ptr->index_size != 18 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != TRUE)) {
+    if((cache_ptr->index_len != 18) ||
+        (cache_ptr->index_size != 18 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != TRUE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 8.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 21 */
@@ -15655,17 +15655,17 @@ check_evictions_enabled(unsigned paged)
 
     if(pass) {
 
-	if((cache_ptr->index_len != 16) ||
-	     (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != TRUE)) {
+    if((cache_ptr->index_len != 16) ||
+        (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != TRUE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 9.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 23 */
@@ -15677,30 +15677,30 @@ check_evictions_enabled(unsigned paged)
         entry_ptr = &(base_addr[2]);
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                        NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 3.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 3.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 3.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 24 */
@@ -15712,30 +15712,30 @@ check_evictions_enabled(unsigned paged)
         entry_ptr = &(base_addr[3]);
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                        NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 4.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 4.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    (entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            (entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 4.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 25 */
@@ -15747,12 +15747,12 @@ check_evictions_enabled(unsigned paged)
 
         result = H5C_set_evictions_enabled(cache_ptr, FALSE);
 
-	if(result != SUCCEED) {
+    if(result != SUCCEED) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "can't disable evictions 2.");
             failure_mssg = msg;
-	}
+    }
     }
 
     if(show_progress) /* 26 */
@@ -15776,17 +15776,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that the cache has grown */
     if(pass) {
 
-	if((cache_ptr->index_len != 17) ||
-	     (cache_ptr->index_size != 17 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 2) ||
-	     (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != FALSE)) {
+    if((cache_ptr->index_len != 17) ||
+        (cache_ptr->index_size != 17 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 2) ||
+        (cache_ptr->slist_size != 2 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != FALSE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 10.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 28 */
@@ -15798,12 +15798,12 @@ check_evictions_enabled(unsigned paged)
 
         result = H5C_set_evictions_enabled(cache_ptr, TRUE);
 
-	if(result != SUCCEED) {
+    if(result != SUCCEED) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "can't enable evictions 2.");
             failure_mssg = msg;
-	}
+    }
     }
 
     if(show_progress) /* 29 */
@@ -15824,17 +15824,17 @@ check_evictions_enabled(unsigned paged)
     /* verify that the cache has returned to its maximum size */
     if(pass) {
 
-	if((cache_ptr->index_len != 16) ||
-	     (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->slist_len != 3) ||
-	     (cache_ptr->slist_size != 3 * MONSTER_ENTRY_SIZE) ||
-	     (cache_ptr->evictions_enabled != TRUE)) {
+    if((cache_ptr->index_len != 16) ||
+        (cache_ptr->index_size != 16 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->slist_len != 3) ||
+        (cache_ptr->slist_size != 3 * MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->evictions_enabled != TRUE)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected cache status 11.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 31 */
@@ -15846,30 +15846,30 @@ check_evictions_enabled(unsigned paged)
         entry_ptr = &(base_addr[4]);
 
         result = H5C_get_entry_status(file_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                        NULL, &in_cache, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-	if(result < 0) {
+    if(result < 0) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                        "H5C_get_entry_status() reports failure 5.");
             failure_mssg = msg;
 
-	} else if(in_cache) {
+    } else if(in_cache) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected status 5.");
             failure_mssg = msg;
 
         } else if((!entry_ptr->deserialized) ||
-		    ( entry_ptr->serialized) ||
-		    (!entry_ptr->destroyed)) {
+            ( entry_ptr->serialized) ||
+            (!entry_ptr->destroyed)) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "Unexpected entry history 5.");
             failure_mssg = msg;
 
-	}
+    }
     }
 
     if(show_progress) /* 32 */
@@ -15881,12 +15881,12 @@ check_evictions_enabled(unsigned paged)
 
         result = H5C_set_evictions_enabled(cache_ptr, FALSE);
 
-	if(result != SUCCEED) {
+    if(result != SUCCEED) {
 
             pass = FALSE;
             HDsnprintf(msg, (size_t)128, "can't disable evictions 3.");
             failure_mssg = msg;
-	}
+    }
     }
 
     if(show_progress) /* 33 */
@@ -15914,16 +15914,16 @@ check_evictions_enabled(unsigned paged)
 
 } /* check_evictions_enabled() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_protected_err()
+ * Function:    check_flush_protected_err()
  *
- * Purpose:	Verify that an attempt to flush the cache when it contains
- *		a protected entry will generate an error.
+ * Purpose:    Verify that an attempt to flush the cache when it contains
+ *        a protected entry will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  * Modifications:
@@ -15989,17 +15989,17 @@ check_flush_protected_err(unsigned paged)
 
 } /* check_flush_protected_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_destroy_pinned_err()
+ * Function:    check_destroy_pinned_err()
  *
- * Purpose:	Verify that an attempt to destroy the cache when it contains
- *		a pinned entry that can't be unpined during the flush destroy
- *		will generate an error.
+ * Purpose:    Verify that an attempt to destroy the cache when it contains
+ *        a pinned entry that can't be unpined during the flush destroy
+ *        will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/7/06
  *
  * Modifications:
@@ -16030,7 +16030,7 @@ check_destroy_pinned_err(unsigned paged)
         file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
 
         protect_entry(file_ptr, 0, 0);
-	unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
+    unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
 
         if(H5C_prep_for_file_close(file_ptr) < 0) {
             pass = FALSE;
@@ -16041,8 +16041,8 @@ check_destroy_pinned_err(unsigned paged)
             pass = FALSE;
             failure_mssg = "destroy succeeded on cache with pinned entry.\n";
         } /* end if */
-	else {
-	    unpin_entry(0, 0);
+    else {
+        unpin_entry(0, 0);
 
             if(H5C_dest(file_ptr) < 0) {
                 pass = FALSE;
@@ -16057,11 +16057,11 @@ check_destroy_pinned_err(unsigned paged)
             saved_cache = NULL;
         } /* end if */
 
-	/* call takedown_cache() with a NULL file_ptr parameter.
-	 * This causes the function to close and delete the file,
-	 * while skipping the call to H5C_dest().
-	 */
-	takedown_cache(NULL, FALSE, FALSE);
+    /* call takedown_cache() with a NULL file_ptr parameter.
+    * This causes the function to close and delete the file,
+    * while skipping the call to H5C_dest().
+    */
+    takedown_cache(NULL, FALSE, FALSE);
     } /* end if */
 
     if(pass) { PASSED(); } else { H5_FAILED(); }
@@ -16073,16 +16073,16 @@ check_destroy_pinned_err(unsigned paged)
 
 } /* check_destroy_pinned_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_destroy_protected_err()
+ * Function:    check_destroy_protected_err()
  *
- * Purpose:	Verify that an attempt to destroy the cache when it contains
- *		a protected entry will generate an error.
+ * Purpose:    Verify that an attempt to destroy the cache when it contains
+ *        a protected entry will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  * Modifications:
@@ -16133,27 +16133,27 @@ check_destroy_protected_err(unsigned paged)
             pass = FALSE;
             failure_mssg = "destroy succeeded on cache with protected entry.\n";
         } /* end if */
-	else {
+    else {
             unprotect_entry(file_ptr, 0, 0, H5C__DIRTIED_FLAG);
             if(H5C_dest(file_ptr) < 0) {
                 pass = FALSE;
                 failure_mssg = "destroy failed after unprotect.\n";
             } /* end if */
-	    else {
+        else {
                 file_ptr->shared->cache = NULL;
-	    } /* end else */
-	} /* end else */
+        } /* end else */
+    } /* end else */
 
         if(saved_cache != NULL) {
             file_ptr->shared->cache = saved_cache;
             saved_cache = NULL;
         } /* end if */
 
-	/* call takedown_cache() with a NULL file_ptr parameter.
-	 * This causes the function to close and delete the file,
-	 * while skipping the call to H5C_dest().
-	 */
-	takedown_cache(NULL, FALSE, FALSE);
+    /* call takedown_cache() with a NULL file_ptr parameter.
+    * This causes the function to close and delete the file,
+    * while skipping the call to H5C_dest().
+    */
+    takedown_cache(NULL, FALSE, FALSE);
     } /* end if */
 
     if(pass) { PASSED(); } else { H5_FAILED(); }
@@ -16165,16 +16165,16 @@ check_destroy_protected_err(unsigned paged)
 
 } /* check_destroy_protected_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_duplicate_insert_err()
+ * Function:    check_duplicate_insert_err()
  *
- * Purpose:	Verify that an attempt to insert and entry that is
- *		alread in the cache will generate an error.
+ * Purpose:    Verify that an attempt to insert and entry that is
+ *        alread in the cache will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  * Modifications:
@@ -16245,21 +16245,21 @@ check_duplicate_insert_err(unsigned paged)
 
 } /* check_duplicate_insert_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_double_pin_err()
+ * Function:    check_double_pin_err()
  *
- * Purpose:	Verify that an attempt to pin an entry that is already
- *		pinned will generate an error.
+ * Purpose:    Verify that an attempt to pin an entry that is already
+ *        pinned will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/24/06
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -16312,8 +16312,8 @@ check_double_pin_err(unsigned paged)
 
         } else {
 
-	    unprotect_entry(file_ptr, 0, 0, H5C__UNPIN_ENTRY_FLAG);
-	}
+        unprotect_entry(file_ptr, 0, 0, H5C__UNPIN_ENTRY_FLAG);
+    }
     }
 
     if(pass) {
@@ -16333,21 +16333,21 @@ check_double_pin_err(unsigned paged)
 
 } /* check_double_pin_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_double_unpin_err()
+ * Function:    check_double_unpin_err()
  *
- * Purpose:	Verify that an attempt to unpin an unpinned entry will
- * 		generate an error.
+ * Purpose:    Verify that an attempt to unpin an unpinned entry will
+ *         generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/24/06
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -16398,13 +16398,13 @@ check_double_unpin_err(unsigned paged)
 
         } else {
 
-	    unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
-	}
+        unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
+    }
     }
 
     if(pass) {
 
-	result =  H5C_unpin_entry((void *)entry_ptr);
+    result =  H5C_unpin_entry((void *)entry_ptr);
 
         if(result > 0) {
 
@@ -16432,21 +16432,21 @@ check_double_unpin_err(unsigned paged)
 
 } /* check_double_unpin_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_pin_entry_errs()
+ * Function:    check_pin_entry_errs()
  *
- * Purpose:	Verify that invalid calls to H5C_pin_protected_entry()
- * 		generate errors as expected.
+ * Purpose:    Verify that invalid calls to H5C_pin_protected_entry()
+ *         generate errors as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/24/06
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -16485,7 +16485,7 @@ check_pin_entry_errs(unsigned paged)
 
         protect_entry(file_ptr, 0, 0);
 
-	unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
+    unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
         entry_ptr = &((entries[0])[0]);
     }
@@ -16504,10 +16504,10 @@ check_pin_entry_errs(unsigned paged)
 
             protect_entry(file_ptr, 0, 0);
 
-	    unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
+        unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
 
             protect_entry(file_ptr, 0, 0);
-	}
+    }
     }
 
     if(pass) {
@@ -16522,9 +16522,9 @@ check_pin_entry_errs(unsigned paged)
 
         } else {
 
-	    unprotect_entry(file_ptr, 0, 0, H5C__UNPIN_ENTRY_FLAG);
+        unprotect_entry(file_ptr, 0, 0, H5C__UNPIN_ENTRY_FLAG);
 
-	}
+    }
     }
 
     if(pass) {
@@ -16544,16 +16544,16 @@ check_pin_entry_errs(unsigned paged)
 
 } /* check_pin_entry_errs() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_double_protect_err()
+ * Function:    check_double_protect_err()
  *
- * Purpose:	Verify that an attempt to protect an entry that is already
- *		protected will generate an error.
+ * Purpose:    Verify that an attempt to protect an entry that is already
+ *        protected will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  *-------------------------------------------------------------------------
@@ -16592,8 +16592,8 @@ check_double_protect_err(unsigned paged)
     if(pass) {
 
         cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
-			               types[0], entry_ptr->addr,
-				       &entry_ptr->addr, H5C__NO_FLAGS_SET);
+                        types[0], entry_ptr->addr,
+                    &entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(cache_entry_ptr != NULL) {
 
@@ -16624,16 +16624,16 @@ check_double_protect_err(unsigned paged)
 
 } /* check_double_protect_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_double_unprotect_err()
+ * Function:    check_double_unprotect_err()
  *
- * Purpose:	Verify that an attempt to unprotect an entry that is already
- *		unprotected will generate an error.
+ * Purpose:    Verify that an attempt to unprotect an entry that is already
+ *        unprotected will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/24/04
  *
  *-------------------------------------------------------------------------
@@ -16701,19 +16701,19 @@ check_double_unprotect_err(unsigned paged)
 
 } /* check_double_unprotect_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_mark_entry_dirty_errs()
+ * Function:    check_mark_entry_dirty_errs()
  *
- * Purpose:	Verify that:
+ * Purpose:    Verify that:
  *
- *		1) a call to H5C_mark_entry_dirty with
- *		   and unpinned and unprotected entry will generate an
- *		   error.
+ *        1) a call to H5C_mark_entry_dirty with
+ *           and unpinned and unprotected entry will generate an
+ *           error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              5/17/06
  *
  *-------------------------------------------------------------------------
@@ -16747,14 +16747,14 @@ check_mark_entry_dirty_errs(unsigned paged)
 
         protect_entry(file_ptr, 0, 0);
 
-	unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
+    unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
         entry_ptr = &((entries[0])[0]);
     }
 
     if(pass) {
 
-	result = H5C_mark_entry_dirty((void *)entry_ptr);
+    result = H5C_mark_entry_dirty((void *)entry_ptr);
 
 
         if(result > 0) {
@@ -16782,21 +16782,21 @@ check_mark_entry_dirty_errs(unsigned paged)
 
 } /* check_mark_entry_dirty_errs() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_expunge_entry_errs()
+ * Function:    check_expunge_entry_errs()
  *
- * Purpose:	Verify that invalid calls to H5C_expunge_entry()
- * 		generate errors as expected.
+ * Purpose:    Verify that invalid calls to H5C_expunge_entry()
+ *         generate errors as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              7/6/06
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -16841,7 +16841,7 @@ check_expunge_entry_errs(unsigned paged)
 
     if(pass) {
 
-	result = H5C_expunge_entry(file_ptr,
+    result = H5C_expunge_entry(file_ptr,
                 types[0], entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(result > 0) {
@@ -16852,14 +16852,14 @@ check_expunge_entry_errs(unsigned paged)
 
         } else {
 
-	    unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
+        unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
 
-	}
+    }
     }
 
     if(pass) {
 
-	result = H5C_expunge_entry(file_ptr,
+    result = H5C_expunge_entry(file_ptr,
                 types[0], entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(result > 0) {
@@ -16870,14 +16870,14 @@ check_expunge_entry_errs(unsigned paged)
 
         } else {
 
-	    unpin_entry(0, 0);
+        unpin_entry(0, 0);
 
-	}
+    }
     }
 
     if(pass) {
 
-	result = H5C_expunge_entry(file_ptr,
+    result = H5C_expunge_entry(file_ptr,
                 types[0], entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(result < 0) {
@@ -16886,7 +16886,7 @@ check_expunge_entry_errs(unsigned paged)
             failure_mssg =
               "attempt to expunge an unpinned and unprotected entry failed.\n";
 
-	}
+    }
     }
 
 
@@ -16907,16 +16907,16 @@ check_expunge_entry_errs(unsigned paged)
 
 } /* check_expunge_entry_errs() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_move_entry_errs()
+ * Function:    check_move_entry_errs()
  *
- * Purpose:	Verify that invalid calls to H5C_move_entry()
- * 		generates errors as expected.
+ * Purpose:    Verify that invalid calls to H5C_move_entry()
+ *         generates errors as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              12/10/16
  *
  *-------------------------------------------------------------------------
@@ -17000,7 +17000,7 @@ check_move_entry_errs(unsigned paged)
     } /* end if */
 
     if(pass) {
-	result = H5C_move_entry(cache_ptr, types[0], entry_ptr->header.addr, entry_ptr->header.addr + 10);
+    result = H5C_move_entry(cache_ptr, types[0], entry_ptr->header.addr, entry_ptr->header.addr + 10);
 
         if(result >= 0) {
             pass = FALSE;
@@ -17024,16 +17024,16 @@ check_move_entry_errs(unsigned paged)
     return (unsigned)!pass;
 } /* check_move_entry_errs() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_resize_entry_errs()
+ * Function:    check_resize_entry_errs()
  *
- * Purpose:	Verify that invalid calls to H5C_resize_entry()
- * 		generates errors as expected.
+ * Purpose:    Verify that invalid calls to H5C_resize_entry()
+ *         generates errors as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              7/7/06
  *
  *-------------------------------------------------------------------------
@@ -17078,7 +17078,7 @@ check_resize_entry_errs(unsigned paged)
 
     if(pass) {
 
-	result = H5C_resize_entry((void *)entry_ptr, (size_t)1);
+    result = H5C_resize_entry((void *)entry_ptr, (size_t)1);
 
         if(result < 0) {
 
@@ -17088,14 +17088,14 @@ check_resize_entry_errs(unsigned paged)
 
         } else {
 
-	    unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
+        unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
 
-	}
+    }
     }
 
     if(pass) {
 
-	result = H5C_resize_entry((void *)entry_ptr, (size_t)0);
+    result = H5C_resize_entry((void *)entry_ptr, (size_t)0);
 
         if(result >= 0) {
 
@@ -17105,9 +17105,9 @@ check_resize_entry_errs(unsigned paged)
 
         } else {
 
-	    unpin_entry(0, 0);
+        unpin_entry(0, 0);
 
-	}
+    }
     }
 
     if(pass) {
@@ -17127,16 +17127,16 @@ check_resize_entry_errs(unsigned paged)
 
 } /* check_resize_entry_errs() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_unprotect_ro_dirty_err()
+ * Function:    check_unprotect_ro_dirty_err()
  *
- * Purpose:	If an entry is protected read only, verify that unprotecting
- * 		it dirty will generate an error.
+ * Purpose:    If an entry is protected read only, verify that unprotecting
+ *         it dirty will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/3/07
  *
  *-------------------------------------------------------------------------
@@ -17187,7 +17187,7 @@ check_unprotect_ro_dirty_err(unsigned paged)
 
     if(pass) {
 
-	unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
+    unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
     }
 
@@ -17229,8 +17229,8 @@ check_unprotect_ro_dirty_err(unsigned paged)
 
     if(pass) {
 
-	unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
-	unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
+    unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
+    unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
 
     }
 
@@ -17251,21 +17251,21 @@ check_unprotect_ro_dirty_err(unsigned paged)
 
 } /* check_unprotect_ro_dirty_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_protect_ro_rw_err()
+ * Function:    check_protect_ro_rw_err()
  *
- * Purpose:	If an entry is protected read only, verify that protecting
- * 		it rw will generate an error.
+ * Purpose:    If an entry is protected read only, verify that protecting
+ *         it rw will generate an error.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/9/07
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -17304,8 +17304,8 @@ check_protect_ro_rw_err(unsigned paged)
     if(pass) {
 
         thing_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
-			         types[0], entry_ptr->addr,
-				 &entry_ptr->addr, H5C__NO_FLAGS_SET);
+                    types[0], entry_ptr->addr,
+                &entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(thing_ptr != NULL) {
 
@@ -17316,7 +17316,7 @@ check_protect_ro_rw_err(unsigned paged)
 
     if(pass) {
 
-	unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
+    unprotect_entry(file_ptr, 0, 0, H5C__NO_FLAGS_SET);
     }
 
     if(pass) {
@@ -17336,16 +17336,16 @@ check_protect_ro_rw_err(unsigned paged)
 
 } /* check_protect_ro_rw_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_protect_retries()
+ * Function:    check_protect_retries()
  *
- * Purpose:	To exercise checksum verification retries for an entry with
- *		a speculative load.
+ * Purpose:    To exercise checksum verification retries for an entry with
+ *        a speculative load.
  *
- * Return:	
+ * Return:
  *
- * Programmer:	
+ * Programmer:
  *
  *-------------------------------------------------------------------------
  */
@@ -17374,8 +17374,8 @@ check_protect_retries(unsigned paged)
 
         file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
 
-	/* Set up read attempts for verifying checksum */
-	file_ptr->shared->read_attempts = 10;
+    /* Set up read attempts for verifying checksum */
+    file_ptr->shared->read_attempts = 10;
         file_ptr->shared->retries_nbins = 1;
     }
 
@@ -17385,30 +17385,30 @@ check_protect_retries(unsigned paged)
 
     if(pass) {
 
-	cache_ptr = file_ptr->shared->cache;
-	base_addr = entries[type];
+    cache_ptr = file_ptr->shared->cache;
+    base_addr = entries[type];
         entry_ptr = &(base_addr[idx]);
 
-	/* test case (1):
-	 * 	--actual_len is smaller the initial length from get_load_size()
-	 *	--verify_chksum() returns TRUE after max_verify_ct is reached
-	 *
-	 */
-	entry_ptr->actual_len = entry_ptr->size/2;
+    /* test case (1):
+    *     --actual_len is smaller the initial length from get_load_size()
+    *    --verify_chksum() returns TRUE after max_verify_ct is reached
+    *
+    */
+    entry_ptr->actual_len = entry_ptr->size/2;
         entry_ptr->max_verify_ct = 3;
         entry_ptr->verify_ct = 0;
 
-	cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
+    cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
                 types[type], entry_ptr->addr, &entry_ptr->addr, H5C__READ_ONLY_FLAG);
 
-	if((cache_entry_ptr != (void *)entry_ptr) ||
+    if((cache_entry_ptr != (void *)entry_ptr) ||
              (!(entry_ptr->header.is_protected)) ||
              (!(entry_ptr->header.is_read_only)) ||
              (entry_ptr->header.ro_ref_count <= 0) ||
              (entry_ptr->header.type != types[type]) ||
              (entry_ptr->size != entry_ptr->header.size) ||
              (entry_ptr->addr != entry_ptr->header.addr) ||
-	     (entry_ptr->verify_ct != entry_ptr->max_verify_ct))  {
+        (entry_ptr->verify_ct != entry_ptr->max_verify_ct))  {
 
             pass = FALSE;
             failure_mssg = "error from H5C_protect().";
@@ -17429,26 +17429,26 @@ check_protect_retries(unsigned paged)
     }
 
     if(pass)
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, idx, H5C__NO_FLAGS_SET);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, idx, H5C__NO_FLAGS_SET);
 
     if(pass) {
         entry_ptr = &(base_addr[++idx]);
 
-	/* test case (2):
-	 * 	--actual_len is greater the initial length from get_load_size()
-	 *	--verify_chksum() returns FALSE even after all tries is reached
- 	 * 	  (file_ptr->shared->read_attempts is smaller then max_verify_ct)
-	 */
-	entry_ptr->actual_len = entry_ptr->size*2;
+    /* test case (2):
+    *     --actual_len is greater the initial length from get_load_size()
+    *    --verify_chksum() returns FALSE even after all tries is reached
+    *       (file_ptr->shared->read_attempts is smaller then max_verify_ct)
+    */
+    entry_ptr->actual_len = entry_ptr->size*2;
         entry_ptr->max_verify_ct = 11;
         entry_ptr->verify_ct = 0;
 
-	cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
+    cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
                 types[type], entry_ptr->addr, &entry_ptr->addr, H5C__READ_ONLY_FLAG);
 
-	/* H5C_protect() should fail after all retries fail */
-	if(cache_entry_ptr != NULL)
-	    pass = FALSE;
+    /* H5C_protect() should fail after all retries fail */
+    if(cache_entry_ptr != NULL)
+        pass = FALSE;
     }
 
 
@@ -17467,21 +17467,21 @@ check_protect_retries(unsigned paged)
 
 } /* check_protect_retries() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_evictions_enabled_err()
+ * Function:    check_evictions_enabled_err()
  *
- * Purpose:	Verify that H5C_get_evictions_enabled() and
+ * Purpose:    Verify that H5C_get_evictions_enabled() and
  *              H5C_set_evictions_enabled() generate errors as expected.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              8/3/07
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -17524,9 +17524,9 @@ check_check_evictions_enabled_err(unsigned paged)
 
     if(pass) {
 
-	result = H5C_get_evictions_enabled(NULL, &evictions_enabled);
+    result = H5C_get_evictions_enabled(NULL, &evictions_enabled);
 
-	if(result == SUCCEED) {
+    if(result == SUCCEED) {
 
             pass = FALSE;
             failure_mssg = "H5C_get_evictions_enabled succeeded() 1.\n";
@@ -17535,9 +17535,9 @@ check_check_evictions_enabled_err(unsigned paged)
 
     if(pass) {
 
-	result = H5C_get_evictions_enabled(cache_ptr, NULL);
+    result = H5C_get_evictions_enabled(cache_ptr, NULL);
 
-	if(result == SUCCEED) {
+    if(result == SUCCEED) {
 
             pass = FALSE;
             failure_mssg = "H5C_get_evictions_enabled succeeded() 2.\n";
@@ -17546,30 +17546,30 @@ check_check_evictions_enabled_err(unsigned paged)
 
     if(pass) {
 
-	result = H5C_set_evictions_enabled(cache_ptr, TRUE);
+    result = H5C_set_evictions_enabled(cache_ptr, TRUE);
 
-	if(result != SUCCEED) {
+    if(result != SUCCEED) {
 
             pass = FALSE;
             failure_mssg = "H5C_set_evictions_enabled failed().\n";
 
-	}
+    }
     }
 
     if(pass) {
 
         (cache_ptr->resize_ctl).incr_mode = H5C_incr__threshold;
 
-	result = H5C_get_evictions_enabled(cache_ptr, FALSE);
+    result = H5C_get_evictions_enabled(cache_ptr, FALSE);
 
-	if(result == SUCCEED) {
+    if(result == SUCCEED) {
 
             pass = FALSE;
             failure_mssg = "H5C_get_evictions_enabled succeeded() 1.\n";
 
         } else if(cache_ptr->evictions_enabled == TRUE) {
 
-	}
+    }
 
         (cache_ptr->resize_ctl).incr_mode = H5C_incr__off;
     }
@@ -17578,9 +17578,9 @@ check_check_evictions_enabled_err(unsigned paged)
 
         (cache_ptr->resize_ctl).decr_mode = H5C_decr__threshold;
 
-	result = H5C_get_evictions_enabled(cache_ptr, FALSE);
+    result = H5C_get_evictions_enabled(cache_ptr, FALSE);
 
-	if(result == SUCCEED) {
+    if(result == SUCCEED) {
 
             pass = FALSE;
             failure_mssg = "H5C_get_evictions_enabled succeeded() 2.\n";
@@ -17607,18 +17607,18 @@ check_check_evictions_enabled_err(unsigned paged)
 
 } /* check_evictions_enabled_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_auto_cache_resize()
+ * Function:    check_auto_cache_resize()
  *
- * Purpose:	Exercise the automatic cache resizing functionality.
- *		The objective is to operate the auto-resize code in
- *		all possible modes.  Unfortunately, there are quite
- *		a few of them.
+ * Purpose:    Exercise the automatic cache resizing functionality.
+ *        The objective is to operate the auto-resize code in
+ *        all possible modes.  Unfortunately, there are quite
+ *        a few of them.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/29/04
  *
  *-------------------------------------------------------------------------
@@ -17675,9 +17675,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
@@ -18045,9 +18045,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1000 * 1000);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
 
@@ -18333,7 +18333,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
                 unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET);
             i++;
         }
-      
+
 
         if((!rpt_fcn_called) ||
              (rpt_status != decrease) ||
@@ -18377,9 +18377,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = FALSE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
 
@@ -18558,9 +18558,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -18598,7 +18598,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
 
     if(cork_ageout)
-	cork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE);
+    cork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE);
 
     /* fill the cache with 1024 byte entries -- nothing should happen
      * for three epochs while the markers are inserted into the cache
@@ -18908,7 +18908,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     if(cork_ageout)
-	uncork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE);
+    uncork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE);
 
 
     /* repeat the above test, but with max_decrement enabled to see
@@ -18941,9 +18941,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -19453,9 +19453,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -19857,9 +19857,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out_with_threshold;
@@ -20114,9 +20114,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out_with_threshold;
@@ -20638,7 +20638,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
     if(pass) {
         flush_cache(file_ptr, TRUE, FALSE, FALSE);
-	reset_entries();
+    reset_entries();
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20672,9 +20672,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (32 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__add_space;
-	auto_size_ctl.flash_multiple         = 1.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__add_space;
+    auto_size_ctl.flash_multiple         = 1.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out_with_threshold;
@@ -20702,9 +20702,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         if((cache_ptr->max_cache_size != (64 * 1024)) ||
              (cache_ptr->min_clean_size != (32 * 1024)) ||
-	     (cache_ptr->index_len != 0) ||
-	     (cache_ptr->index_size != 0) ||
-	     (cache_ptr->cache_accesses != 0)) {
+        (cache_ptr->index_len != 0) ||
+        (cache_ptr->index_size != 0) ||
+        (cache_ptr->cache_accesses != 0)) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (0).\n";
@@ -20721,16 +20721,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         if(pass)
             unprotect_entry(file_ptr, HUGE_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (64 * 1024)) ||
-		 (cache_ptr->min_clean_size != (32 * 1024)) ||
-		 (cache_ptr->index_len != 1) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (64 * 1024)) ||
+        (cache_ptr->min_clean_size != (32 * 1024)) ||
+        (cache_ptr->index_len != 1) ||
                  (cache_ptr->index_size != HUGE_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (1).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20747,17 +20747,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         if(pass)
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (80 * 1024)) ||
-		 (cache_ptr->min_clean_size != (40 * 1024)) ||
-		 (cache_ptr->index_len != 2) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (80 * 1024)) ||
+        (cache_ptr->min_clean_size != (40 * 1024)) ||
+        (cache_ptr->index_len != 2) ||
                  (cache_ptr->index_size != (HUGE_ENTRY_SIZE +
-		                             MONSTER_ENTRY_SIZE)) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+                                    MONSTER_ENTRY_SIZE)) ||
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (2).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20773,17 +20773,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 1, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (144 * 1024)) ||
-		 (cache_ptr->min_clean_size != (72 * 1024)) ||
-		 (cache_ptr->index_len != 3) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (144 * 1024)) ||
+        (cache_ptr->min_clean_size != (72 * 1024)) ||
+        (cache_ptr->index_len != 3) ||
                  (cache_ptr->index_size != ((2 * MONSTER_ENTRY_SIZE) +
-					     HUGE_ENTRY_SIZE)) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+                        HUGE_ENTRY_SIZE)) ||
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (3).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20797,16 +20797,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 2, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (144 * 1024)) ||
-		 (cache_ptr->min_clean_size != (72 * 1024)) ||
-		 (cache_ptr->index_len != 2) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (144 * 1024)) ||
+        (cache_ptr->min_clean_size != (72 * 1024)) ||
+        (cache_ptr->index_len != 2) ||
                  (cache_ptr->index_size != (2 * MONSTER_ENTRY_SIZE)) ||
-		 (cache_ptr->cache_accesses != 2)))) {
+        (cache_ptr->cache_accesses != 2)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (4).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20816,8 +20816,8 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
      */
     if(pass) {
 
-	expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 1);
-	expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 2);
+    expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 1);
+    expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 2);
 
         if(pass) {
 
@@ -20825,19 +20825,19 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
             if(result != SUCCEED) {
                 pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 13.\n";
-	    }
+        }
         }
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (64 * 1024)) ||
-		 (cache_ptr->min_clean_size != (32 * 1024)) ||
-		 (cache_ptr->index_len != 0) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (64 * 1024)) ||
+        (cache_ptr->min_clean_size != (32 * 1024)) ||
+        (cache_ptr->index_len != 0) ||
                  (cache_ptr->index_size != 0) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (5).\n";
-	}
+    }
     }
 
     /* repeat the above basic test, only this time, use inserts to add
@@ -20851,22 +20851,22 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         insert_entry(file_ptr, HUGE_ENTRY_TYPE, 1, H5C__NO_FLAGS_SET);
 
-	/* protect and unprotect a couple times to increment cache_accesses */
+    /* protect and unprotect a couple times to increment cache_accesses */
         protect_entry(file_ptr, HUGE_ENTRY_TYPE, 1);
         unprotect_entry(file_ptr, HUGE_ENTRY_TYPE, 1, H5C__NO_FLAGS_SET);
         protect_entry(file_ptr, HUGE_ENTRY_TYPE, 1);
         unprotect_entry(file_ptr, HUGE_ENTRY_TYPE, 1, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (64 * 1024)) ||
-		 (cache_ptr->min_clean_size != (32 * 1024)) ||
-		 (cache_ptr->index_len != 1) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (64 * 1024)) ||
+        (cache_ptr->min_clean_size != (32 * 1024)) ||
+        (cache_ptr->index_len != 1) ||
                  (cache_ptr->index_size != HUGE_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 2)))) {
+        (cache_ptr->cache_accesses != 2)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (6).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20880,17 +20880,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         insert_entry(file_ptr, MONSTER_ENTRY_TYPE, 4, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (80 * 1024)) ||
-		 (cache_ptr->min_clean_size != (40 * 1024)) ||
-		 (cache_ptr->index_len != 2) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (80 * 1024)) ||
+        (cache_ptr->min_clean_size != (40 * 1024)) ||
+        (cache_ptr->index_len != 2) ||
                  (cache_ptr->index_size !=
-		   HUGE_ENTRY_SIZE + MONSTER_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        HUGE_ENTRY_SIZE + MONSTER_ENTRY_SIZE) ||
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (7).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20901,17 +20901,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         insert_entry(file_ptr, MONSTER_ENTRY_TYPE, 5, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (144 * 1024)) ||
-		 (cache_ptr->min_clean_size != (72 * 1024)) ||
-		 (cache_ptr->index_len != 3) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (144 * 1024)) ||
+        (cache_ptr->min_clean_size != (72 * 1024)) ||
+        (cache_ptr->index_len != 3) ||
                  (cache_ptr->index_size !=
-		   2 * MONSTER_ENTRY_SIZE + HUGE_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        2 * MONSTER_ENTRY_SIZE + HUGE_ENTRY_SIZE) ||
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (8).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20925,16 +20925,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 6, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (144 * 1024)) ||
-		 (cache_ptr->min_clean_size != (72 * 1024)) ||
-		 (cache_ptr->index_len != 2) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (144 * 1024)) ||
+        (cache_ptr->min_clean_size != (72 * 1024)) ||
+        (cache_ptr->index_len != 2) ||
                  (cache_ptr->index_size != (2 * MONSTER_ENTRY_SIZE)) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (9).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -20946,26 +20946,26 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
      */
     if(pass) {
 
-	expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 5);
-	expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 6);
+    expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 5);
+    expunge_entry(file_ptr, MONSTER_ENTRY_TYPE, 6);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 1024, TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 1024, TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 1024, TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 1024, TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 1024, TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 1024, TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, 1024, TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, 1024, TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, H5C__DIRTIED_FLAG);
 
-	flush_cache(file_ptr, TRUE, FALSE, FALSE);
+    flush_cache(file_ptr, TRUE, FALSE, FALSE);
 
 
         if(pass) {
@@ -20977,19 +20977,19 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
                 pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 13.\n";
-	    }
+        }
         }
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (6 * 1024)) ||
-		 (cache_ptr->min_clean_size != (3 * 1024)) ||
-		 (cache_ptr->index_len != 0) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (6 * 1024)) ||
+        (cache_ptr->min_clean_size != (3 * 1024)) ||
+        (cache_ptr->index_len != 0) ||
                  (cache_ptr->index_size != 0) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (10).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21009,16 +21009,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13);
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (6 * 1024)) ||
-		 (cache_ptr->min_clean_size != (3 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (6 * 1024)) ||
+        (cache_ptr->min_clean_size != (3 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 4 * 1024) ||
-		 (cache_ptr->cache_accesses != 4)))) {
+        (cache_ptr->cache_accesses != 4)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (11).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21029,20 +21029,20 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     if(pass) {
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (3 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (3 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
 
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (6 * 1024)) ||
-		 (cache_ptr->min_clean_size != (3 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (6 * 1024)) ||
+        (cache_ptr->min_clean_size != (3 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 6 * 1024) ||
-		 (cache_ptr->cache_accesses != 5)))) {
+        (cache_ptr->cache_accesses != 5)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (12).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21054,20 +21054,20 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     if(pass) {
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (10 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (10 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
 
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (13 * 1024)) ||
-		 (cache_ptr->min_clean_size != (13 * 512)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (13 * 1024)) ||
+        (cache_ptr->min_clean_size != (13 * 512)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 13 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (13).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21078,20 +21078,20 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     if(pass) {
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (10 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (10 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
 
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 22 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (14).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21102,20 +21102,20 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     if(pass) {
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (10 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (10 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
 
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 31 * 1024) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (15).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21127,16 +21127,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     if(pass) {
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
 
         if(pass) {
 
@@ -21147,19 +21147,19 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
                 pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 14.\n";
-	    }
+        }
         }
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (6 * 1024)) ||
-		 (cache_ptr->min_clean_size != (3 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (6 * 1024)) ||
+        (cache_ptr->min_clean_size != (3 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 4 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (16).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21172,16 +21172,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__PIN_ENTRY_FLAG);
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (6 * 1024)) ||
-		 (cache_ptr->min_clean_size != (6 * 512)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (6 * 1024)) ||
+        (cache_ptr->min_clean_size != (6 * 512)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 5 * 1024) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (17).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21190,16 +21190,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 10 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (13 * 1024)) ||
-		 (cache_ptr->min_clean_size != (13 * 512)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (13 * 1024)) ||
+        (cache_ptr->min_clean_size != (13 * 512)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 13 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (18).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21210,16 +21210,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__PIN_ENTRY_FLAG);
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 22 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (19).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21230,16 +21230,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__PIN_ENTRY_FLAG);
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 31 * 1024) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (20).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21258,16 +21258,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__UNPIN_ENTRY_FLAG);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 31 * 1024) ||
-		 (cache_ptr->cache_accesses != 4)))) {
+        (cache_ptr->cache_accesses != 4)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (21).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21279,16 +21279,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     if(pass) {
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, (1 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__DIRTIED_FLAG);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, (1 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__DIRTIED_FLAG);
 
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-	resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), TRUE);
-	unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
+    resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, (1 * 1024), TRUE);
+    unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__DIRTIED_FLAG);
 
         if(pass) {
 
@@ -21299,19 +21299,19 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
                 pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 15.\n";
-	    }
+        }
         }
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (6 * 1024)) ||
-		 (cache_ptr->min_clean_size != (3 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (6 * 1024)) ||
+        (cache_ptr->min_clean_size != (3 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 4 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (22).\n";
-	}
+    }
     }
 
     if(pass) {
@@ -21320,16 +21320,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, H5C__PIN_ENTRY_FLAG);
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (6 * 1024)) ||
-		 (cache_ptr->min_clean_size != (6 * 512)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (6 * 1024)) ||
+        (cache_ptr->min_clean_size != (6 * 512)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 5 * 1024) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (23).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21338,16 +21338,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10, 10 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (13 * 1024)) ||
-		 (cache_ptr->min_clean_size != (13 * 512)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (13 * 1024)) ||
+        (cache_ptr->min_clean_size != (13 * 512)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 13 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (24).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21358,16 +21358,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, H5C__PIN_ENTRY_FLAG);
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 22 * 1024) ||
-		 (cache_ptr->cache_accesses != 0)))) {
+        (cache_ptr->cache_accesses != 0)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (25).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21378,16 +21378,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__PIN_ENTRY_FLAG);
         resize_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, TRUE);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 31 * 1024) ||
-		 (cache_ptr->cache_accesses != 1)))) {
+        (cache_ptr->cache_accesses != 1)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (26).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21406,16 +21406,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
         unprotect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12, H5C__UNPIN_ENTRY_FLAG);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 4) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 4) ||
                  (cache_ptr->index_size != 31 * 1024) ||
-		 (cache_ptr->cache_accesses != 4)))) {
+        (cache_ptr->cache_accesses != 4)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (27).\n";
-	}
+    }
     }
 
     /* We have finished a basic check of the flash cache size increment
@@ -21423,21 +21423,21 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
      */
     if(pass) {
 
-	expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-	expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-	expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-	expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13);
+    expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 10);
+    expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 11);
+    expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 12);
+    expunge_entry(file_ptr, VARIABLE_ENTRY_TYPE, 13);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (22 * 1024)) ||
-		 (cache_ptr->min_clean_size != (11 * 1024)) ||
-		 (cache_ptr->index_len != 0) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (22 * 1024)) ||
+        (cache_ptr->min_clean_size != (11 * 1024)) ||
+        (cache_ptr->index_len != 0) ||
                  (cache_ptr->index_size != 0) ||
-		 (cache_ptr->cache_accesses != 4)))) {
+        (cache_ptr->cache_accesses != 4)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (28).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21471,9 +21471,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__add_space;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.4f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__add_space;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.4f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out_with_threshold;
@@ -21503,9 +21503,9 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         if((cache_ptr->max_cache_size != (4 * 1024)) ||
              (cache_ptr->min_clean_size != (4 * 512)) ||
-	     (cache_ptr->index_len != 0) ||
-	     (cache_ptr->index_size != 0) ||
-	     (cache_ptr->cache_accesses != 0)) {
+        (cache_ptr->index_len != 0) ||
+        (cache_ptr->index_size != 0) ||
+        (cache_ptr->cache_accesses != 0)) {
 
             pass = FALSE;
             failure_mssg = "bad cache after initialization 15.\n";
@@ -21524,17 +21524,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         protect_entry(file_ptr, LARGE_ENTRY_TYPE, 0);
         unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (4 * 1024)) ||
-		 (cache_ptr->min_clean_size != (4 * 512)) ||
-		 (cache_ptr->index_len != 1) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (4 * 1024)) ||
+        (cache_ptr->min_clean_size != (4 * 512)) ||
+        (cache_ptr->index_len != 1) ||
                  (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 1)  ||
-		 (rpt_fcn_called == TRUE)))) {
+        (cache_ptr->cache_accesses != 1)  ||
+        (rpt_fcn_called == TRUE)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (29).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21550,17 +21550,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         protect_entry(file_ptr, LARGE_ENTRY_TYPE, 1);
         unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 1, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (12 * 1024)) ||
-		 (cache_ptr->min_clean_size != (12 * 512)) ||
-		 (cache_ptr->index_len != 2) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (12 * 1024)) ||
+        (cache_ptr->min_clean_size != (12 * 512)) ||
+        (cache_ptr->index_len != 2) ||
                  (cache_ptr->index_size != 2 * LARGE_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 1)  ||
-		 (rpt_fcn_called != TRUE)))) {
+        (cache_ptr->cache_accesses != 1)  ||
+        (rpt_fcn_called != TRUE)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (30).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21577,17 +21577,17 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         protect_entry(file_ptr, LARGE_ENTRY_TYPE, 3);
         unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 3, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (12 * 1024)) ||
-		 (cache_ptr->min_clean_size != (12 * 512)) ||
-		 (cache_ptr->index_len != 3) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (12 * 1024)) ||
+        (cache_ptr->min_clean_size != (12 * 512)) ||
+        (cache_ptr->index_len != 3) ||
                  (cache_ptr->index_size != 3 * LARGE_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 3)  ||
-		 (rpt_fcn_called != FALSE)))) {
+        (cache_ptr->cache_accesses != 3)  ||
+        (rpt_fcn_called != FALSE)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (31).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21628,19 +21628,19 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
         protect_entry(file_ptr, LARGE_ENTRY_TYPE, 0);
         unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 0, H5C__NO_FLAGS_SET);
 
-	if(pass &&
-	     (((cache_ptr->max_cache_size != (4 * 1024 + 128)) ||
-		 (cache_ptr->min_clean_size != (2 * 1024 + 64)) ||
-		 (cache_ptr->index_len != 2) ||
+    if(pass &&
+        (((cache_ptr->max_cache_size != (4 * 1024 + 128)) ||
+        (cache_ptr->min_clean_size != (2 * 1024 + 64)) ||
+        (cache_ptr->index_len != 2) ||
                  (cache_ptr->index_size !=
-		   LARGE_ENTRY_SIZE + TINY_ENTRY_SIZE) ||
-		 (cache_ptr->cache_accesses != 1)  ||
-		 (rpt_fcn_called == FALSE) ||
+        LARGE_ENTRY_SIZE + TINY_ENTRY_SIZE) ||
+        (cache_ptr->cache_accesses != 1)  ||
+        (rpt_fcn_called == FALSE) ||
                  (rpt_status != flash_increase)))) {
 
             pass = FALSE;
             failure_mssg = "Unexpected cache config (33).\n";
-	}
+    }
     }
 
     if(show_progress) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -21661,7 +21661,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
 
         if((cache_ptr->max_cache_size != (20 * 1024)) ||
              (cache_ptr->min_clean_size != (10 * 1024)) ||
-	     (rpt_fcn_called == FALSE) ||
+        (rpt_fcn_called == FALSE) ||
              (rpt_status != at_max_size)) {
 
             pass = FALSE;
@@ -21692,16 +21692,16 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     return (unsigned)!pass;
 } /* check_auto_cache_resize() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_auto_cache_resize_disable()
+ * Function:    check_auto_cache_resize_disable()
  *
- * Purpose:	Test the various ways in which the resize code can
- *		be disabled.  Unfortunately, there are quite a few of them.
+ * Purpose:    Test the various ways in which the resize code can
+ *        be disabled.  Unfortunately, there are quite a few of them.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              12/16/04
  *
  * Modifications:
@@ -21748,7 +21748,7 @@ check_auto_cache_resize_disable(unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 1.0f,
         /* double      flash_threshold        = */ 0.25f,
 
@@ -21793,7 +21793,7 @@ check_auto_cache_resize_disable(unsigned paged)
             pass = FALSE;
             failure_mssg = "file_ptr NULL from setup_cache.";
 
-        } 
+        }
         else {
 
             cache_ptr = file_ptr->shared->cache;
@@ -21856,9 +21856,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = FALSE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -22014,9 +22014,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = FALSE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -22171,9 +22171,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = FALSE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -22328,9 +22328,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -22485,9 +22485,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -22641,9 +22641,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__off;
@@ -22799,9 +22799,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -23026,9 +23026,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -23260,9 +23260,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out_with_threshold;
@@ -23498,9 +23498,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -23625,9 +23625,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -23752,9 +23752,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -23879,9 +23879,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -24006,9 +24006,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -24134,9 +24134,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__off;
@@ -24290,9 +24290,9 @@ check_auto_cache_resize_disable(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (2 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 1.0f;
-	auto_size_ctl.flash_threshold        = 0.25f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 1.0f;
+    auto_size_ctl.flash_threshold        = 0.25f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out_with_threshold;
@@ -24347,16 +24347,16 @@ check_auto_cache_resize_disable(unsigned paged)
                  (cache_ptr->index_size != LARGE_ENTRY_SIZE) ||
                  (rpt_fcn_called != FALSE)))) {
 
-	    HDfprintf(stdout, "\nmax_cache_size = %ld.\n",
-		      (long)(cache_ptr->max_cache_size));
-	    HDfprintf(stdout, "min_clean_size = %ld.\n",
-		      (long)(cache_ptr->min_clean_size));
-	    HDfprintf(stdout, "index_len = %ld.\n",
-		      (long)(cache_ptr->index_len));
-	    HDfprintf(stdout, "index_size = %ld.\n",
-		      (long)(cache_ptr->index_size));
-	    HDfprintf(stdout, "rpt_fcn_called = %ld.\n",
-		      (long)(rpt_fcn_called));
+        HDfprintf(stdout, "\nmax_cache_size = %ld.\n",
+            (long)(cache_ptr->max_cache_size));
+        HDfprintf(stdout, "min_clean_size = %ld.\n",
+            (long)(cache_ptr->min_clean_size));
+        HDfprintf(stdout, "index_len = %ld.\n",
+            (long)(cache_ptr->index_len));
+        HDfprintf(stdout, "index_size = %ld.\n",
+            (long)(cache_ptr->index_size));
+        HDfprintf(stdout, "rpt_fcn_called = %ld.\n",
+            (long)(rpt_fcn_called));
 
             pass = FALSE;
             failure_mssg = "Unexpected cache size change results 46.\n";
@@ -24386,16 +24386,16 @@ check_auto_cache_resize_disable(unsigned paged)
                  (cache_ptr->index_size != MONSTER_ENTRY_SIZE) ||
                  (rpt_fcn_called != FALSE)))) {
 
-	    HDfprintf(stdout, "\nmax_cache_size = %ld.\n",
-		      (long)(cache_ptr->max_cache_size));
-	    HDfprintf(stdout, "min_clean_size = %ld.\n",
-		      (long)(cache_ptr->min_clean_size));
-	    HDfprintf(stdout, "index_len = %ld.\n",
-		      (long)(cache_ptr->index_len));
-	    HDfprintf(stdout, "index_size = %ld.\n",
-		      (long)(cache_ptr->index_size));
-	    HDfprintf(stdout, "rpt_fcn_called = %ld.\n",
-		      (long)(rpt_fcn_called));
+        HDfprintf(stdout, "\nmax_cache_size = %ld.\n",
+            (long)(cache_ptr->max_cache_size));
+        HDfprintf(stdout, "min_clean_size = %ld.\n",
+            (long)(cache_ptr->min_clean_size));
+        HDfprintf(stdout, "index_len = %ld.\n",
+            (long)(cache_ptr->index_len));
+        HDfprintf(stdout, "index_size = %ld.\n",
+            (long)(cache_ptr->index_size));
+        HDfprintf(stdout, "rpt_fcn_called = %ld.\n",
+            (long)(rpt_fcn_called));
 
             pass = FALSE;
             failure_mssg = "Unexpected cache size change results 47.\n";
@@ -24423,16 +24423,16 @@ check_auto_cache_resize_disable(unsigned paged)
 
 } /* check_auto_cache_resize_disable() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_auto_cache_resize_epoch_markers()
+ * Function:    check_auto_cache_resize_epoch_markers()
  *
- * Purpose:	Verify that the auto-resize code manages epoch markers
- *		correctly.
+ * Purpose:    Verify that the auto-resize code manages epoch markers
+ *        correctly.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              12/16/04
  *
  * Modifications:
@@ -24476,9 +24476,9 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
@@ -24565,9 +24565,9 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -24739,9 +24739,9 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -24860,9 +24860,9 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -24939,9 +24939,9 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__age_out_with_threshold;
@@ -25052,9 +25052,9 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
         auto_size_ctl.apply_max_increment    = TRUE;
         auto_size_ctl.max_increment          = (4 * 1024 * 1024);
 
-	auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	auto_size_ctl.flash_multiple         = 2.0f;
-	auto_size_ctl.flash_threshold        = 0.5f;
+    auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    auto_size_ctl.flash_multiple         = 2.0f;
+    auto_size_ctl.flash_threshold        = 0.5f;
 
 
         auto_size_ctl.decr_mode              = H5C_decr__off;
@@ -25129,21 +25129,21 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
 
 } /* check_auto_cache_resize_epoch_markers() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_auto_cache_resize_input_errs()
+ * Function:    check_auto_cache_resize_input_errs()
  *
- * Purpose:	Verify that H5C_set_cache_auto_resize_config() detects
- *		and rejects invalid input.
+ * Purpose:    Verify that H5C_set_cache_auto_resize_config() detects
+ *        and rejects invalid input.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/29/04
  *
  * Modifications:
  *
- * 		Added code to verify that errors in the flash cache size
+ *         Added code to verify that errors in the flash cache size
  *              increment related fields are caught as well.
  *
  *                                              JRM -- 1/17/08
@@ -25183,9 +25183,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
@@ -25291,9 +25291,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25366,9 +25366,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25442,9 +25442,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25515,9 +25515,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25590,9 +25590,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25662,9 +25662,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25738,9 +25738,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25810,9 +25810,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25882,9 +25882,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -25957,9 +25957,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26029,9 +26029,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26096,7 +26096,7 @@ check_auto_cache_resize_input_errs(unsigned paged)
 
 
         invalid_auto_size_ctl.incr_mode              =
-        			(enum H5C_cache_incr_mode) -1; /* INVALID */
+                    (enum H5C_cache_incr_mode) -1; /* INVALID */
 
         invalid_auto_size_ctl.lower_hr_threshold     = 0.75f;
 
@@ -26105,9 +26105,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26169,7 +26169,7 @@ check_auto_cache_resize_input_errs(unsigned paged)
 
 
         invalid_auto_size_ctl.incr_mode              =
-        			(enum H5C_cache_incr_mode) 2; /* INVALID */
+                    (enum H5C_cache_incr_mode) 2; /* INVALID */
 
         invalid_auto_size_ctl.lower_hr_threshold     = 0.75f;
 
@@ -26178,9 +26178,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26253,9 +26253,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26325,9 +26325,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26397,9 +26397,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26472,9 +26472,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26547,10 +26547,10 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        =
-       			(enum H5C_cache_flash_incr_mode) -1; /* INVALID */
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        =
+                (enum H5C_cache_flash_incr_mode) -1; /* INVALID */
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26622,10 +26622,10 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        =
-						H5C_flash_incr__add_space;
-	invalid_auto_size_ctl.flash_multiple         = 0.09f; /* INVALID */
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        =
+                        H5C_flash_incr__add_space;
+    invalid_auto_size_ctl.flash_multiple         = 0.09f; /* INVALID */
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26695,10 +26695,10 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        =
-						H5C_flash_incr__add_space;
-	invalid_auto_size_ctl.flash_multiple         = 10.01f; /* INVALID */
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        =
+                        H5C_flash_incr__add_space;
+    invalid_auto_size_ctl.flash_multiple         = 10.01f; /* INVALID */
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26770,10 +26770,10 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        =
-						H5C_flash_incr__add_space;
-	invalid_auto_size_ctl.flash_multiple         = 1.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.09f; /* INVALID */
+    invalid_auto_size_ctl.flash_incr_mode        =
+                        H5C_flash_incr__add_space;
+    invalid_auto_size_ctl.flash_multiple         = 1.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.09f; /* INVALID */
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26843,10 +26843,10 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        =
-						H5C_flash_incr__add_space;
-	invalid_auto_size_ctl.flash_multiple         = 1.0f;
-	invalid_auto_size_ctl.flash_threshold        = 1.001f; /* INVALID */
+    invalid_auto_size_ctl.flash_incr_mode        =
+                        H5C_flash_incr__add_space;
+    invalid_auto_size_ctl.flash_multiple         = 1.0f;
+    invalid_auto_size_ctl.flash_threshold        = 1.001f; /* INVALID */
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -26919,13 +26919,13 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              =
-        			(enum H5C_cache_decr_mode) -1; /* INVALID */
+                    (enum H5C_cache_decr_mode) -1; /* INVALID */
 
         invalid_auto_size_ctl.upper_hr_threshold     = 0.999f;
 
@@ -26992,13 +26992,13 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              =
-        			(enum H5C_cache_decr_mode) 4; /* INVALID */
+                    (enum H5C_cache_decr_mode) 4; /* INVALID */
 
         invalid_auto_size_ctl.upper_hr_threshold     = 0.999f;
 
@@ -27068,9 +27068,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -27140,9 +27140,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__threshold;
@@ -27215,9 +27215,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -27286,9 +27286,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode      = H5C_decr__age_out_with_threshold;
@@ -27361,9 +27361,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode              = H5C_decr__age_out;
@@ -27432,9 +27432,9 @@ check_auto_cache_resize_input_errs(unsigned paged)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
-	invalid_auto_size_ctl.flash_multiple         = 2.0f;
-	invalid_auto_size_ctl.flash_threshold        = 0.5f;
+    invalid_auto_size_ctl.flash_incr_mode        = H5C_flash_incr__off;
+    invalid_auto_size_ctl.flash_multiple         = 2.0f;
+    invalid_auto_size_ctl.flash_threshold        = 0.5f;
 
 
         invalid_auto_size_ctl.decr_mode      = H5C_decr__age_out_with_threshold;
@@ -27538,21 +27538,21 @@ check_auto_cache_resize_input_errs(unsigned paged)
 
 } /* check_auto_cache_resize_input_errs() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_auto_cache_resize_aux_fcns()
+ * Function:    check_auto_cache_resize_aux_fcns()
  *
- * Purpose:	Verify that the auxilary functions associated with
- *		the automatic cache resize capability are operating
- *		correctly.  These functions are:
+ * Purpose:    Verify that the auxilary functions associated with
+ *        the automatic cache resize capability are operating
+ *        correctly.  These functions are:
  *
- *			H5C_get_cache_size()
- *			H5C_get_cache_hit_rate()
- *			H5C_reset_cache_hit_rate_stats()
+ *            H5C_get_cache_size()
+ *            H5C_get_cache_hit_rate()
+ *            H5C_reset_cache_hit_rate_stats()
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              11/4/04
  *
  * Modifications:
@@ -27601,9 +27601,9 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
@@ -28078,11 +28078,11 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
 
 } /* check_auto_cache_resize_aux_fcns() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_metadata_blizzard_absence()
+ * Function:    check_metadata_blizzard_absence()
  *
- * Purpose:	Test to verify that a 'metadata blizzard' can not occur
+ * Purpose:    Test to verify that a 'metadata blizzard' can not occur
  *              upon insertion into the cache.
  *
  *              A 'metadata blizzard' in this context occurs when the cache
@@ -28096,9 +28096,9 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
  *              flushing the entire cache is what constitutes a 'metadata
  *              blizzard'.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Mike McGreevy
+ * Programmer:    Mike McGreevy
  *              <mamcgree@hdfgroup.org>
  *              12/16/08
  *
@@ -28129,158 +28129,158 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
      */
     struct expected_entry_status expected[150] =
     {
-      /* entry		entry			in	at main                                                flush dep flush dep child flush   flush       flush */
-      /* type:		index:	size:		cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
-      { HUGE_ENTRY_TYPE, 0,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 1,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 2,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 3,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 4,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 5,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 6,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 7,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 8,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 9,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 10,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 11,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 12,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 13,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 14,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 15,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 16,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 17,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 18,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 19,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 20,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 21,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 22,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 23,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 24,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 25,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 26,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 27,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 28,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 29,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 30,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 31,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 32,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 33,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 34,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 35,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 36,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 37,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 38,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 39,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 40,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 41,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 42,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 43,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 44,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 45,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 46,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 47,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 48,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 49,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 50,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 51,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 52,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 53,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 54,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 55,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 56,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 57,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 58,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 59,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 60,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 61,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 62,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 63,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 64,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 65,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 66,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 67,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 68,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 69,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 70,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 71,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 72,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 73,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 74,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 75,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 76,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 77,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 78,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 79,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 80,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 81,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 82,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 83,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 84,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 85,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 86,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 87,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 88,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 89,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 90,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 91,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 92,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 93,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 94,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 95,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 96,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 97,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 98,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 99,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 100,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 101,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 102,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 103,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 104,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 105,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 106,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 107,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 108,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 109,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 110,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 111,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 112,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 113,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 114,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 115,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 116,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 117,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 118,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 119,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 120,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 121,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 122,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 123,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 124,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 125,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 126,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 127,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 128,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 129,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 130,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 131,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 132,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 133,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 134,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 135,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 136,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 137,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 138,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 139,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 140,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 141,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 142,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 143,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 144,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 145,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 146,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 147,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 148,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 149,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
+      /* entry        entry            in    at main                                                flush dep flush dep child flush   flush       flush */
+      /* type:        index:    size:        cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
+      { HUGE_ENTRY_TYPE, 0,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 1,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 2,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 3,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 4,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 5,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 6,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 7,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 8,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 9,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 10,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 11,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 12,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 13,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 14,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 15,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 16,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 17,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 18,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 19,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 20,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 21,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 22,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 23,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 24,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 25,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 26,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 27,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 28,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 29,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 30,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 31,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 32,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 33,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 34,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 35,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 36,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 37,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 38,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 39,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 40,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 41,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 42,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 43,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 44,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 45,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 46,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 47,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 48,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 49,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 50,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 51,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 52,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 53,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 54,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 55,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 56,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 57,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 58,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 59,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 60,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 61,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 62,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 63,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 64,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 65,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 66,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 67,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 68,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 69,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 70,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 71,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 72,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 73,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 74,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 75,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 76,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 77,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 78,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 79,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 80,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 81,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 82,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 83,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 84,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 85,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 86,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 87,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 88,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 89,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 90,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 91,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 92,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 93,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 94,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 95,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 96,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 97,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 98,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 99,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 100,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 101,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 102,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 103,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 104,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 105,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 106,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 107,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 108,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 109,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 110,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 111,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 112,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 113,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 114,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 115,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 116,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 117,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 118,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 119,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 120,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 121,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 122,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 123,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 124,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 125,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 126,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 127,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 128,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 129,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 130,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 131,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 132,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 133,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 134,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 135,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 136,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 137,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 138,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 139,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 140,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 141,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 142,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 143,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 144,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 145,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 146,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 147,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 148,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 149,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
 
     pass = TRUE;
@@ -28441,13 +28441,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
          */
 
         /* entry w/ index 0 has now been flushed and is now clean. */
-	expected[0].is_dirty  = FALSE;
-	expected[0].serialized  = TRUE;
+    expected[0].is_dirty  = FALSE;
+    expected[0].serialized  = TRUE;
 
         /* entry w/ index 26 is now in the cache and dirty. */
-	expected[26].in_cache = TRUE;
-	expected[26].is_dirty = TRUE;
-	expected[26].deserialized   = (unsigned char)deserialized;
+    expected[26].in_cache = TRUE;
+    expected[26].is_dirty = TRUE;
+    expected[26].deserialized   = (unsigned char)deserialized;
 
         /* verify the status */
         verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -28495,13 +28495,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
          */
 
         /* entry w/ index 1 has now been flushed and is now clean. */
-	expected[1].is_dirty  = FALSE;
-	expected[1].serialized  = TRUE;
+    expected[1].is_dirty  = FALSE;
+    expected[1].serialized  = TRUE;
 
         /* entry w/ index 27 is now in the cache and dirty. */
-	expected[27].in_cache = TRUE;
-	expected[27].is_dirty = TRUE;
-	expected[27].deserialized   = (unsigned char)deserialized;
+    expected[27].in_cache = TRUE;
+    expected[27].is_dirty = TRUE;
+    expected[27].deserialized   = (unsigned char)deserialized;
 
         /* verify the status */
         verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -28544,9 +28544,9 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
             expected[entry_idx - 26].is_dirty = FALSE;
             expected[entry_idx - 26].serialized = TRUE;
 
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized   = (unsigned char)deserialized;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized   = (unsigned char)deserialized;
 
             /* verify the status */
             verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -28617,19 +28617,19 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
          */
 
         /* entry w/ index 0 has been evicted. */
-	expected[0].in_cache  = FALSE;
-	expected[0].destroyed = TRUE;
+    expected[0].in_cache  = FALSE;
+    expected[0].destroyed = TRUE;
 
         /* entries w/ indices 24,25 have now been flushed and are clean. */
-	expected[24].is_dirty = FALSE;
-	expected[24].serialized = TRUE;
-	expected[25].is_dirty = FALSE;
-	expected[25].serialized = TRUE;
+    expected[24].is_dirty = FALSE;
+    expected[24].serialized = TRUE;
+    expected[25].is_dirty = FALSE;
+    expected[25].serialized = TRUE;
 
         /* entry w/ index 50 is now in the cache and dirty */
-	expected[50].in_cache = TRUE;
-	expected[50].is_dirty = TRUE;
-	expected[50].deserialized   = (unsigned char)deserialized;
+    expected[50].in_cache = TRUE;
+    expected[50].is_dirty = TRUE;
+    expected[50].deserialized   = (unsigned char)deserialized;
 
         /* verify the status */
         verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -28672,13 +28672,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
             }
 
             /* This past inserted entry is now in the cache and dirty */
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized   = (unsigned char)deserialized;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized   = (unsigned char)deserialized;
 
             /* The entry inserted 50 insertions ago has been evicted */
-	    expected[entry_idx - 50].in_cache  = FALSE;
-	    expected[entry_idx - 50].destroyed = TRUE;
+        expected[entry_idx - 50].in_cache  = FALSE;
+        expected[entry_idx - 50].destroyed = TRUE;
 
             /* If the newly inserted entry is among the first 24
              * insertions in this loop, then the insertion will
@@ -28803,13 +28803,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
             }
 
             /* This past inserted entry is now in the cache and dirty */
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized   = (unsigned char)deserialized;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized   = (unsigned char)deserialized;
 
             /* The entry with ID minus 50 will have been evicted */
-	    expected[entry_idx - 50].in_cache  = FALSE;
-	    expected[entry_idx - 50].destroyed = TRUE;
+        expected[entry_idx - 50].in_cache  = FALSE;
+        expected[entry_idx - 50].destroyed = TRUE;
 
             /* verify the status */
             verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -28851,17 +28851,17 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
          */
 
         /* entry w/ index 76 has been evicted. */
-	expected[76].in_cache  = FALSE;
-	expected[76].destroyed = TRUE;
+    expected[76].in_cache  = FALSE;
+    expected[76].destroyed = TRUE;
 
         /* entry w/ index 100 has now been flushed and is now clean. */
-	expected[100].is_dirty  = FALSE;
-	expected[100].serialized   = TRUE;
+    expected[100].is_dirty  = FALSE;
+    expected[100].serialized   = TRUE;
 
         /* entry w/ index 26 is now in the cache and dirty. */
-	expected[126].in_cache = TRUE;
-	expected[126].is_dirty = TRUE;
-	expected[126].deserialized   = (unsigned char)deserialized;
+    expected[126].in_cache = TRUE;
+    expected[126].is_dirty = TRUE;
+    expected[126].deserialized   = (unsigned char)deserialized;
 
         /* verify the status */
         verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -28897,13 +28897,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
             }
 
             /* This past inserted entry is now in the cache and dirty */
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized   = (unsigned char)deserialized;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized   = (unsigned char)deserialized;
 
             /* The entry with ID minus 50 will have been evicted */
-	    expected[entry_idx - 50].in_cache  = FALSE;
-	    expected[entry_idx - 50].destroyed = TRUE;
+        expected[entry_idx - 50].in_cache  = FALSE;
+        expected[entry_idx - 50].destroyed = TRUE;
 
             /* The entry with ID minus 26 will now be clean */
             expected[entry_idx - 26].is_dirty = FALSE;
@@ -28939,15 +28939,15 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
 
 } /* check_metadata_blizzard_absence() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_deps()
+ * Function:    check_flush_deps()
  *
- * Purpose:	Exercise the flush dependency routines.
+ * Purpose:    Exercise the flush dependency routines.
  *
- * Return:	0 on success, non-zero on failure
+ * Return:    0 on success, non-zero on failure
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *               3/12/09
  *
  *-------------------------------------------------------------------------
@@ -28963,13 +28963,13 @@ check_flush_deps(unsigned paged)
     unsigned u;                         /* Local index variable */
     struct expected_entry_status expected[5] =
     {
-      /* entry			entry		in	at main                                                        flush dep flush dep child flush   flush       flush */
-      /* type:		index:	size:		cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
-      { PICO_ENTRY_TYPE, 0,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 1,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 2,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 3,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 4,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
+      /* entry            entry        in    at main                                                        flush dep flush dep child flush   flush       flush */
+      /* type:        index:    size:        cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
+      { PICO_ENTRY_TYPE, 0,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 1,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 2,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 3,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 4,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
 
     if(paged)
@@ -29020,16 +29020,16 @@ check_flush_deps(unsigned paged)
         if(!pass) CACHE_ERROR("protect_entry failed")
 
         /* Check the parent's entry status */
-	entry_ptr = &(base_addr[1]);
-	if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
+    entry_ptr = &(base_addr[1]);
+    if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
                 NULL, NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child, NULL) < 0)
             CACHE_ERROR("H5C_get_entry_status() failed")
         if(!in_cache || is_flush_dep_parent || is_flush_dep_child)
             CACHE_ERROR("invalid entry status")
 
         /* Check the child's entry status */
-	entry_ptr = &(base_addr[0]);
-	if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
+    entry_ptr = &(base_addr[0]);
+    if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
                 NULL, NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child, NULL) < 0)
             CACHE_ERROR("H5C_get_entry_status() failed")
         if(!in_cache || is_flush_dep_parent || is_flush_dep_child)
@@ -29039,16 +29039,16 @@ check_flush_deps(unsigned paged)
         if(!pass) CACHE_ERROR("create_flush_dependency failed")
 
         /* Check the parent's entry status */
-	entry_ptr = &(base_addr[1]);
-	if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
+    entry_ptr = &(base_addr[1]);
+    if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
                 NULL, NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child, NULL) < 0)
             CACHE_ERROR("H5C_get_entry_status() failed")
         if(!in_cache || !is_flush_dep_parent || is_flush_dep_child)
             CACHE_ERROR("invalid entry status")
 
         /* Check the child's entry status */
-	entry_ptr = &(base_addr[0]);
-	if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
+    entry_ptr = &(base_addr[0]);
+    if(H5C_get_entry_status(file_ptr, entry_ptr->addr, NULL, &in_cache,
                 NULL, NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child, NULL) < 0)
             CACHE_ERROR("H5C_get_entry_status() failed")
         if(!in_cache || is_flush_dep_parent || !is_flush_dep_child)
@@ -30678,15 +30678,15 @@ done:
     return (unsigned)!pass;
 } /* check_flush_deps() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_deps_err()
+ * Function:    check_flush_deps_err()
  *
- * Purpose:	Check  the flush dependency routines for error conditions.
+ * Purpose:    Check  the flush dependency routines for error conditions.
  *
- * Return:	0 on success, non-zero on failure
+ * Return:    0 on success, non-zero on failure
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *               3/16/09
  *
  *-------------------------------------------------------------------------
@@ -30901,16 +30901,16 @@ done:
     return (unsigned)!pass;
 } /* check_flush_deps_err() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_flush_deps_order()
+ * Function:    check_flush_deps_order()
  *
- * Purpose:	Verify that the order that entries with flush dependencies
+ * Purpose:    Verify that the order that entries with flush dependencies
  *              is correct
  *
- * Return:	0 on success, non-zero on failure
+ * Return:    0 on success, non-zero on failure
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *               3/17/09
  *
  *-------------------------------------------------------------------------
@@ -30925,13 +30925,13 @@ check_flush_deps_order(unsigned paged)
     unsigned u;                         /* Local index variable */
     struct expected_entry_status expected[5] =
     {
-      /* entry			entry		in	at main                                                        flush dep flush dep child flush   flush       flush */
-      /* type:		index:	size:		cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
-      { PICO_ENTRY_TYPE, 0,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 1,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 2,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 3,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { PICO_ENTRY_TYPE, 4,	PICO_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
+      /* entry            entry        in    at main                                                        flush dep flush dep child flush   flush       flush */
+      /* type:        index:    size:        cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
+      { PICO_ENTRY_TYPE, 0,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 1,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 2,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 3,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { PICO_ENTRY_TYPE, 4,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
     unsigned flush_order;       /* Index for tracking flush order */
 
@@ -33473,15 +33473,15 @@ done:
     return (unsigned)!pass;
 } /* check_flush_deps_order() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_notify_cb()
+ * Function:    check_notify_cb()
  *
- * Purpose:	Exercise the client 'notify' callback.
+ * Purpose:    Exercise the client 'notify' callback.
  *
- * Return:	0 on success, non-zero on failure
+ * Return:    0 on success, non-zero on failure
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *               4/28/09
  *
  *-------------------------------------------------------------------------
@@ -33498,13 +33498,13 @@ check_notify_cb(unsigned paged)
     unsigned u;                         /* Local index variable */
     struct expected_entry_status expected[5] =
     {
-      /* entry			entry		   in	 at main                                               flush dep flush dep child flush   flush       flush */
-      /* type:		index:	size:		   cache: addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
-      { NOTIFY_ENTRY_TYPE, 0,	NOTIFY_ENTRY_SIZE, FALSE, TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { NOTIFY_ENTRY_TYPE, 1,	NOTIFY_ENTRY_SIZE, FALSE, TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { NOTIFY_ENTRY_TYPE, 2,	NOTIFY_ENTRY_SIZE, FALSE, TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { NOTIFY_ENTRY_TYPE, 3,	NOTIFY_ENTRY_SIZE, FALSE, TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { NOTIFY_ENTRY_TYPE, 4,	NOTIFY_ENTRY_SIZE, FALSE, TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
+      /* entry            entry           in     at main                                               flush dep flush dep child flush   flush       flush */
+      /* type:        index:    size:           cache: addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
+      { NOTIFY_ENTRY_TYPE, 0,    NOTIFY_ENTRY_SIZE, FALSE, TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { NOTIFY_ENTRY_TYPE, 1,    NOTIFY_ENTRY_SIZE, FALSE, TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { NOTIFY_ENTRY_TYPE, 2,    NOTIFY_ENTRY_SIZE, FALSE, TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { NOTIFY_ENTRY_TYPE, 3,    NOTIFY_ENTRY_SIZE, FALSE, TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { NOTIFY_ENTRY_TYPE, 4,    NOTIFY_ENTRY_SIZE, FALSE, TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
 
     if(paged)
@@ -33545,7 +33545,7 @@ check_notify_cb(unsigned paged)
         if(!pass) CACHE_ERROR("verify_entry_status failed")
 
         /* Check the entry's 'after insert' count */
-	entry_ptr = &(base_addr[u]);
+    entry_ptr = &(base_addr[u]);
         if(1 != entry_ptr->notify_after_insert_count)
             CACHE_ERROR("invalid notify after insert count")
         if(0 != entry_ptr->notify_before_evict_count)
@@ -33573,7 +33573,7 @@ check_notify_cb(unsigned paged)
         if(!pass) CACHE_ERROR("verify_entry_status failed")
 
         /* Check the entry's 'before evict' count */
-	entry_ptr = &(base_addr[u]);
+    entry_ptr = &(base_addr[u]);
         if(1 != entry_ptr->notify_after_insert_count)
             CACHE_ERROR("invalid notify after insert count")
         if(1 != entry_ptr->notify_before_evict_count)
@@ -33601,7 +33601,7 @@ check_notify_cb(unsigned paged)
         if(!pass) CACHE_ERROR("verify_entry_status failed")
 
         /* Check the entry's 'after insert' count */
-	entry_ptr = &(base_addr[u]);
+    entry_ptr = &(base_addr[u]);
         if(2 != entry_ptr->notify_after_insert_count)
             CACHE_ERROR("invalid notify after insert count")
         if(1 != entry_ptr->notify_before_evict_count)
@@ -33628,7 +33628,7 @@ check_notify_cb(unsigned paged)
         if(!pass) CACHE_ERROR("verify_entry_status failed")
 
         /* Check the entry's 'after insert' count */
-	entry_ptr = &(base_addr[u]);
+    entry_ptr = &(base_addr[u]);
         if(2 != entry_ptr->notify_after_insert_count)
             CACHE_ERROR("invalid notify after insert count")
         if(1 != entry_ptr->notify_before_evict_count)
@@ -33656,7 +33656,7 @@ check_notify_cb(unsigned paged)
         if(!pass) CACHE_ERROR("verify_entry_status failed")
 
         /* Check the entry's 'before evict' count */
-	entry_ptr = &(base_addr[u]);
+    entry_ptr = &(base_addr[u]);
         if(2 != entry_ptr->notify_after_insert_count)
             CACHE_ERROR("invalid notify after insert count")
         if(2 != entry_ptr->notify_before_evict_count)
@@ -33676,18 +33676,18 @@ done:
     return (unsigned)!pass;
 } /* check_notify_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_metadata_cork
+ * Function:    check_metadata_cork
  *
- * Purpose:	To verify that dirty corked entries are not evicted from the cache
- *		but clean corked entries can be evicted from the cache.
- *		The min_clean_size does not have effect.
- *		NOTE: This is a modification of check_metadata_blizzard_absence().
+ * Purpose:    To verify that dirty corked entries are not evicted from the cache
+ *        but clean corked entries can be evicted from the cache.
+ *        The min_clean_size does not have effect.
+ *        NOTE: This is a modification of check_metadata_blizzard_absence().
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Vailin Choi
+ * Programmer:    Vailin Choi
  *
  *-------------------------------------------------------------------------
  */
@@ -33714,158 +33714,158 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
      */
     struct expected_entry_status expected[150] =
     {
-      /* entry			entry		in	at main                                                flush dep flush dep child flush   flush       flush */
-      /* type:		index:	size:		cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order: corked: */
-      { HUGE_ENTRY_TYPE, 0,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 1,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 2,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 3,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 4,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 5,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 6,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 7,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 8,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 9,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 10,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 11,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 12,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 13,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 14,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 15,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 16,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 17,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 18,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 19,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 20,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 21,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 22,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 23,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 24,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 25,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 26,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 27,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 28,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 29,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 30,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 31,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 32,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 33,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 34,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 35,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 36,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 37,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 38,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 39,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 40,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 41,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 42,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 43,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 44,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 45,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 46,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 47,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 48,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 49,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 50,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 51,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 52,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 53,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 54,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 55,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 56,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 57,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 58,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 59,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 60,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 61,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 62,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 63,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 64,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 65,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 66,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 67,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 68,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 69,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 70,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 71,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 72,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 73,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 74,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 75,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 76,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 77,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 78,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 79,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 80,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 81,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 82,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 83,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 84,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 85,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 86,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 87,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 88,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 89,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 90,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 91,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 92,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 93,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 94,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 95,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 96,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 97,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 98,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 99,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 100,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 101,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 102,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 103,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 104,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 105,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 106,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 107,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 108,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 109,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 110,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 111,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 112,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 113,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 114,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 115,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 116,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 117,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 118,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 119,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 120,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 121,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 122,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 123,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 124,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 125,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 126,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 127,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 128,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 129,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 130,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 131,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 132,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 133,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 134,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 135,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 136,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 137,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 138,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 139,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 140,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 141,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 142,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 143,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 144,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 145,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 146,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 147,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 148,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
-      { HUGE_ENTRY_TYPE, 149,	HUGE_ENTRY_SIZE, FALSE,	TRUE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE,	FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
+      /* entry            entry        in    at main                                                flush dep flush dep child flush   flush       flush */
+      /* type:        index:    size:        cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order: corked: */
+      { HUGE_ENTRY_TYPE, 0,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 1,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 2,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 3,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 4,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 5,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 6,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 7,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 8,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 9,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 10,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 11,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 12,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 13,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 14,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 15,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 16,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 17,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 18,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 19,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 20,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 21,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 22,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 23,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 24,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 25,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 26,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 27,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 28,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 29,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 30,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 31,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 32,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 33,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 34,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 35,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 36,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 37,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 38,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 39,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 40,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 41,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 42,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 43,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 44,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 45,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 46,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 47,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 48,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 49,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 50,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 51,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 52,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 53,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 54,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 55,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 56,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 57,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 58,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 59,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 60,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 61,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 62,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 63,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 64,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 65,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 66,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 67,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 68,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 69,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 70,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 71,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 72,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 73,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 74,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 75,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 76,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 77,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 78,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 79,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 80,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 81,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 82,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 83,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 84,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 85,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 86,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 87,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 88,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 89,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 90,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 91,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 92,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 93,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 94,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 95,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 96,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 97,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 98,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 99,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 100,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 101,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 102,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 103,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 104,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 105,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 106,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 107,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 108,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 109,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 110,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 111,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 112,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 113,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 114,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 115,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 116,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 117,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 118,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 119,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 120,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 121,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 122,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 123,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 124,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 125,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 126,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 127,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 128,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 129,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 130,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 131,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 132,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 133,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 134,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 135,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 136,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 137,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 138,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 139,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 140,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 141,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 142,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 143,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 144,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 145,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 146,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 147,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 148,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
+      { HUGE_ENTRY_TYPE, 149,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     } ;
 
     pass = TRUE;
@@ -33912,9 +33912,9 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
      *  Phase 1:
      *
      *    Inserting dirty corked entries into an empty cache, until the cache
-     *    violates the min_clean_size requirement. 
-     *	  Since entries are all dirty and corked, no entry will get flushed or
-     *	  evicted.
+     *    violates the min_clean_size requirement.
+     *      Since entries are all dirty and corked, no entry will get flushed or
+     *      evicted.
      *
      * ========================================================================
      * ========================================================================
@@ -33966,9 +33966,9 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
      *  Phase 2:
      *
      *    Inserting entries into a cache that violates the min_clean_size,
-     *    until the cache is full. 
-     *	  Since entries are all dirty and corked, no entry during this phase 
-     *	  will get flushed or evicted.
+     *    until the cache is full.
+     *      Since entries are all dirty and corked, no entry during this phase
+     *      will get flushed or evicted.
      *
      * ========================================================================
      * ========================================================================
@@ -33997,14 +33997,14 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
          *
          * Expected status is that there are 27 entries in the cache, and
          * all entries remain the same as before since they are all corked
-	 * and dirty
+    * and dirty
          */
 
         /* entry w/ index 26 is now in the cache and dirty. */
-	expected[26].in_cache = TRUE;
-	expected[26].is_dirty = TRUE;
-	expected[26].deserialized = (unsigned char)deserialized;
-	expected[26].is_corked = TRUE;
+    expected[26].in_cache = TRUE;
+    expected[26].is_dirty = TRUE;
+    expected[26].deserialized = (unsigned char)deserialized;
+    expected[26].is_corked = TRUE;
 
         /* verify the status */
         verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -34043,10 +34043,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
          * all entries are dirty corked entries.
          *
          */
-	expected[27].in_cache = TRUE;
-	expected[27].is_dirty = TRUE;
-	expected[27].deserialized = (unsigned char)deserialized;
-	expected[27].is_corked = TRUE;
+    expected[27].in_cache = TRUE;
+    expected[27].is_dirty = TRUE;
+    expected[27].deserialized = (unsigned char)deserialized;
+    expected[27].is_corked = TRUE;
 
         /* verify the status */
         verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -34082,12 +34082,12 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
                                 H5C__DIRTIED_FLAG); /* unsigned int flags */
             }
 
-            /* 
-	     * Expected status: all entries are dirty corked entries.
+            /*
+        * Expected status: all entries are dirty corked entries.
              */
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized = (unsigned char)deserialized;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized = (unsigned char)deserialized;
             expected[entry_idx].is_corked = TRUE;
 
             /* Verify the status */
@@ -34112,8 +34112,8 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     /* ========================================================================
      * ========================================================================
      *  Phase 3:
-     *    Inserting entries into a cache that is completely full. 
-     *	  No entry is flushed or evicted because all entries are dirty & corked.
+     *    Inserting entries into a cache that is completely full.
+     *      No entry is flushed or evicted because all entries are dirty & corked.
      *
      * ========================================================================
      * ========================================================================
@@ -34145,10 +34145,10 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
             }
 
             /* This past inserted entry is now in the cache: dirty and corked */
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized = (unsigned char)deserialized;
-	    expected[entry_idx].is_corked = TRUE;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized = (unsigned char)deserialized;
+        expected[entry_idx].is_corked = TRUE;
 
             /* Verify this expected status */
             verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -34192,7 +34192,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
         verify_clean();
 
         /* Verify the status of the entries.  */
-	/* All entries are flushed, clean but still corked */
+    /* All entries are flushed, clean but still corked */
         for (i = 0; i < 100; i++) {
             expected[i].serialized = TRUE;
             expected[i].is_dirty = FALSE;
@@ -34211,21 +34211,21 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
 
     if(pass) {
 
-	/* Will evict 50 clean "corked" entries all at once when inserting the 100th entry */
-	for(i = 0; i < 51; i++) {
-	    expected[i].in_cache  = FALSE;
-	    expected[i].destroyed = TRUE;
-	    expected[i].is_corked = TRUE;
-	}
+    /* Will evict 50 clean "corked" entries all at once when inserting the 100th entry */
+    for(i = 0; i < 51; i++) {
+        expected[i].in_cache  = FALSE;
+        expected[i].destroyed = TRUE;
+        expected[i].is_corked = TRUE;
+    }
 
-	/* Insert the 100th entry */
-	if(fill_via_insertion) {
+    /* Insert the 100th entry */
+    if(fill_via_insertion) {
                 insert_entry(file_ptr,          /* H5F_t * file_ptr */
                              entry_type,        /* int32_t type */
-                             100,            	/* int32_t idx */
+                             100,                /* int32_t idx */
                              H5C__NO_FLAGS_SET);  /* unsigned int flags */
 
-	} else {
+    } else {
                 protect_entry(file_ptr,   /* H5F_t * file_ptr */
                               entry_type,  /* int32_t type */
                               100);   /* int32-t idx */
@@ -34234,16 +34234,16 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
                                 entry_type,         /* int32_t type */
                                 100,           /* int32_t idx */
                                 H5C__DIRTIED_FLAG); /* unsigned int flags */
-	}
+    }
 
-	/* The 100th inserted entry is now in the cache and dirty */
-	expected[100].in_cache = TRUE;
-	expected[100].is_dirty = TRUE;
-	expected[100].deserialized = (unsigned char)deserialized;
-	expected[100].is_corked = TRUE;
+    /* The 100th inserted entry is now in the cache and dirty */
+    expected[100].in_cache = TRUE;
+    expected[100].is_dirty = TRUE;
+    expected[100].deserialized = (unsigned char)deserialized;
+    expected[100].is_corked = TRUE;
 
-	/* verify the status */
-	verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
+    /* verify the status */
+    verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
                                 100,   /* int tag */
                                 150,       /* int num_entries */
                                 expected); /* struct expected_entry_staus[] */
@@ -34257,13 +34257,13 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     if(pass) {
 
         /* Insert 25 more corked entries (indexes 101 through 125) into the cache. */
-	/* Clean entry will be evicted one a time */
+    /* Clean entry will be evicted one a time */
         for (entry_idx = 101; entry_idx < 126; entry_idx++) {
 
             if(fill_via_insertion) {
                 insert_entry(file_ptr,           /* H5F_t * file_ptr */
                              entry_type,          /* int32_t type */
-                             entry_idx,            	/* int32_t idx */
+                             entry_idx,                /* int32_t idx */
                              H5C__NO_FLAGS_SET);  /* unsigned int flags */
 
             } else {
@@ -34278,21 +34278,21 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
             }
 
             /* The inserted entry is now in the cache and dirty */
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized = (unsigned char)deserialized;
-    	    expected[entry_idx].is_corked = TRUE;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized = (unsigned char)deserialized;
+            expected[entry_idx].is_corked = TRUE;
 
-	    expected[entry_idx - 50].in_cache  = FALSE;
-	    expected[entry_idx - 50].destroyed = TRUE;
-	    expected[entry_idx - 50].is_corked = TRUE;
+        expected[entry_idx - 50].in_cache  = FALSE;
+        expected[entry_idx - 50].destroyed = TRUE;
+        expected[entry_idx - 50].is_corked = TRUE;
 
             /* verify the status */
             verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
                                 entry_idx, /* int tag */
                                 150,       /* int num_entries */
                                 expected); /* struct expected_entry_staus[] */
-	} /* end for */
+    } /* end for */
 
     }
 
@@ -34306,30 +34306,30 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
 
         /* Insert the 127th entry (index = 126) into the cache. */
         if(fill_via_insertion) {
-            insert_entry(file_ptr,           	/* H5F_t * file_ptr */
-                         entry_type,          	/* int32_t type */
-                         126,          		/* int32_t idx */
-                         H5C__NO_FLAGS_SET);  	/* unsigned int flags */
+            insert_entry(file_ptr,               /* H5F_t * file_ptr */
+                         entry_type,              /* int32_t type */
+                         126,                  /* int32_t idx */
+                         H5C__NO_FLAGS_SET);      /* unsigned int flags */
         } else {
-            protect_entry(file_ptr,   	/* H5F_t * file_ptr */
-                          entry_type,  	/* int32_t type */
-                          126);   	/* int32-t idx */
+            protect_entry(file_ptr,       /* H5F_t * file_ptr */
+                          entry_type,      /* int32_t type */
+                          126);       /* int32-t idx */
 
-            unprotect_entry(file_ptr,          	/* H5F_t * file_ptr */
+            unprotect_entry(file_ptr,              /* H5F_t * file_ptr */
                             entry_type,         /* int32_t type */
-                            126,           	/* int32_t idx */
+                            126,               /* int32_t idx */
                             H5C__DIRTIED_FLAG); /* unsigned int flags */
         }
 
         /* Verify the status of the entries.  */
-	expected[126].in_cache = TRUE;
-	expected[126].is_dirty = TRUE;
-	expected[126].deserialized = (unsigned char)deserialized;
-	expected[126].is_corked = TRUE;
+    expected[126].in_cache = TRUE;
+    expected[126].is_dirty = TRUE;
+    expected[126].deserialized = (unsigned char)deserialized;
+    expected[126].is_corked = TRUE;
 
-	expected[126 - 50].in_cache  = FALSE;
-	expected[126 - 50].destroyed = TRUE;
-	expected[126 - 50].is_corked = TRUE;
+    expected[126 - 50].in_cache  = FALSE;
+    expected[126 - 50].destroyed = TRUE;
+    expected[126 - 50].is_corked = TRUE;
 
         /* verify the status */
         verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -34367,15 +34367,15 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
             }
 
             /* This past inserted entry is now in the cache, dirty and corked */
-	    expected[entry_idx].in_cache = TRUE;
-    	    expected[entry_idx].is_dirty = TRUE;
-	    expected[entry_idx].deserialized = (unsigned char)deserialized;
-    	    expected[entry_idx].is_corked = TRUE;
+        expected[entry_idx].in_cache = TRUE;
+            expected[entry_idx].is_dirty = TRUE;
+        expected[entry_idx].deserialized = (unsigned char)deserialized;
+            expected[entry_idx].is_corked = TRUE;
 
-	    /* Entry that is 50 entries away will be evicted since it is clean even though corked */
-	    expected[entry_idx - 50].in_cache  = FALSE;
-	    expected[entry_idx - 50].destroyed = TRUE;
-	    expected[entry_idx - 50].is_corked = TRUE;
+        /* Entry that is 50 entries away will be evicted since it is clean even though corked */
+        expected[entry_idx - 50].in_cache  = FALSE;
+        expected[entry_idx - 50].destroyed = TRUE;
+        expected[entry_idx - 50].is_corked = TRUE;
 
             /* verify the status */
             verify_entry_status(cache_ptr, /* H5C_t * cache_ptr */
@@ -34405,34 +34405,34 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
 
 } /* check_metadata_cork() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_entry_deletions_during_scans()
+ * Function:    check_entry_deletions_during_scans()
  *
- * Purpose:	With the addition of the H5C__TAKE_OWNERSHIP_FLAG, it is 
- *		possible for an entry to be removed from the cache as a 
- *		side effect of flushing an entry.  
+ * Purpose:    With the addition of the H5C__TAKE_OWNERSHIP_FLAG, it is
+ *        possible for an entry to be removed from the cache as a
+ *        side effect of flushing an entry.
  *
- *		For the most part, this doesn't cause problems.  However, 
- *		during the scans of lists, it is possible that the entry 
- *		removed will be the next entry in the scan -- which if not 
- *		detected, will typeically cause the cache to attempt to flush
- *		an entry that is no longer in the cache, and which may have
- *		been deleted.
+ *        For the most part, this doesn't cause problems.  However,
+ *        during the scans of lists, it is possible that the entry
+ *        removed will be the next entry in the scan -- which if not
+ *        detected, will typeically cause the cache to attempt to flush
+ *        an entry that is no longer in the cache, and which may have
+ *        been deleted.
  *
- *		This function contans tests for correct handling on this 
- *		situation.
+ *        This function contans tests for correct handling on this
+ *        situation.
  *
  *              Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/3/15
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -34460,9 +34460,9 @@ check_entry_deletions_during_scans(unsigned paged)
         file_ptr = setup_cache((size_t)(2 * 1024 * 1024), (size_t)(1 * 1024 * 1024), paged);
     }
 
-    /* run the tests.  This set of tests is somewhat eclectic, as 
-     * we are trying to test all locations where the deletion of 
-     * an entry from the cache as a side effect of the fluch of 
+    /* run the tests.  This set of tests is somewhat eclectic, as
+     * we are trying to test all locations where the deletion of
+     * an entry from the cache as a side effect of the fluch of
      * a different entry could cause problems.
      */
 
@@ -34502,32 +34502,32 @@ check_entry_deletions_during_scans(unsigned paged)
 
 } /* check_entry_deletions_during_scans() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cedds__expunge_dirty_entry_in_flush_test()
+ * Function:    cedds__expunge_dirty_entry_in_flush_test()
  *
- * Purpose:	Verify that H5C_flush_cache() can handle the removal of 
- *		a dirty entry from the cache during its scan of the 
- *		skip list.
+ * Purpose:    Verify that H5C_flush_cache() can handle the removal of
+ *        a dirty entry from the cache during its scan of the
+ *        skip list.
  *
- *		Do this by setting up a full cache, with the last entry 
- *		on the LRU being both dirty and having a flush operation 
- *		that deletes the second to last entry on the LRU.  Then 
- *		flush the cache, triggering the flush of the last
- *		item, and thereby the deletion of the second to last item.
+ *        Do this by setting up a full cache, with the last entry
+ *        on the LRU being both dirty and having a flush operation
+ *        that deletes the second to last entry on the LRU.  Then
+ *        flush the cache, triggering the flush of the last
+ *        item, and thereby the deletion of the second to last item.
  *
- *		H5C_flush_cache() should handle this deletion gracefully.
+ *        H5C_flush_cache() should handle this deletion gracefully.
  *
  *              Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/4/15
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -34536,8 +34536,8 @@ static void
 cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
 {
     H5C_t *        cache_ptr = file_ptr->shared->cache;
-    int		   i;
-    herr_t	   result;
+    int           i;
+    herr_t       result;
     struct expected_entry_status expected[36] =
     {
       /* the expected array is used to maintain a table of the expected status of every
@@ -34545,12 +34545,12 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
        * array only processes as much of it as it is told to, we don't have to
        * worry about maintaining the status of entries that we haven't used yet.
        */
-      /* entry			entry				in	at main                                               	flush dep flush dep child flush   flush       flush */
-      /* type:			index:	size:			cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest: 	par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
-      { HUGE_ENTRY_TYPE, 	0,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { HUGE_ENTRY_TYPE, 	1,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { HUGE_ENTRY_TYPE, 	2,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { HUGE_ENTRY_TYPE, 	3,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE}
+      /* entry            entry                in    at main                                                   flush dep flush dep child flush   flush       flush */
+      /* type:            index:    size:            cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:     par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
+      { HUGE_ENTRY_TYPE,     0,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { HUGE_ENTRY_TYPE,     1,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { HUGE_ENTRY_TYPE,     2,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { HUGE_ENTRY_TYPE,     3,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE}
     };
 
     if(pass) {
@@ -34569,15 +34569,15 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
         else if((cache_ptr->max_cache_size != (2 * 1024 * 1024)) ||
                   (cache_ptr->min_clean_size != (1 * 1024 * 1024))) {
 
-	    pass = FALSE;
-	    failure_mssg =
-	        "unexpected cache config at start of cedds expunge dirty entry in flush test.";
+        pass = FALSE;
+        failure_mssg =
+            "unexpected cache config at start of cedds expunge dirty entry in flush test.";
 
         } else {
 
             /* set min clean size to zero for this test as it simplifies
-	     * computing the expected cache size after each operation.
-	     */
+        * computing the expected cache size after each operation.
+        */
 
             cache_ptr->min_clean_size = 0;
         }
@@ -34585,50 +34585,50 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* The basic idea of this test is to setup the cache such 
- 	 * that:
- 	 * 
-	 * 1) the cache contains several dirty entries.
-	 * 
-	 * 2) the first entry on the slist is dirty, and has a flush
-	 *    operation that will remove the second entry on the 
+    /* The basic idea of this test is to setup the cache such
+    * that:
+    *
+    * 1) the cache contains several dirty entries.
+    *
+    * 2) the first entry on the slist is dirty, and has a flush
+    *    operation that will remove the second entry on the
          *    slist.
          *
-         * Then load flush the cache.  Cache should handle the 
-	 * removal of the next entry in the slist scan gracefully.
+         * Then load flush the cache.  Cache should handle the
+    * removal of the next entry in the slist scan gracefully.
          */
 
-	/* reset the stats before we start.  If stats are enabled, we will
-	 * check to see if they are as expected at the end.
-	 */
-	H5C_stats__reset(cache_ptr);
+    /* reset the stats before we start.  If stats are enabled, we will
+    * check to see if they are as expected at the end.
+    */
+    H5C_stats__reset(cache_ptr);
 
 
-	/* Load four huge entries into the cache.  Recall that huge entries
+    /* Load four huge entries into the cache.  Recall that huge entries
          * are one fourth the size of monster entries (16 KB vs. 64 KB).
          */
-	for (i = 0; i < 4; i++) {
+    for (i = 0; i < 4; i++) {
 
-	    protect_entry(file_ptr, HUGE_ENTRY_TYPE, i);
-	    unprotect_entry(file_ptr, HUGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
+        protect_entry(file_ptr, HUGE_ENTRY_TYPE, i);
+        unprotect_entry(file_ptr, HUGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
         }
 
-	if((cache_ptr->index_len != 4) ||
+    if((cache_ptr->index_len != 4) ||
              (cache_ptr->index_size != (4 * HUGE_ENTRY_SIZE))) {
 
             pass = FALSE;
 
-	    failure_mssg = "unexpected size/len in cedds expunge dirty entry in flush test (1)";
-	}
+        failure_mssg = "unexpected size/len in cedds expunge dirty entry in flush test (1)";
+    }
     }
 
     if(pass) {
 
-	/* Next, set up the flush operation:
-	 *
-	 *     (HET, 0) expunges (HET, 1)
-	 *
-	 */
+    /* Next, set up the flush operation:
+    *
+    *     (HET, 0) expunges (HET, 1)
+    *
+    */
         add_flush_op(HUGE_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE,
                      HUGE_ENTRY_TYPE, 1, FALSE, (size_t)0, NULL);
 
@@ -34636,27 +34636,27 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* to summarize, at present the following entries
-	 * are in cache with the following characteristics:
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (HET, 0) 	Y	16 KB	Y	N	-	expunge (HET 1)
-	 *
-	 * (HET, 1)	Y	16 KB	Y	N	-	-
+    /* to summarize, at present the following entries
+    * are in cache with the following characteristics:
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (HET, 0)     Y    16 KB    Y    N    -    expunge (HET 1)
+    *
+    * (HET, 1)    Y    16 KB    Y    N    -    -
          *
-	 * (HET, 2)	Y	16 KB	Y	N	-	-
+    * (HET, 2)    Y    16 KB    Y    N    -    -
          *
-	 * (HET, 3)	Y	16 KB	Y	N	-	-
-	 *
-	 * Recall that in this test bed, flush operations are excuted the
-	 * first time the associated entry is flushed, and are then
-	 * deleted.
-	 */
+    * (HET, 3)    Y    16 KB    Y    N    -    -
+    *
+    * Recall that in this test bed, flush operations are excuted the
+    * first time the associated entry is flushed, and are then
+    * deleted.
+    */
 
-	/* verify the expected status of all entries we have loaded to date: */
-	verify_entry_status(cache_ptr, 0, 4, expected);
+    /* verify the expected status of all entries we have loaded to date: */
+    verify_entry_status(cache_ptr, 0, 4, expected);
     }
 
     /* flush the cache to run the test.  In the process, clean up after test. */
@@ -34684,7 +34684,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
      * values.
      */
     if(pass)
-	if((cache_ptr->insertions[HUGE_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[HUGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[HUGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[HUGE_ENTRY_TYPE] != 1) ||
              (cache_ptr->flushes[HUGE_ENTRY_TYPE] != 3) ||
@@ -34708,7 +34708,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
         } /* end if */
 
     if(pass)
-	if((cache_ptr->slist_scan_restarts != 1) ||
+    if((cache_ptr->slist_scan_restarts != 1) ||
              (cache_ptr->LRU_scan_restarts != 0) ||
              (cache_ptr->index_scan_restarts != 0)) {
             pass = FALSE;
@@ -34727,34 +34727,34 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
 
 } /* cedds__expunge_dirty_entry_in_flush_test() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cedds__H5C_make_space_in_cache()
+ * Function:    cedds__H5C_make_space_in_cache()
  *
- * Purpose:	Verify that H5C__make_space_in_cache() can handle the 
- *		removal from the cache of the next item in its reverse scan
- *		of the LRU list.  
+ * Purpose:    Verify that H5C__make_space_in_cache() can handle the
+ *        removal from the cache of the next item in its reverse scan
+ *        of the LRU list.
  *
- *		Do this by setting up a full cache, with the last entry 
- *		on the LRU being both dirty and having a flush operation 
- *		that deleted the second to last entry on the LRU.  Then 
- *		load an additional entry, triggering the flush of the last
- *		item, and thereby the deletion of the second to last item.
+ *        Do this by setting up a full cache, with the last entry
+ *        on the LRU being both dirty and having a flush operation
+ *        that deleted the second to last entry on the LRU.  Then
+ *        load an additional entry, triggering the flush of the last
+ *        item, and thereby the deletion of the second to last item.
  *
- *		H5C__make_space_in_cache() should detect this deletion, and 
- *		restart its scan of the LRU from the tail, instead of 
- *		examining the now deleted next item up on the LRU.
+ *        H5C__make_space_in_cache() should detect this deletion, and
+ *        restart its scan of the LRU from the tail, instead of
+ *        examining the now deleted next item up on the LRU.
  *
  *              Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/4/15
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -34763,10 +34763,10 @@ static void
 cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
 {
     H5C_t *        cache_ptr = file_ptr->shared->cache;
-    int		   i;
-    const int	   num_huge_entries = 4;
-    const int	   num_monster_entries = 32;
-    herr_t	   result;
+    int           i;
+    const int       num_huge_entries = 4;
+    const int       num_monster_entries = 32;
+    herr_t       result;
     struct expected_entry_status expected[36] =
     {
       /* the expected array is used to maintain a table of the expected status of every
@@ -34774,44 +34774,44 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
        * array only processes as much of it as it is told to, we don't have to
        * worry about maintaining the status of entries that we haven't used yet.
        */
-      /* entry			entry				in	at main                                                flush dep flush dep child flush   flush       flush */
-      /* type:			index:	size:			cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
-      { HUGE_ENTRY_TYPE, 	0,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { HUGE_ENTRY_TYPE, 	1,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { HUGE_ENTRY_TYPE, 	2,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { HUGE_ENTRY_TYPE, 	3,	HUGE_ENTRY_SIZE, 	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	0,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	1,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	2,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	3,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	4,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	5,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	6,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	7,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	8,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	9,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	10,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	11,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	12,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	13,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	14,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	15,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	16,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	17,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	18,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	19,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	20,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	21,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	22,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	23,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	24,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	25,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	26,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	27,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	28,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	29,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	30,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	31,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      /* entry            entry                in    at main                                                flush dep flush dep child flush   flush       flush */
+      /* type:            index:    size:            cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
+      { HUGE_ENTRY_TYPE,     0,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { HUGE_ENTRY_TYPE,     1,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { HUGE_ENTRY_TYPE,     2,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { HUGE_ENTRY_TYPE,     3,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    0,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    1,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    2,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    3,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    4,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    5,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    6,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    7,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    8,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    9,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    10,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    11,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    12,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    13,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    14,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    15,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    16,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    17,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    18,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    19,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    20,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    21,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    22,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    23,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    24,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    25,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    26,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    27,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    28,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    29,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    30,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    31,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
     };
 
     if(pass) {
@@ -34830,15 +34830,15 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
         else if((cache_ptr->max_cache_size != (2 * 1024 * 1024)) ||
                   (cache_ptr->min_clean_size != (1 * 1024 * 1024))) {
 
-	    pass = FALSE;
-	    failure_mssg =
-	        "unexpected cache config at start of cedds H5C__make_space_in_cache() test.";
+        pass = FALSE;
+        failure_mssg =
+            "unexpected cache config at start of cedds H5C__make_space_in_cache() test.";
 
         } else {
 
             /* set min clean size to zero for this test as it simplifies
-	     * computing the expected cache size after each operation.
-	     */
+        * computing the expected cache size after each operation.
+        */
 
             cache_ptr->min_clean_size = 0;
         }
@@ -34846,54 +34846,54 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* The basic idea of this test is to setup the cache such 
- 	 * that:
- 	 * 
-	 * 1) the cache is full
-	 * 
-	 * 2) the last entry on the LRU is dirty, and has a flush
-	 *    operation that will remove the second to last entry 
+    /* The basic idea of this test is to setup the cache such
+    * that:
+    *
+    * 1) the cache is full
+    *
+    * 2) the last entry on the LRU is dirty, and has a flush
+    *    operation that will remove the second to last entry
          *    on the LRU from the cache.
          *
-         * Then load another entry into the cache.  See if 
-	 * H5C__make_space_in_cache() detects the removal of 
-	 * the next item in the scan, and restarts the scan 
-         * from the bottom of the LRU.  Note that the newly 
+         * Then load another entry into the cache.  See if
+    * H5C__make_space_in_cache() detects the removal of
+    * the next item in the scan, and restarts the scan
+         * from the bottom of the LRU.  Note that the newly
          * loaded entry must be large enough to require that
          * the scan continue after the entry is expunged.
          */
 
-	/* reset the stats before we start.  If stats are enabled, we will
-	 * check to see if they are as expected at the end.
-	 */
-	H5C_stats__reset(cache_ptr);
+    /* reset the stats before we start.  If stats are enabled, we will
+    * check to see if they are as expected at the end.
+    */
+    H5C_stats__reset(cache_ptr);
 
 
-	/* Load four huge entries into the cache.  Recall that huge entries
+    /* Load four huge entries into the cache.  Recall that huge entries
          * are one fourth the size of monster entries (16 KB vs. 64 KB).
          */
-	for (i = 0; i < 4; i++) {
+    for (i = 0; i < 4; i++) {
 
-	    protect_entry(file_ptr, HUGE_ENTRY_TYPE, i);
-	    unprotect_entry(file_ptr, HUGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
+        protect_entry(file_ptr, HUGE_ENTRY_TYPE, i);
+        unprotect_entry(file_ptr, HUGE_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
         }
 
-	if((cache_ptr->index_len != 4) ||
+    if((cache_ptr->index_len != 4) ||
              (cache_ptr->index_size != (4 * HUGE_ENTRY_SIZE))) {
 
             pass = FALSE;
 
-	    failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (1)";
-	}
+        failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (1)";
+    }
     }
 
     if(pass) {
 
-	/* Next, set up the flush operation:
-	 *
-	 *     (HET, 0) expunges (HET, 1)
-	 *
-	 */
+    /* Next, set up the flush operation:
+    *
+    *     (HET, 0) expunges (HET, 1)
+    *
+    */
         add_flush_op(HUGE_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE,
                      HUGE_ENTRY_TYPE, 1, FALSE, (size_t)0, NULL);
 
@@ -34901,62 +34901,62 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* to summarize, at present the following entries
-	 * are in cache with the following characteristics:
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (HET, 0) 	Y	16 KB	Y	N	-	expunge (HET 1)
-	 *
-	 * (HET, 1)	Y	16 KB	N	N	-	-
+    /* to summarize, at present the following entries
+    * are in cache with the following characteristics:
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (HET, 0)     Y    16 KB    Y    N    -    expunge (HET 1)
+    *
+    * (HET, 1)    Y    16 KB    N    N    -    -
          *
-	 * (HET, 2)	Y	16 KB	N	N	-	-
+    * (HET, 2)    Y    16 KB    N    N    -    -
          *
-	 * (HET, 3)	Y	16 KB	N	N	-	-
-	 *
-	 * Recall that in this test bed, flush operations are excuted the
-	 * first time the associated entry is flushed, and are then
-	 * deleted.
-	 */
+    * (HET, 3)    Y    16 KB    N    N    -    -
+    *
+    * Recall that in this test bed, flush operations are excuted the
+    * first time the associated entry is flushed, and are then
+    * deleted.
+    */
 
         /* Now fill up the cache with other, unrelated entries.  Recall
          * that the cache size is 2 MB and 31 * 64 KB  + 4 * 16 KP == 2 MB.
          */
-	for (i = 0; i < 31; i++)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    for (i = 0; i < 31; i++)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__DIRTIED_FLAG);
-	}
+    }
 
-	/* The cache should now be exactly full */
-	if((cache_ptr->index_len != 35) ||
+    /* The cache should now be exactly full */
+    if((cache_ptr->index_len != 35) ||
              (cache_ptr->index_size != 2 * 1024 * 1024) ||
-	     (cache_ptr->index_size != ((4 * HUGE_ENTRY_SIZE) +
+        (cache_ptr->index_size != ((4 * HUGE_ENTRY_SIZE) +
                                          (31 * MONSTER_ENTRY_SIZE)))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (2)";
+        failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (2)";
 
-	} else {
+    } else {
 
-	    /* verify the expected status of all entries we have loaded to date: */
-	    verify_entry_status(cache_ptr, 0, 35, expected);
-	}
+        /* verify the expected status of all entries we have loaded to date: */
+        verify_entry_status(cache_ptr, 0, 35, expected);
+    }
     }
 
     if(pass) {
 
-        /* now load another monster entry.  This should cause 
- 	 * H5C__make_space_in_cache() to be called.  (HET 0) is dirty, and is at 
-	 * the bottom of the LRU.  * Thus it will be flushed, and moved to the 
-	 * head of the LRU.  However, during the flush, (HET 1) should be expunged 
-	 * from the cache.  Since (MET 1) is the next item in 
-	 * H5C__make_space_in_cache(), must detect its removal from the cache,
+        /* now load another monster entry.  This should cause
+    * H5C__make_space_in_cache() to be called.  (HET 0) is dirty, and is at
+    * the bottom of the LRU.  * Thus it will be flushed, and moved to the
+    * head of the LRU.  However, during the flush, (HET 1) should be expunged
+    * from the cache.  Since (MET 1) is the next item in
+    * H5C__make_space_in_cache(), must detect its removal from the cache,
          * and refrain from trying to flush it.
          *
          * Since all entries in the cache are dirty, all entries will be flushed,
-         * and HET 0, 2, and 3 will be evicted to make room for the new 
+         * and HET 0, 2, and 3 will be evicted to make room for the new
          * monster entry (MET, 31).
          *
          * Verify this.  If H5C__make_space_in_cache() chokes, failure will
@@ -34969,45 +34969,45 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-        /* if the protect succeeded, unprotect and verify that all is at 
+        /* if the protect succeeded, unprotect and verify that all is at
          * it should be.
          */
 
         unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 31, H5C__DIRTIED_FLAG);
 
-	/* The cache should now be exactly full */
-	if((cache_ptr->index_len != 32) ||
+    /* The cache should now be exactly full */
+    if((cache_ptr->index_len != 32) ||
              (cache_ptr->index_size != 2 * 1024 * 1024) ||
-	     (cache_ptr->index_size != (32 * MONSTER_ENTRY_SIZE))) {
+        (cache_ptr->index_size != (32 * MONSTER_ENTRY_SIZE))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (3)";
+        failure_mssg = "unexpected size/len in H5C__make_space_in_cache() test (3)";
 
-	} else {
+    } else {
 
-	    /* modify the expected table to match the new situation, and 
+        /* modify the expected table to match the new situation, and
              * then call verify_entry_status().
              */
             for (i = 0; i < num_huge_entries; i++)
             {
-		expected[i].in_cache = FALSE;
-		expected[i].is_dirty = FALSE;
-		expected[i].serialized = TRUE;
-	        expected[i].destroyed = TRUE;
+        expected[i].in_cache = FALSE;
+        expected[i].is_dirty = FALSE;
+        expected[i].serialized = TRUE;
+            expected[i].destroyed = TRUE;
             }
 
             /* (HET, 1) was expunged, so touch its entry up accordingly */
-	    expected[1].is_dirty = TRUE;
-	    expected[1].serialized = FALSE;
+        expected[1].is_dirty = TRUE;
+        expected[1].serialized = FALSE;
 
             for (i = num_huge_entries; i < num_huge_entries + num_monster_entries - 1; i++)
             {
-		expected[i].is_dirty = FALSE;
-		expected[i].serialized = TRUE;
+        expected[i].is_dirty = FALSE;
+        expected[i].serialized = TRUE;
             }
 
-	    /* verify the expected status of all entries: */
-	    verify_entry_status(cache_ptr, 0, 36, expected);
+        /* verify the expected status of all entries: */
+        verify_entry_status(cache_ptr, 0, 36, expected);
         }
     }
 
@@ -35038,7 +35038,7 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-	if((cache_ptr->insertions[HUGE_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[HUGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[HUGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[HUGE_ENTRY_TYPE] != 1) ||
              (cache_ptr->flushes[HUGE_ENTRY_TYPE] != 3) ||
@@ -35063,7 +35063,7 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
     }
 
     if(pass)
-	if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->flushes[MONSTER_ENTRY_TYPE] != 32) ||
@@ -35087,7 +35087,7 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
         } /* end if */
 
     if(pass)
-	if((cache_ptr->slist_scan_restarts != 0) ||
+    if((cache_ptr->slist_scan_restarts != 0) ||
              (cache_ptr->LRU_scan_restarts != 1) ||
              (cache_ptr->index_scan_restarts != 0)) {
 
@@ -35108,34 +35108,34 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
 
 } /* cedds__H5C_make_space_in_cache() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cedds__H5C__autoadjust__ageout__evict_aged_out_entries()
+ * Function:    cedds__H5C__autoadjust__ageout__evict_aged_out_entries()
  *
- * Purpose:	Verify that H5C__autoadjust__ageout__evict_aged_out_entries() 
- *		can handle the removal from the cache of the next item in 
- *		its reverse scan of the LRU list.  
+ * Purpose:    Verify that H5C__autoadjust__ageout__evict_aged_out_entries()
+ *        can handle the removal from the cache of the next item in
+ *        its reverse scan of the LRU list.
  *
- *		Do this by setting up a full cache, with the last entry 
- *		on the LRU being both dirty and having a flush operation 
- *		that deletes the second to last entry on the LRU.  Then 
- *		access the first item in the LRU repeatedly until the 
- *		item, and thereby the deletion of the second to last item.
+ *        Do this by setting up a full cache, with the last entry
+ *        on the LRU being both dirty and having a flush operation
+ *        that deletes the second to last entry on the LRU.  Then
+ *        access the first item in the LRU repeatedly until the
+ *        item, and thereby the deletion of the second to last item.
  *
- *		H5C__make_space_in_cache() should detect this deletion, and 
- *		restart its scan of the LRU from the tail, instead of 
- *		examining the now deleted next item up on the LRU.
+ *        H5C__make_space_in_cache() should detect this deletion, and
+ *        restart its scan of the LRU from the tail, instead of
+ *        examining the now deleted next item up on the LRU.
  *
  *              Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/4/15
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -35144,8 +35144,8 @@ static void
 cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
 {
     H5C_t *        cache_ptr = file_ptr->shared->cache;
-    int		   i;
-    herr_t	   result;
+    int           i;
+    herr_t       result;
     struct expected_entry_status expected[36] =
     {
       /* the expected array is used to maintain a table of the expected status of every
@@ -35153,40 +35153,40 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
        * array only processes as much of it as it is told to, we don't have to
        * worry about maintaining the status of entries that we haven't used yet.
        */
-      /* entry			entry				in	at main                                                flush dep flush dep child flush   flush       flush */
-      /* type:			index:	size:			cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
-      { MONSTER_ENTRY_TYPE,	0,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	1,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	2,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},	
-      { MONSTER_ENTRY_TYPE,	3,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	4,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	5,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	6,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	7,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	8,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	9,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	10,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	11,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	12,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	13,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	14,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	15,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	16,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	17,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	18,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	19,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	20,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	21,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	22,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	23,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	24,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	25,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	26,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	27,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	28,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	29,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	30,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	31,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      /* entry            entry                in    at main                                                flush dep flush dep child flush   flush       flush */
+      /* type:            index:    size:            cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
+      { MONSTER_ENTRY_TYPE,    0,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    1,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    2,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    3,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    4,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    5,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    6,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    7,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    8,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    9,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    10,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    11,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    12,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    13,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    14,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    15,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    16,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    17,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    18,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    19,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    20,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    21,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    22,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    23,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    24,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    25,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    26,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    27,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    28,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    29,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    30,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,    31,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
     };
     H5C_auto_size_ctl_t saved_auto_size_ctl;
     H5C_auto_size_ctl_t test_auto_size_ctl =
@@ -35215,9 +35215,9 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
         /* enum H5C_cache_flash_incr_mode       */
-	/*                    flash_incr_mode = */ H5C_flash_incr__off,
-	/* double      flash_multiple         = */ 2.0f,
-	/* double      flash_threshold        = */ 0.5f,
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
 
 
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
@@ -35251,15 +35251,15 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
         else if((cache_ptr->max_cache_size != (2 * 1024 * 1024)) ||
                   (cache_ptr->min_clean_size != (1 * 1024 * 1024))) {
 
-	    pass = FALSE;
-	    failure_mssg =
-	        "unexpected cache config at start of cedds H5C__autoadjust__ageout__evict_aged_out_entries() test.";
+        pass = FALSE;
+        failure_mssg =
+            "unexpected cache config at start of cedds H5C__autoadjust__ageout__evict_aged_out_entries() test.";
 
         } else {
 
             /* set min clean size to zero for this test as it simplifies
-	     * computing the expected cache size after each operation.
-	     */
+        * computing the expected cache size after each operation.
+        */
 
             cache_ptr->min_clean_size = 0;
         }
@@ -35295,49 +35295,49 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* The basic idea of this test is to setup the cache such 
- 	 * that:
- 	 * 
-	 * 1) the cache is full
-	 * 
-	 * 2) the last entry on the LRU is dirty, and has a flush
-	 *    operation that will remove the second to last entry 
+    /* The basic idea of this test is to setup the cache such
+    * that:
+    *
+    * 1) the cache is full
+    *
+    * 2) the last entry on the LRU is dirty, and has a flush
+    *    operation that will remove the second to last entry
          *    on the LRU from the cache.
          *
          * Then access the first item in the LRU until the epoch
-	 * and H5C__autoadjust__ageout__evict_aged_out_entries()
-         * is invoked.  Verify that the function deals with the 
-	 * deletion of the next item in its scan cleanly.
+    * and H5C__autoadjust__ageout__evict_aged_out_entries()
+         * is invoked.  Verify that the function deals with the
+    * deletion of the next item in its scan cleanly.
          */
 
-	/* reset the stats before we start.  If stats are enabled, we will
-	 * check to see if they are as expected at the end.
-	 */
-	H5C_stats__reset(cache_ptr);
+    /* reset the stats before we start.  If stats are enabled, we will
+    * check to see if they are as expected at the end.
+    */
+    H5C_stats__reset(cache_ptr);
 
 
         /* load the first entry -- mark it dirty */
-	protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0);
-	unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0, H5C__DIRTIED_FLAG);
+    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0);
+    unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0, H5C__DIRTIED_FLAG);
 
-        /* Then load the rest of the entries to fill the cache: 
+        /* Then load the rest of the entries to fill the cache:
          *
          * Recall that the cache size is 2 MB and 32 * 64 KB == 2 MB.
          */
-	for (i = 1; i < 32; i++)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    for (i = 1; i < 32; i++)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__NO_FLAGS_SET);
-	}
+    }
     }
 
     if(pass) {
 
-	/* Next, set up the flush operation:
-	 *
-	 *     (MET, 0) expunges (MET, 1)
-	 *
-	 */
+    /* Next, set up the flush operation:
+    *
+    *     (MET, 0) expunges (MET, 1)
+    *
+    */
         add_flush_op(MONSTER_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE,
                      MONSTER_ENTRY_TYPE, 1, FALSE, (size_t)0, NULL);
 
@@ -35345,34 +35345,34 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* to summarize, at present the following entries
-	 * are in cache with the following characteristics:
-	 *
-	 * 		in
-	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 *
-	 * (MET, 0) 	Y	64 KB	Y	N	-	expunge (MET 1)
-	 *
-	 * (MET, 1-31)	Y	64 KB	N	N	-	-
-	 *
-	 * Recall that in this test bed, flush operations are excuted the
-	 * first time the associated entry is flushed, and are then
-	 * deleted.
-	 */
+    /* to summarize, at present the following entries
+    * are in cache with the following characteristics:
+    *
+    *         in
+    * entry:    cache?    size:    dirty?    pinned?    pins:    flush operations:
+    *
+    * (MET, 0)     Y    64 KB    Y    N    -    expunge (MET 1)
+    *
+    * (MET, 1-31)    Y    64 KB    N    N    -    -
+    *
+    * Recall that in this test bed, flush operations are excuted the
+    * first time the associated entry is flushed, and are then
+    * deleted.
+    */
 
-	/* The cache should now be exactly full */
-	if((cache_ptr->index_len != 32) ||
+    /* The cache should now be exactly full */
+    if((cache_ptr->index_len != 32) ||
              (cache_ptr->index_size != 2 * 1024 * 1024) ||
-	     (cache_ptr->index_size != (32 * MONSTER_ENTRY_SIZE))) {
+        (cache_ptr->index_size != (32 * MONSTER_ENTRY_SIZE))) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in H5C__autoadjust__ageout__evict_aged_out_entries() test (1)";
+        failure_mssg = "unexpected size/len in H5C__autoadjust__ageout__evict_aged_out_entries() test (1)";
 
-	} else {
+    } else {
 
-	    /* verify the expected status of all entries we have loaded to date: */
-	    verify_entry_status(cache_ptr, 0, 32, expected);
-	}
+        /* verify the expected status of all entries we have loaded to date: */
+        verify_entry_status(cache_ptr, 0, 32, expected);
+    }
     }
 
     /* protect and unprotect (MET, 31) repeatedly until the end of the first epoch */
@@ -35398,38 +35398,38 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
         unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 31, H5C__NO_FLAGS_SET);
     }
 
-    /* at this point, only (MET, 0) and (MET, 31) should remain in the cache, 
-     * all other entries having been evicted by the ageout adaptive cache 
-     * resizing algorithm. (Since (MET, 0) was dirty, it was flushed and 
+    /* at this point, only (MET, 0) and (MET, 31) should remain in the cache,
+     * all other entries having been evicted by the ageout adaptive cache
+     * resizing algorithm. (Since (MET, 0) was dirty, it was flushed and
      * moved to the head of the LRU by the ageout algorithm.)
      */
 
     if(pass) {
 
-	if((cache_ptr->index_len != 2) ||
+    if((cache_ptr->index_len != 2) ||
              (cache_ptr->index_size != 2 * MONSTER_ENTRY_SIZE)) {
 
             pass = FALSE;
-	    failure_mssg = "unexpected size/len in H5C__autoadjust__ageout__evict_aged_out_entries() test (2)";
+        failure_mssg = "unexpected size/len in H5C__autoadjust__ageout__evict_aged_out_entries() test (2)";
 
-	} else {
+    } else {
 
-            /* update the expected table to reflect the expected values at 
+            /* update the expected table to reflect the expected values at
              * this point, and then verify.
              */
 
             expected[0].is_dirty = FALSE;
-	    expected[0].serialized = TRUE;
+        expected[0].serialized = TRUE;
 
             for (i = 1; i < 31; i++)
             {
-		expected[i].in_cache = FALSE;
-		expected[i].is_dirty = FALSE;
-	        expected[i].destroyed = TRUE;
+        expected[i].in_cache = FALSE;
+        expected[i].is_dirty = FALSE;
+            expected[i].destroyed = TRUE;
             }
 
-	    verify_entry_status(cache_ptr, 0, 32, expected);
-	}
+        verify_entry_status(cache_ptr, 0, 32, expected);
+    }
     }
 
     /* restore the initial resize configuration */
@@ -35473,7 +35473,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
      */
 
     if(pass)
-	if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->flushes[MONSTER_ENTRY_TYPE] != 1) ||
@@ -35497,7 +35497,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
         } /* end if */
 
     if(pass)
-	if((cache_ptr->slist_scan_restarts != 0) ||
+    if((cache_ptr->slist_scan_restarts != 0) ||
              (cache_ptr->LRU_scan_restarts != 1) ||
              (cache_ptr->index_scan_restarts != 0)) {
 
@@ -35518,95 +35518,95 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
 
 } /* cedds__H5C__autoadjust__ageout__evict_aged_out_entries() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cedds__H5C_flush_invalidate_cache__bucket_scan()
- *
- * Purpose:	Note:  	We now use the index list when we scan the 
- *			contents of the metadata cache, so in principal,
- *			this test is obsolete.  However, even using the
- *			index list, restarts are possible, and must be 
- *			handled gracefully.
- *
- *			As it turns out, this test triggers index list
- *			scan restarts, and thus with minor changes is 
- *			still a useful test.
- * 
- *			For this reason, with the exception of changing
- *			to check the index_scan_restart stat instead of 
- *			hash bucket restarts, I'm leaving the test 
- *			alone.  If and when it starts to fail due to
- *			other changes, we can re-work it to test 
- *			index list scan restarts explicitly.
- *
- *						JRM -- 11/2/16
- *
- *		Verify that H5C_flush_invalidate_cache() can handle
- *		the removal from the cache of the next item in 
- *		its scans of hash buckets.
- *
- *		!!!!!!!!!!WARNING !!!!!!!!!!
- *
- *		This test may fail to function correctly if the hash 
- *		table size or hash function is altered.  
- *
- *		To setup the test, this function depends on the fact that 
- *		H5C_flush_invalidate_cache() does alternating scans of the
- *		slist and the index.  If this changes, the test will likely
- *		also cease to function correctly.
- *
- *		The test relies on a known hash function and hash table 
- *		size to select a set of test entries that will all hash 
- *		to the same hash bucket -- call it the test hash bucket.  
- *		It also relies on known behavior of the cache to place 
- *		the entries in the test bucket in a known order.
- *
- *		To avoid pre-mature flushes of the entries in the 
- *		test hash bucket, all entries are initially clean,
- *		with the exception of the first entry which is dirty.
- *		It avoids premature flushing by being the parent in 
- *		a flush dependency.  The first entry in the test bucket
- *		also has a flush op which expunges the second entry --
- *		setting up the failure.
- *
- *		An additional dirty entry is added (which must hash
- *		to a different bucket, and must have a higher address 
- *		than at least the first entry in the test hash bucket.
- *		This entry is the child in a flush dependency with the 
- *		first entry in the above hash bucket, and contains
- *		a flush op to destroy this flush dependency. 
- *
- *		Since the first entry in the test hash bucket has a lower
- *		address that the other dirty entry, the scan of the 
- *		slist encounters it first, and passes over it because 
- *		it has a flush dependency height of 1.
- *
- *		The scan then encounters the second dirty entry and flushes
- *		it -- causing it to destroy the flush dependency and thus 
- *		reducing the flush dependency height of the first entry in 
- *		the test hash bucket to zero.
- *
- *		After completing a scan of the slist, 
- *		H5C_flush_invalidate_cache() then scans the index,
- *		flushing all entries of flush dependency height zero.
- *
- *		This sets up the potential error when the first entry
- *		in the test hash bucket is flushed -- expunging the 
- *		second entry as a side effect.  If 
- *		H5C_flush_invalidate_cache() fails to detect this, 
- *		it will attempt to continue its scan of the bucket with
- *		an entry that has been deleted from the cache.
+ * Function:    cedds__H5C_flush_invalidate_cache__bucket_scan()
+ *
+ * Purpose:    Note:      We now use the index list when we scan the
+ *            contents of the metadata cache, so in principal,
+ *            this test is obsolete.  However, even using the
+ *            index list, restarts are possible, and must be
+ *            handled gracefully.
+ *
+ *            As it turns out, this test triggers index list
+ *            scan restarts, and thus with minor changes is
+ *            still a useful test.
+ *
+ *            For this reason, with the exception of changing
+ *            to check the index_scan_restart stat instead of
+ *            hash bucket restarts, I'm leaving the test
+ *            alone.  If and when it starts to fail due to
+ *            other changes, we can re-work it to test
+ *            index list scan restarts explicitly.
+ *
+ *                        JRM -- 11/2/16
+ *
+ *        Verify that H5C_flush_invalidate_cache() can handle
+ *        the removal from the cache of the next item in
+ *        its scans of hash buckets.
+ *
+ *        !!!!!!!!!!WARNING !!!!!!!!!!
+ *
+ *        This test may fail to function correctly if the hash
+ *        table size or hash function is altered.
+ *
+ *        To setup the test, this function depends on the fact that
+ *        H5C_flush_invalidate_cache() does alternating scans of the
+ *        slist and the index.  If this changes, the test will likely
+ *        also cease to function correctly.
+ *
+ *        The test relies on a known hash function and hash table
+ *        size to select a set of test entries that will all hash
+ *        to the same hash bucket -- call it the test hash bucket.
+ *        It also relies on known behavior of the cache to place
+ *        the entries in the test bucket in a known order.
+ *
+ *        To avoid pre-mature flushes of the entries in the
+ *        test hash bucket, all entries are initially clean,
+ *        with the exception of the first entry which is dirty.
+ *        It avoids premature flushing by being the parent in
+ *        a flush dependency.  The first entry in the test bucket
+ *        also has a flush op which expunges the second entry --
+ *        setting up the failure.
+ *
+ *        An additional dirty entry is added (which must hash
+ *        to a different bucket, and must have a higher address
+ *        than at least the first entry in the test hash bucket.
+ *        This entry is the child in a flush dependency with the
+ *        first entry in the above hash bucket, and contains
+ *        a flush op to destroy this flush dependency.
+ *
+ *        Since the first entry in the test hash bucket has a lower
+ *        address that the other dirty entry, the scan of the
+ *        slist encounters it first, and passes over it because
+ *        it has a flush dependency height of 1.
+ *
+ *        The scan then encounters the second dirty entry and flushes
+ *        it -- causing it to destroy the flush dependency and thus
+ *        reducing the flush dependency height of the first entry in
+ *        the test hash bucket to zero.
+ *
+ *        After completing a scan of the slist,
+ *        H5C_flush_invalidate_cache() then scans the index,
+ *        flushing all entries of flush dependency height zero.
+ *
+ *        This sets up the potential error when the first entry
+ *        in the test hash bucket is flushed -- expunging the
+ *        second entry as a side effect.  If
+ *        H5C_flush_invalidate_cache() fails to detect this,
+ *        it will attempt to continue its scan of the bucket with
+ *        an entry that has been deleted from the cache.
  *
  *              Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/9/15
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -35615,9 +35615,9 @@ static void
 cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 {
     H5C_t *                    cache_ptr = file_ptr->shared->cache;
-    int		               i;
-    int		               expected_hash_bucket = 0;
-    herr_t	               result;
+    int                       i;
+    int                       expected_hash_bucket = 0;
+    herr_t                   result;
     haddr_t                    entry_addr;
     test_entry_t *             entry_ptr;
     test_entry_t *             base_addr = NULL;
@@ -35629,13 +35629,13 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
        * array only processes as much of it as it is told to, we don't have to
        * worry about maintaining the status of entries that we haven't used yet.
        */
-      /* entry			entry				in	at main                                                  flush dep flush dep child flush   flush       flush */
-      /* type:			index:	size:			cache:	addr:	dirty:	prot:	pinned:	dsrlzd:	srlzd:	dest:     par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
-      { MONSTER_ENTRY_TYPE,	 0,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	TRUE,	TRUE,	FALSE,	FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 1, 1, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,	 8,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,     16,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,     24,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	FALSE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE},
-      { MONSTER_ENTRY_TYPE,     31,	MONSTER_ENTRY_SIZE,	TRUE,	TRUE,	TRUE,	FALSE,	FALSE,	TRUE,	FALSE,	FALSE, 	    {MONSTER_ENTRY_TYPE,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0},  1, 0, 0, -1, FALSE},
+      /* entry            entry                in    at main                                                  flush dep flush dep child flush   flush       flush */
+      /* type:            index:    size:            cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:     par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:     corked: */
+      { MONSTER_ENTRY_TYPE,     0,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    TRUE,    TRUE,    FALSE,    FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 1, 1, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,     8,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,     16,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,     24,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE},
+      { MONSTER_ENTRY_TYPE,     31,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,         {MONSTER_ENTRY_TYPE,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0},  1, 0, 0, -1, FALSE},
     };
 
     if(pass) {
@@ -35654,15 +35654,15 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
         else if((cache_ptr->max_cache_size != (2 * 1024 * 1024)) ||
                   (cache_ptr->min_clean_size != (1 * 1024 * 1024))) {
 
-	    pass = FALSE;
-	    failure_mssg =
-	        "unexpected cache config at start of cedds cedds__H5C_flush_invalidate_cache__bucket_scan() test.";
+        pass = FALSE;
+        failure_mssg =
+            "unexpected cache config at start of cedds cedds__H5C_flush_invalidate_cache__bucket_scan() test.";
 
         } else {
 
             /* set min clean size to zero for this test as it simplifies
-	     * computing the expected cache size after each operation.
-	     */
+        * computing the expected cache size after each operation.
+        */
 
             cache_ptr->min_clean_size = 0;
         }
@@ -35671,25 +35671,25 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* reset the stats before we start.  If stats are enabled, we will
-	 * check to see if they are as expected at the end.
-	 */
+    /* reset the stats before we start.  If stats are enabled, we will
+    * check to see if they are as expected at the end.
+    */
 
-	H5C_stats__reset(cache_ptr);
+    H5C_stats__reset(cache_ptr);
 
 
-	/* load one dirty and three clean entries that should hash to the 
-         * same hash bucket.  
+    /* load one dirty and three clean entries that should hash to the
+         * same hash bucket.
          */
 
         protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0);
         unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0, H5C__DIRTIED_FLAG);
 
-	for (i = 8; i <= 24; i += 8)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    for (i = 8; i <= 24; i += 8)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__NO_FLAGS_SET);
-	}
+    }
     }
 
     if(pass) {
@@ -35704,7 +35704,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
         expected_hash_bucket = H5C__HASH_FCN(entry_addr);
 
         for (i = 8; i <= 24; i += 8) {
-        
+
             entry_ptr = &(base_addr[i]);
             entry_addr = entry_ptr->header.addr;
 
@@ -35719,10 +35719,10 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
     if(pass) {
 
        /* setup the expunge flush operation:
-	 *
-	 *     (MET, 0) expunges (MET, 8)
-	 *
-	 */
+    *
+    *     (MET, 0) expunges (MET, 8)
+    *
+    */
         add_flush_op(MONSTER_ENTRY_TYPE, 0, FLUSH_OP__EXPUNGE,
                      MONSTER_ENTRY_TYPE, 8, FALSE, (size_t)0, NULL);
     }
@@ -35731,16 +35731,16 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
         /* load the entry that will have a flush dependencey with (MET, 0),
          * thus preventing it from being flushed on the first pass through
-         * the skip list. 
+         * the skip list.
          */
 
-	protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 31);
-	unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 31, H5C__DIRTIED_FLAG);
+    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 31);
+    unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, 31, H5C__DIRTIED_FLAG);
     }
 
     if(pass) {
 
-        /* verify that the dirty entry doesn't map to the same 
+        /* verify that the dirty entry doesn't map to the same
          * hash bucket as the clean entries.
          */
 
@@ -35756,9 +35756,9 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* Next, create the flush dependency requiring (MET, 31) to 
+    /* Next, create the flush dependency requiring (MET, 31) to
          * be flushed prior to (MET, 0).
-	 */
+    */
 
         protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 0);
         create_flush_dependency(MONSTER_ENTRY_TYPE, 0, MONSTER_ENTRY_TYPE, 31);
@@ -35768,11 +35768,11 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
     if(pass) {
 
-        /* Then, setup the flush operation to take down the flush 
+        /* Then, setup the flush operation to take down the flush
          * dependency when (MET, 31) is flushed.
-	 *
-	 *     (MET, 31) destroys flush dependency with (MET, 8)
-	 *
+    *
+    *     (MET, 31) destroys flush dependency with (MET, 8)
+    *
          */
         add_flush_op(MONSTER_ENTRY_TYPE, 31, FLUSH_OP__DEST_FLUSH_DEP,
                      MONSTER_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL);
@@ -35781,23 +35781,23 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
     if(pass) {
 
-	/* verify the expected status of all entries we have loaded to date: */
+    /* verify the expected status of all entries we have loaded to date: */
         verify_entry_status(cache_ptr, 0, 5, expected);
     }
 
     if(pass) {
 
-        /* now do some protect / unprotect cycles to force the 
+        /* now do some protect / unprotect cycles to force the
          * entries into the desired order in the hash bucket.
-         * Recall that entries are moved to the head of the 
+         * Recall that entries are moved to the head of the
          * hash bucket list on lookup.
          */
 
-	for (i = 24; i >= 0; i -= 8)
-	{
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+    for (i = 24; i >= 0; i -= 8)
+    {
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
             unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__NO_FLAGS_SET);
-	}
+    }
     }
 
     if(pass) {
@@ -35810,7 +35810,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
         i = 0;
 
         while(pass && (i <= 24))
-	{
+    {
             entry_ptr = &(base_addr[i]);
 
             if(scan_ptr == NULL) {
@@ -35830,7 +35830,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
                 scan_ptr = scan_ptr->ht_next;
                 i += 8;
             }
-	}
+    }
     }
 
 
@@ -35860,7 +35860,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
      */
 
     if(pass)
-	if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
+    if((cache_ptr->insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[MONSTER_ENTRY_TYPE] != 0) ||
              (cache_ptr->flushes[MONSTER_ENTRY_TYPE] != 2) ||
@@ -35885,10 +35885,10 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
     if(pass)
         /* as this test is now checking for index list scan restarts,
-         * the following has been modified to check this instead of 
+         * the following has been modified to check this instead of
          * hash bucket scan restarts.
          */
-	if((cache_ptr->slist_scan_restarts != 0) ||
+    if((cache_ptr->slist_scan_restarts != 0) ||
              (cache_ptr->LRU_scan_restarts != 0) ||
              (cache_ptr->index_scan_restarts != 1)) {
             pass = FALSE;
@@ -35908,21 +35908,21 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
 } /* cedds__H5C_flush_invalidate_cache__bucket_scan() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_stats()
+ * Function:    check_stats()
  *
- * Purpose:	If stats are enabled, conduct tests to verify correct 
- *		functioning of the cache statistics collection code.
+ * Purpose:    If stats are enabled, conduct tests to verify correct
+ *        functioning of the cache statistics collection code.
  *
- *		Skip the test if stats are not enabled.
+ *        Skip the test if stats are not enabled.
  *
- *		At present this test is a shell -- fill it out at time
- *		permits.
+ *        At present this test is a shell -- fill it out at time
+ *        permits.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/12/15
  *
  * Modifications:
@@ -35977,7 +35977,7 @@ check_stats(unsigned paged)
 
     SKIPPED();
 
-    HDfprintf(stdout, "	Statistics collection disabled.\n");
+    HDfprintf(stdout, "    Statistics collection disabled.\n");
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -35985,30 +35985,30 @@ check_stats(unsigned paged)
 
 } /* check_stats() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_stats__smoke_check_1()
+ * Function:    check_stats__smoke_check_1()
  *
- * Purpose:	Test to see if the statistics collection code is working 
- *		more or less as expected.  Do this by performing a number 
- *		of operations in the cache, and checking to verify that 
- *		they result in the expected statistics.
+ * Purpose:    Test to see if the statistics collection code is working
+ *        more or less as expected.  Do this by performing a number
+ *        of operations in the cache, and checking to verify that
+ *        they result in the expected statistics.
  *
- *		Note that this function is not intended to be a full test
- *		of the statistics collection facility -- only a cursory 
- *		check that will serve as a place holder until more complete
- *		tests are implemented.
+ *        Note that this function is not intended to be a full test
+ *        of the statistics collection facility -- only a cursory
+ *        check that will serve as a place holder until more complete
+ *        tests are implemented.
  *
  *              Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/22/15
  *
  * Modifications:
  *
- *		None.
+ *        None.
  *
  *-------------------------------------------------------------------------
  */
@@ -36017,8 +36017,8 @@ static void
 check_stats__smoke_check_1(H5F_t * file_ptr)
 {
     H5C_t *        cache_ptr = file_ptr->shared->cache;
-    int		   i;
-    herr_t	   result;
+    int           i;
+    herr_t       result;
 
     if(pass) {
         if(cache_ptr == NULL) {
@@ -36035,15 +36035,15 @@ check_stats__smoke_check_1(H5F_t * file_ptr)
         else if((cache_ptr->max_cache_size != (2 * 1024 * 1024)) ||
                   (cache_ptr->min_clean_size != (1 * 1024 * 1024))) {
 
-	    pass = FALSE;
-	    failure_mssg = "unexpected cache config at start of check_stats__smoke_check_1().";
+        pass = FALSE;
+        failure_mssg = "unexpected cache config at start of check_stats__smoke_check_1().";
 
         } /* end else-if */
-	else {
+    else {
 
             /* set min clean size to zero for this test as it simplifies
-	     * computing the expected cache size after each operation.
-	     */
+        * computing the expected cache size after each operation.
+        */
             cache_ptr->min_clean_size = 0;
         } /* end else */
     } /* end if */
@@ -36129,13 +36129,13 @@ check_stats__smoke_check_1(H5F_t * file_ptr)
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
     if(pass)
-        /* protect and unprotect each entry once. Note 
+        /* protect and unprotect each entry once. Note
          * that all entries are already dirty, as they
          * entered the cache via insertion
          */
         for(i = 0; i < 32; i++) {
-	    protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__NO_FLAGS_SET);
+        protect_entry(file_ptr, MONSTER_ENTRY_TYPE, i);
+        unprotect_entry(file_ptr, MONSTER_ENTRY_TYPE, i, H5C__NO_FLAGS_SET);
         } /* end for */
 
     if(pass)
@@ -36216,7 +36216,7 @@ check_stats__smoke_check_1(H5F_t * file_ptr)
     if(pass) {
         /* protect and unprotect an entry that is not currently
          * in the cache.  Since the cache is full and all entries
-         * are dirty, this will force a flush of each entry, and 
+         * are dirty, this will force a flush of each entry, and
          * the eviction of (MET, 0).
          */
         protect_entry(file_ptr, MONSTER_ENTRY_TYPE, 32);
@@ -36416,7 +36416,7 @@ check_stats__smoke_check_1(H5F_t * file_ptr)
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -36439,14 +36439,14 @@ main(void)
 
     express_test = GetTestExpress();
 
-    printf("=========================================\n");
-    printf("Internal cache tests\n");
-    printf("        express_test = %d\n", express_test);
-    printf("=========================================\n");
+    HDprintf("=========================================\n");
+    HDprintf("Internal cache tests\n");
+    HDprintf("        express_test = %d\n", express_test);
+    HDprintf("=========================================\n");
 
     if(create_entry_arrays() < 0) {
 
-        printf("ERROR: Unable to create entries arrays. Aborting.\n");
+        HDprintf("ERROR: Unable to create entries arrays. Aborting.\n");
         return EXIT_FAILURE;
     } /* end if */
 
diff --git a/test/cache_api.c b/test/cache_api.c
index 7c0ffa3..c0b84c1 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"
@@ -36,7 +36,7 @@ static hbool_t check_fapl_mdc_api_errs(void);
 static hbool_t check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id);
 
 
-
+
 /**************************************************************************/
 /**************************************************************************/
 /********************************* tests: *********************************/
@@ -104,8 +104,8 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
       /* 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;
@@ -495,7 +495,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
 
 } /* check_fapl_mdc_api_calls() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_file_mdc_api_calls()
  *
@@ -560,8 +560,8 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
       /* 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 =
     {
@@ -595,8 +595,8 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
       /* 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 =
     {
@@ -630,8 +630,8 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
       /* 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 =
     {
@@ -666,8 +666,8 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
       /* 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
     };
 
     if(paged)
@@ -813,9 +813,9 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         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
@@ -846,7 +846,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
     }
 
     if ( ! pass ) {
-        
+
         HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", FUNC, failure_mssg);
     }
 
@@ -854,14 +854,14 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
 
 } /* 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:      Test pass status (TRUE/FALSE)
@@ -933,8 +933,8 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
       /* 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 =
     {
@@ -968,8 +968,8 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
       /* 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 =
     {
@@ -1003,8 +1003,8 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
       /* 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
     };
 
     if(paged)
@@ -1117,9 +1117,9 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
             /* 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 ) {
 
@@ -1327,7 +1327,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
                 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
             }
@@ -1448,7 +1448,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
                 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
             }
@@ -1523,9 +1523,9 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
     }
 
     if ( pass ) {
-        
+
         PASSED();
-        
+
     } else {
 
         H5_FAILED();
@@ -1561,7 +1561,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
  *-------------------------------------------------------------------------
  */
 
-#define NUM_INVALID_CONFIGS	36
+#define NUM_INVALID_CONFIGS    36
 static H5AC_cache_config_t * invalid_configs = NULL;
 
 static H5AC_cache_config_t *
@@ -1737,7 +1737,7 @@ init_invalid_configs(void) {
 
 } /* initialize_invalid_configs() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_fapl_mdc_api_errs()
  *
@@ -1913,7 +1913,7 @@ check_fapl_mdc_api_errs(void)
 
 } /* check_fapl_mdc_api_errs() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    check_file_mdc_api_errs()
  *
@@ -2259,7 +2259,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
 } /* check_file_mdc_api_errs() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -2285,10 +2285,10 @@ main(void)
 
     express_test = GetTestExpress();
 
-    printf("===================================\n");
-    printf("Cache API tests\n");
-    printf("        express_test = %d\n", express_test);
-    printf("===================================\n");
+    HDprintf("===================================\n");
+    HDprintf("Cache API tests\n");
+    HDprintf("        express_test = %d\n", express_test);
+    HDprintf("===================================\n");
 
 
     /* Initialize invalid configurations.
diff --git a/test/cache_common.c b/test/cache_common.c
index b078964..f8d630d 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -14,8 +14,8 @@
 /* Programmer:  John Mainzer
  *              10/27/05
  *
- *		This file contains common code for tests of the cache
- *		implemented in H5C.c
+ *        This file contains common code for tests of the cache
+ *        implemented in H5C.c
  */
 #include "H5CXprivate.h"        /* API Contexts                         */
 #include "H5MFprivate.h"
@@ -33,27 +33,27 @@ const char *FILENAME[] = {
 };
 
 hid_t saved_fapl_id = H5P_DEFAULT; /* store the fapl id here between
-				    * cache setup and takedown.  Note
-				    * that if saved_fapl_id == H5P_DEFAULT,
-				    * we assume that there is no fapl to
-				    * close.
-				    */
+                    * cache setup and takedown.  Note
+                    * that if saved_fapl_id == H5P_DEFAULT,
+                    * we assume that there is no fapl to
+                    * close.
+                    */
 
 hid_t saved_fcpl_id = H5P_DEFAULT; /* store the fcpl id here between
-				    * cache setup and takedown.  Note
-				    * that if saved_fcpl_id == H5P_DEFAULT,
-				    * we assume that there is no fcpl to
-				    * close.
-				    */
+                    * cache setup and takedown.  Note
+                    * that if saved_fcpl_id == H5P_DEFAULT,
+                    * we assume that there is no fcpl to
+                    * close.
+                    */
 hid_t saved_fid = -1; /* store the file id here between cache setup
-		       * and takedown.
-		       */
+            * and takedown.
+            */
 
 H5C_t * saved_cache = NULL; /* store the pointer to the instance of
- 			       * of H5C_t created by H5Fcreate()
-			       * here between test cache setup and
-			       * shutdown.
-			       */
+                    * of H5C_t created by H5Fcreate()
+                * here between test cache setup and
+                * shutdown.
+                */
 
 haddr_t saved_actual_base_addr = HADDR_UNDEF;   /* Store the address of the
                             space allocated for cache items in the file between
@@ -132,37 +132,37 @@ static herr_t variable_image_len(const void *thing, size_t *image_len_ptr);
 static herr_t notify_image_len(const void *thing, size_t *image_len_ptr);
 
 static herr_t pico_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t nano_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t micro_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t tiny_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t small_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t medium_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t large_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t huge_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t monster_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t variable_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 static herr_t notify_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr,
     size_t *new_len_ptr, unsigned *flags_ptr);
 
 static herr_t pico_serialize(const H5F_t *f, void *image_ptr,
@@ -215,11 +215,11 @@ static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr,
     hbool_t *dirty_ptr, int32_t entry_type);
 static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type);
 static herr_t pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, 
+    haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr,
     unsigned *flags_ptr);
-static herr_t serialize(const H5F_t *f, void *image_ptr, size_t len, 
+static herr_t serialize(const H5F_t *f, void *image_ptr, size_t len,
     void *thing);
-static herr_t notify(H5C_notify_action_t action, void *thing, int32_t 
+static herr_t notify(H5C_notify_action_t action, void *thing, int32_t
     entry_type);
 static herr_t free_icr(test_entry_t *entry, int32_t entry_type);
 
@@ -291,7 +291,7 @@ const haddr_t alt_base_addrs[NUMBER_OF_ENTRY_TYPES] =
     NOTIFY_ALT_BASE_ADDR
 };
 
-
+
 /* Callback classes */
 static const H5C_class_t pico_class[1] = {{
     PICO_ENTRY_TYPE,
@@ -498,16 +498,16 @@ const H5C_class_t *types[NUMBER_OF_ENTRY_TYPES] = {
 
 /* address translation functions: */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	addr_to_type_and_index
+ * Function:    addr_to_type_and_index
  *
- * Purpose:	Given an address, compute the type and index of the
- *		associated entry.
+ * Purpose:    Given an address, compute the type and index of the
+ *        associated entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/10/04
  *
  *-------------------------------------------------------------------------
@@ -577,7 +577,7 @@ addr_to_type_and_index(haddr_t addr,
 
 /* Call back functions: */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    check_if_write_permitted
@@ -607,16 +607,16 @@ check_write_permitted(const H5F_t H5_ATTR_UNUSED *f, hbool_t *write_permitted_pt
     return(SUCCEED);
 } /* check_write_permitted() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	get_initial_load_size & friends
+ * Function:    get_initial_load_size & friends
  *
- * Purpose:	Query the image size for loading an entry.  The helper
+ * Purpose:    Query the image size for loading an entry.  The helper
  *              functions funnel into get_initial_load_size proper.
  *
- * Return:	SUCCEED
+ * Return:    SUCCEED
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              5/18/10
  *
  *-------------------------------------------------------------------------
@@ -716,16 +716,16 @@ notify_get_initial_load_size(void *udata, size_t *image_length)
     return get_initial_load_size(udata, image_length, NOTIFY_ENTRY_TYPE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	get_final_load_size & friends
+ * Function:    get_final_load_size & friends
  *
- * Purpose:	Query the final image size for loading an entry.  The helper
+ * Purpose:    Query the final image size for loading an entry.  The helper
  *              functions funnel into get_final_load_size proper.
  *
- * Return:	SUCCEED
+ * Return:    SUCCEED
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              11/18/16
  *
  *-------------------------------------------------------------------------
@@ -774,19 +774,19 @@ variable_get_final_load_size(const void *image, size_t image_len,
     return get_final_load_size(image, image_len, udata, actual_len, VARIABLE_ENTRY_TYPE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	verify_chksum & friends 
- *		(only done for VARIABLE_ENTRY_TYPE which has a speculative read)
+ * Function:    verify_chksum & friends
+ *        (only done for VARIABLE_ENTRY_TYPE which has a speculative read)
  *
- * Purpose:	Simulate checksum verification:
- *		  --check is ok only after 'max_verify_ct' is reached
- *		  --otherwise check is not ok
+ * Purpose:    Simulate checksum verification:
+ *          --check is ok only after 'max_verify_ct' is reached
+ *          --otherwise check is not ok
  *
- * Return:	TRUE: checksum is ok
- *		FALSE: checksum is not ok
+ * Return:    TRUE: checksum is ok
+ *        FALSE: checksum is not ok
  *
- * Programmer:	
+ * Programmer:
  *
  *-------------------------------------------------------------------------
  */
@@ -817,9 +817,9 @@ verify_chksum(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED len, void
     HDassert(entry->addr == addr);
 
     if(++entry->verify_ct >= entry->max_verify_ct)
-	return(TRUE);
-    else 
-	return(FALSE);
+    return(TRUE);
+    else
+    return(FALSE);
 
 } /* verify_chksum() */
 
@@ -829,17 +829,17 @@ variable_verify_chksum(const void *image, size_t len, void *udata)
     return verify_chksum(image, len, udata, VARIABLE_ENTRY_TYPE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	deserialize & friends
+ * Function:    deserialize & friends
  *
- * Purpose:	deserialize the entry.  The helper functions verify that the
- *		correct version of deserialize is being called, and then call
- *		deserialize proper.
+ * Purpose:    deserialize the entry.  The helper functions verify that the
+ *        correct version of deserialize is being called, and then call
+ *        deserialize proper.
  *
- * Return:	void * (pointer to the in core representation of the entry)
+ * Return:    void * (pointer to the in core representation of the entry)
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/20/07
  *
  *-------------------------------------------------------------------------
@@ -891,7 +891,7 @@ deserialize(const void *image, size_t len, void *udata, hbool_t *dirty,
                 HDfprintf(stdout, "expected *image = 0x%x\n",
                           (int)(idx & 0xFF));
             } /* end if */
-  	    HDassert((*((const char *)image)) == (char)(idx & 0xFF));
+        HDassert((*((const char *)image)) == (char)(idx & 0xFF));
         } /* end if */
         else {
             if((*(((const char *)image) + 2)) != (char)(idx & 0xFF)) {
@@ -905,9 +905,9 @@ deserialize(const void *image, size_t len, void *udata, hbool_t *dirty,
                           (int)(idx & 0xFF),
                           (int)((idx & 0xFF00) >> 8));
             } /* end if */
-	    HDassert((*((const char *)image)) == (char)(type & 0xFF));
-	    HDassert((*(((const char *)image) + 1)) == (char)((idx & 0xFF00) >> 8));
-	    HDassert((*(((const char *)image) + 2)) == (char)(idx & 0xFF));
+        HDassert((*((const char *)image)) == (char)(type & 0xFF));
+        HDassert((*(((const char *)image) + 1)) == (char)((idx & 0xFF00) >> 8));
+        HDassert((*(((const char *)image) + 2)) == (char)(idx & 0xFF));
         } /* end else */
     } /* end if */
 
@@ -985,18 +985,18 @@ notify_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty)
     return deserialize(image, len, udata, dirty, NOTIFY_ENTRY_TYPE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	image_len & friends
+ * Function:    image_len & friends
  *
- * Purpose:	Return the real (and possibly reduced) length of the image.
- * 		The helper functions verify that the correct version of
- * 		deserialize is being called, and then call deserialize
- * 		proper.
+ * Purpose:    Return the real (and possibly reduced) length of the image.
+ *         The helper functions verify that the correct version of
+ *         deserialize is being called, and then call deserialize
+ *         proper.
  *
- * Return:	SUCCEED
+ * Return:    SUCCEED
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/19/07
  *
  *-------------------------------------------------------------------------
@@ -1027,10 +1027,10 @@ image_len(const void *thing, size_t *image_length, int32_t entry_type)
     HDassert(entry == &(base_addr[idx]));
 
     if(type != VARIABLE_ENTRY_TYPE)
-	HDassert(entry->size == entry_sizes[type]);
+    HDassert(entry->size == entry_sizes[type]);
     else {
-	HDassert(entry->size <= entry_sizes[type]);
-	HDassert(entry->size > 0);
+    HDassert(entry->size <= entry_sizes[type]);
+    HDassert(entry->size > 0);
     } /* end else */
 
     *image_length = entry->size;
@@ -1104,21 +1104,21 @@ notify_image_len(const void *thing, size_t *image_length)
     return image_len(thing, image_length, NOTIFY_ENTRY_TYPE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	pre_serialize & friends
+ * Function:    pre_serialize & friends
  *
- * Purpose:	Pre_serialize the supplied entry.  For now this consistes of
- * 		executing any flush operations and loading the appropriate 
- *		values into *new_addr_ptr, *new_len_ptr, and *flags_ptr.
+ * Purpose:    Pre_serialize the supplied entry.  For now this consistes of
+ *         executing any flush operations and loading the appropriate
+ *        values into *new_addr_ptr, *new_len_ptr, and *flags_ptr.
  *
- * 		The helper functions verify that the correct version of
- * 		serialize is being called, and then call serialize
- * 		proper.
+ *         The helper functions verify that the correct version of
+ *         serialize is being called, and then call serialize
+ *         proper.
  *
- * Return:	SUCCEED if successful, FAIL otherwise.
+ * Return:    SUCCEED if successful, FAIL otherwise.
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              8/07/14
  *
  *-------------------------------------------------------------------------
@@ -1216,7 +1216,7 @@ pico_pre_serialize(H5F_t *f,
                    size_t *new_len_ptr,
                    unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1229,7 +1229,7 @@ nano_pre_serialize(H5F_t *f,
                    size_t *new_len_ptr,
                    unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1242,7 +1242,7 @@ micro_pre_serialize(H5F_t *f,
                     size_t *new_len_ptr,
                     unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1255,7 +1255,7 @@ tiny_pre_serialize(H5F_t *f,
                    size_t *new_len_ptr,
                    unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1268,7 +1268,7 @@ small_pre_serialize(H5F_t *f,
                     size_t *new_len_ptr,
                     unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1281,7 +1281,7 @@ medium_pre_serialize(H5F_t *f,
                      size_t *new_len_ptr,
                      unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1294,7 +1294,7 @@ large_pre_serialize(H5F_t *f,
                     size_t *new_len_ptr,
                     unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1307,7 +1307,7 @@ huge_pre_serialize(H5F_t *f,
                    size_t *new_len_ptr,
                    unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1320,7 +1320,7 @@ monster_pre_serialize(H5F_t *f,
                       size_t *new_len_ptr,
                       unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1333,7 +1333,7 @@ variable_pre_serialize(H5F_t *f,
                        size_t *new_len_ptr,
                        unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
@@ -1346,28 +1346,28 @@ notify_pre_serialize(H5F_t *f,
                      size_t *new_len_ptr,
                      unsigned *flags_ptr)
 {
-    return pre_serialize(f, thing, addr, len, 
+    return pre_serialize(f, thing, addr, len,
                          new_addr_ptr, new_len_ptr, flags_ptr);
 }
 
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	serialize & friends
+ * Function:    serialize & friends
  *
- * Purpose:	Serialize the supplied entry.  For now this consistes of
- * 		loading the type and index of the entry into the first
- * 		three bytes of the image (if it is long enough -- if not
- * 		just load the low order byte of the index into the first
- * 		byte of the image).
+ * Purpose:    Serialize the supplied entry.  For now this consistes of
+ *         loading the type and index of the entry into the first
+ *         three bytes of the image (if it is long enough -- if not
+ *         just load the low order byte of the index into the first
+ *         byte of the image).
  *
- * 		The helper functions verify that the correct version of
- * 		serialize is being called, and then call serialize
- * 		proper.
+ *         The helper functions verify that the correct version of
+ *         serialize is being called, and then call serialize
+ *         proper.
  *
- * Return:	SUCCEED if successful, FAIL otherwise.
+ * Return:    SUCCEED if successful, FAIL otherwise.
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/19/07
  *
  *-------------------------------------------------------------------------
@@ -1408,14 +1408,14 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin
 
     if((type == PICO_ENTRY_TYPE) || (type == VARIABLE_ENTRY_TYPE) ||
        (type == NOTIFY_ENTRY_TYPE )) {
-	HDassert(entry->size >= PICO_ENTRY_SIZE);
-	*((char *)image_ptr) = (char)((entry->index) & 0xFF);
+    HDassert(entry->size >= PICO_ENTRY_SIZE);
+    *((char *)image_ptr) = (char)((entry->index) & 0xFF);
     } /* end if */
     else {
-	HDassert(entry->size >= NANO_ENTRY_SIZE);
-	*((char *)image_ptr) = (char)((entry->type) & 0xFF);
-	*(((char *)image_ptr) + 1) = (char)(((entry->index) & 0xFF00) >> 8);
-	*(((char *)image_ptr) + 2) = (char)((entry->index) & 0xFF);
+    HDassert(entry->size >= NANO_ENTRY_SIZE);
+    *((char *)image_ptr) = (char)((entry->type) & 0xFF);
+    *(((char *)image_ptr) + 1) = (char)(((entry->index) & 0xFF00) >> 8);
+    *(((char *)image_ptr) + 2) = (char)((entry->index) & 0xFF);
     } /* end else */
 
     /* We no longer do the actual write through an callback -- this is
@@ -1425,7 +1425,7 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin
     entry->is_dirty = FALSE;
 
     if(entry->flush_dep_npar > 0) {
-	HDassert(entry->flush_dep_ndirty_chd == 0);
+    HDassert(entry->flush_dep_ndirty_chd == 0);
         mark_flush_dep_clean(entry);
     } /* end if */
 
@@ -1433,9 +1433,9 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin
      * as initialized.
      */
     if(entry->at_main_addr)
-	entry->written_to_main_addr = TRUE;
+    entry->written_to_main_addr = TRUE;
     else
-	entry->written_to_alt_addr = TRUE;
+    entry->written_to_alt_addr = TRUE;
 
     /* do book keeping */
     (entry->serializes)++;
@@ -1475,7 +1475,7 @@ small_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void
 }
 
 herr_t
-medium_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, 
+medium_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len,
     void *thing)
 {
     return serialize(f, image_ptr, len, thing);
@@ -1494,37 +1494,37 @@ huge_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void
 }
 
 herr_t
-monster_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, 
+monster_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len,
     void *thing)
 {
     return serialize(f, image_ptr, len, thing);
 }
 
 herr_t
-variable_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, 
+variable_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len,
     void *thing)
 {
     return serialize(f, image_ptr, len, thing);
 }
 
 herr_t
-notify_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, 
+notify_serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len,
     void *thing)
 {
     return serialize(f, image_ptr, len, thing);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	notify & friends
+ * Function:    notify & friends
  *
- * Purpose:	Record notifications of cache events for the entry.
+ * Purpose:    Record notifications of cache events for the entry.
  *              The helper functions verify that the correct version of notify
  *              is being called, and then call notify proper.
  *
- * Return:	SUCCEED
+ * Return:    SUCCEED
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              4/28/09
  *
  *-------------------------------------------------------------------------
@@ -1553,8 +1553,8 @@ notify(H5C_notify_action_t action, void *thing, int32_t entry_type)
 
     /* Increment count for appropriate action */
     switch(action) {
-        case H5C_NOTIFY_ACTION_AFTER_INSERT:	/* Entry has been added */
-        case H5C_NOTIFY_ACTION_AFTER_LOAD:	/* to the cache.        */
+        case H5C_NOTIFY_ACTION_AFTER_INSERT:    /* Entry has been added */
+        case H5C_NOTIFY_ACTION_AFTER_LOAD:    /* to the cache.        */
             entry->notify_after_insert_count++;
             break;
 
@@ -1565,8 +1565,8 @@ notify(H5C_notify_action_t action, void *thing, int32_t entry_type)
         case H5C_NOTIFY_ACTION_CHILD_CLEANED:
         case H5C_NOTIFY_ACTION_CHILD_UNSERIALIZED:
         case H5C_NOTIFY_ACTION_CHILD_SERIALIZED:
-	    /* do nothing */
-	    break;
+        /* do nothing */
+        break;
 
         case H5C_NOTIFY_ACTION_BEFORE_EVICT:      /* Entry is about to be evicted from cache */
             entry->notify_before_evict_count++;
@@ -1585,25 +1585,25 @@ notify_notify(H5C_notify_action_t action, void *thing)
     return(notify(action, thing, NOTIFY_ENTRY_TYPE));
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	free_icr & friends
+ * Function:    free_icr & friends
  *
- * Purpose:	Nominally, this callback is supposed to free the
- * 		in core representation of the entry.
+ * Purpose:    Nominally, this callback is supposed to free the
+ *         in core representation of the entry.
  *
- * 		In the context of this test bed, we use it to do
- * 		do all the processing we used to do on a destroy.
- * 		In particular, we use it to release all the pins
- * 		that this entry may have on other entries.
+ *         In the context of this test bed, we use it to do
+ *         do all the processing we used to do on a destroy.
+ *         In particular, we use it to release all the pins
+ *         that this entry may have on other entries.
  *
- * 		The helper functions verify that the correct version of
- * 		serialize is being called, and then call free_icr
- * 		proper.
+ *         The helper functions verify that the correct version of
+ *         serialize is being called, and then call free_icr
+ *         proper.
  *
- * Return:	SUCCEED
+ * Return:    SUCCEED
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/19/07
  *
  *-------------------------------------------------------------------------
@@ -1629,43 +1629,43 @@ free_icr(test_entry_t *entry, int32_t entry_type)
     HDassert(entry->header.magic == H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC);
     HDassert(entry->header.size == entry->size);
     HDassert((entry->type == VARIABLE_ENTRY_TYPE) ||
-	      (entry->size == entry_sizes[entry->type]));
+        (entry->size == entry_sizes[entry->type]));
     HDassert(entry->header.tl_next == NULL);
     HDassert(entry->header.tl_prev == NULL);
 
     if(entry->num_pins > 0) {
         int i;
 
-	for(i = 0; i < entry->num_pins; i++) {
+    for(i = 0; i < entry->num_pins; i++) {
             test_entry_t *pinned_entry;
             test_entry_t *pinned_base_addr;
 
-	    pinned_base_addr = entries[entry->pin_type[i]];
-	    pinned_entry = &(pinned_base_addr[entry->pin_idx[i]]);
+        pinned_base_addr = entries[entry->pin_type[i]];
+        pinned_entry = &(pinned_base_addr[entry->pin_idx[i]]);
 
-	    HDassert(0 <= pinned_entry->type);
+        HDassert(0 <= pinned_entry->type);
             HDassert(pinned_entry->type < NUMBER_OF_ENTRY_TYPES);
-	    HDassert(pinned_entry->type == entry->pin_type[i]);
-	    HDassert(pinned_entry->index >= 0);
-	    HDassert(pinned_entry->index <= max_indices[pinned_entry->type]);
-	    HDassert(pinned_entry->index == entry->pin_idx[i]);
-	    HDassert(pinned_entry == pinned_entry->self);
-	    HDassert(pinned_entry->header.is_pinned);
-	    HDassert(pinned_entry->is_pinned);
-	    HDassert(pinned_entry->pinning_ref_count > 0);
-
-	    pinned_entry->pinning_ref_count--;
-
-	    if(pinned_entry->pinning_ref_count <= 0) {
+        HDassert(pinned_entry->type == entry->pin_type[i]);
+        HDassert(pinned_entry->index >= 0);
+        HDassert(pinned_entry->index <= max_indices[pinned_entry->type]);
+        HDassert(pinned_entry->index == entry->pin_idx[i]);
+        HDassert(pinned_entry == pinned_entry->self);
+        HDassert(pinned_entry->header.is_pinned);
+        HDassert(pinned_entry->is_pinned);
+        HDassert(pinned_entry->pinning_ref_count > 0);
+
+        pinned_entry->pinning_ref_count--;
+
+        if(pinned_entry->pinning_ref_count <= 0) {
                 HDassert(pinned_entry->file_ptr);
 
-		unpin_entry(pinned_entry->type, pinned_entry->index);
-	    } /* end if */
+        unpin_entry(pinned_entry->type, pinned_entry->index);
+        } /* end if */
 
-	    entry->pin_type[i] = -1;
-	    entry->pin_idx[i] = -1;
-	} /* end if */
-	entry->num_pins = 0;
+        entry->pin_type[i] = -1;
+        entry->pin_idx[i] = -1;
+    } /* end if */
+    entry->num_pins = 0;
     } /* end if */
 
     entry->destroyed = TRUE;
@@ -1740,7 +1740,7 @@ notify_free_icr(void *thing)
     return free_icr((test_entry_t *)thing, NOTIFY_ENTRY_TYPE);
 }
 
-
+
 /**************************************************************************/
 /**************************************************************************/
 /************************** test utility functions: ***********************/
@@ -1748,16 +1748,16 @@ notify_free_icr(void *thing)
 /**************************************************************************/
 
 /*-------------------------------------------------------------------------
- * Function:	add_flush_op
+ * Function:    add_flush_op
  *
- * Purpose:	Do nothing if pass is FALSE on entry.
+ * Purpose:    Do nothing if pass is FALSE on entry.
  *
  *              Otherwise, add the specified flush operation to the
  *              target instance of test_entry_t.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/1/06
  *
  *-------------------------------------------------------------------------
@@ -1765,12 +1765,12 @@ notify_free_icr(void *thing)
 
 void
 add_flush_op(int target_type,
-	     int target_idx,
-	     int op_code,
-	     int type,
-	     int idx,
-	     hbool_t flag,
-	     size_t new_size,
+        int target_idx,
+        int op_code,
+        int type,
+        int idx,
+        hbool_t flag,
+        size_t new_size,
              unsigned * order_ptr)
 {
     int i;
@@ -1779,10 +1779,10 @@ add_flush_op(int target_type,
 
     HDassert( ( 0 <= target_type ) && ( target_type < NUMBER_OF_ENTRY_TYPES ) );
     HDassert( ( 0 <= target_idx ) &&
-	      ( target_idx <= max_indices[target_type] ) );
+        ( target_idx <= max_indices[target_type] ) );
     HDassert( ( 0 <= op_code ) && ( op_code <= FLUSH_OP__MAX_OP ) );
     HDassert( ( op_code != FLUSH_OP__RESIZE ) ||
-	      ( type == VARIABLE_ENTRY_TYPE ) );
+        ( type == VARIABLE_ENTRY_TYPE ) );
     HDassert( ( 0 <= type ) && ( type < NUMBER_OF_ENTRY_TYPES ) );
     HDassert( ( 0 <= idx ) && ( idx <= max_indices[type] ) );
     HDassert( new_size <= VARIABLE_ENTRY_SIZE );
@@ -1801,15 +1801,15 @@ add_flush_op(int target_type,
         HDassert( target_entry_ptr->index == target_idx );
         HDassert( target_entry_ptr->type == target_type );
         HDassert( target_entry_ptr == target_entry_ptr->self );
-	HDassert( target_entry_ptr->num_flush_ops < MAX_FLUSH_OPS );
+    HDassert( target_entry_ptr->num_flush_ops < MAX_FLUSH_OPS );
 
-	i = (target_entry_ptr->num_flush_ops)++;
-	(target_entry_ptr->flush_ops)[i].op_code = op_code;
-	(target_entry_ptr->flush_ops)[i].type = type;
-	(target_entry_ptr->flush_ops)[i].idx = idx;
-	(target_entry_ptr->flush_ops)[i].flag = flag;
-	(target_entry_ptr->flush_ops)[i].size = new_size;
-	(target_entry_ptr->flush_ops)[i].order_ptr = order_ptr;
+    i = (target_entry_ptr->num_flush_ops)++;
+    (target_entry_ptr->flush_ops)[i].op_code = op_code;
+    (target_entry_ptr->flush_ops)[i].type = type;
+    (target_entry_ptr->flush_ops)[i].idx = idx;
+    (target_entry_ptr->flush_ops)[i].flag = flag;
+    (target_entry_ptr->flush_ops)[i].size = new_size;
+    (target_entry_ptr->flush_ops)[i].order_ptr = order_ptr;
 
     }
 
@@ -1817,24 +1817,24 @@ add_flush_op(int target_type,
 
 } /* add_flush_op() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_pinned_entry_dependency
+ * Function:    create_pinned_entry_dependency
  *
- * Purpose:	Do nothing if pass is FALSE on entry.
+ * Purpose:    Do nothing if pass is FALSE on entry.
  *
  *              Otherwise, set up a pinned entry dependency so we can
  *              test the pinned entry modifications to the flush routine.
  *
- *		Given the types and indicies of the pinned and pinning
- *		entries, add the pinned entry to the list of pinned
- *		entries in the pinning entry, increment the
- *		pinning reference count of the pinned entry, and
- *		if that count was zero initially, pin the entry.
+ *        Given the types and indicies of the pinned and pinning
+ *        entries, add the pinned entry to the list of pinned
+ *        entries in the pinning entry, increment the
+ *        pinning reference count of the pinned entry, and
+ *        if that count was zero initially, pin the entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/10/04
  *
  *-------------------------------------------------------------------------
@@ -1842,10 +1842,10 @@ add_flush_op(int target_type,
 
 void
 create_pinned_entry_dependency(H5F_t * file_ptr,
-		               int pinning_type,
+                    int pinning_type,
                                int pinning_idx,
-	                       int pinned_type,
-	                       int pinned_idx)
+                        int pinned_type,
+                        int pinned_idx)
 {
     test_entry_t * pinning_base_addr;
     test_entry_t * pinning_entry_ptr;
@@ -1855,13 +1855,13 @@ create_pinned_entry_dependency(H5F_t * file_ptr,
     if ( pass ) {
 
         HDassert( ( 0 <= pinning_type ) &&
- 	          ( pinning_type < NUMBER_OF_ENTRY_TYPES ) );
+            ( pinning_type < NUMBER_OF_ENTRY_TYPES ) );
         HDassert( ( 0 <= pinning_idx ) &&
-	          ( pinning_idx <= max_indices[pinning_type] ) );
+            ( pinning_idx <= max_indices[pinning_type] ) );
         HDassert( ( 0 <= pinned_type ) &&
-	          ( pinned_type < NUMBER_OF_ENTRY_TYPES ) );
+            ( pinned_type < NUMBER_OF_ENTRY_TYPES ) );
         HDassert( ( 0 <= pinned_idx ) &&
-	          ( pinned_idx <= max_indices[pinned_type] ) );
+            ( pinned_idx <= max_indices[pinned_type] ) );
 
         pinning_base_addr = entries[pinning_type];
         pinning_entry_ptr = &(pinning_base_addr[pinning_idx]);
@@ -1872,47 +1872,47 @@ create_pinned_entry_dependency(H5F_t * file_ptr,
         HDassert( pinning_entry_ptr->index == pinning_idx );
         HDassert( pinning_entry_ptr->type == pinning_type );
         HDassert( pinning_entry_ptr == pinning_entry_ptr->self );
-	HDassert( pinning_entry_ptr->num_pins < MAX_PINS );
+    HDassert( pinning_entry_ptr->num_pins < MAX_PINS );
 
         HDassert( pinning_entry_ptr->index == pinning_idx );
         HDassert( pinning_entry_ptr->type == pinning_type );
         HDassert( pinning_entry_ptr == pinning_entry_ptr->self );
-	HDassert( ! ( pinning_entry_ptr->is_protected ) );
+    HDassert( ! ( pinning_entry_ptr->is_protected ) );
 
-	pinning_entry_ptr->pin_type[pinning_entry_ptr->num_pins] = pinned_type;
-	pinning_entry_ptr->pin_idx[pinning_entry_ptr->num_pins] = pinned_idx;
-	(pinning_entry_ptr->num_pins)++;
+    pinning_entry_ptr->pin_type[pinning_entry_ptr->num_pins] = pinned_type;
+    pinning_entry_ptr->pin_idx[pinning_entry_ptr->num_pins] = pinned_idx;
+    (pinning_entry_ptr->num_pins)++;
 
         if ( pinned_entry_ptr->pinning_ref_count == 0 ) {
 
-	    protect_entry(file_ptr, pinned_type, pinned_idx);
-	    unprotect_entry(file_ptr, pinned_type, pinned_idx, H5C__PIN_ENTRY_FLAG);
-	}
+        protect_entry(file_ptr, pinned_type, pinned_idx);
+        unprotect_entry(file_ptr, pinned_type, pinned_idx, H5C__PIN_ENTRY_FLAG);
+    }
 
-	(pinned_entry_ptr->pinning_ref_count)++;
+    (pinned_entry_ptr->pinning_ref_count)++;
     }
 
     return;
 
 } /* create_pinned_entry_dependency() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	dirty_entry
+ * Function:    dirty_entry
  *
- * Purpose:	Given a pointer to a cache, an entry type, and an index,
- *		dirty the target entry.
+ * Purpose:    Given a pointer to a cache, an entry type, and an index,
+ *        dirty the target entry.
  *
- *		If the dirty_pin parameter is true, verify that the
- *		target entry is in the cache and is pinned.  If it
- *		isn't, scream and die.  If it is, use the
- *		H5C_mark_entry_dirty() call to dirty it.
+ *        If the dirty_pin parameter is true, verify that the
+ *        target entry is in the cache and is pinned.  If it
+ *        isn't, scream and die.  If it is, use the
+ *        H5C_mark_entry_dirty() call to dirty it.
  *
- *		Do nothing if pass is false on entry.
+ *        Do nothing if pass is false on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/10/04
  *
  *-------------------------------------------------------------------------
@@ -1922,7 +1922,7 @@ void
 dirty_entry(H5F_t * file_ptr,
             int32_t type,
             int32_t idx,
-	    hbool_t dirty_pin)
+        hbool_t dirty_pin)
 {
     test_entry_t * base_addr;
     test_entry_t * entry_ptr;
@@ -1938,54 +1938,54 @@ dirty_entry(H5F_t * file_ptr,
 
             HDassert(cache_ptr);
 
-	    if ( ! entry_in_cache(cache_ptr, type, idx) ) {
+        if ( ! entry_in_cache(cache_ptr, type, idx) ) {
 
-		pass = FALSE;
+        pass = FALSE;
                 failure_mssg = "entry to be dirty pinned is not in cache.";
 
-	    } else {
+        } else {
 
                 base_addr = entries[type];
                 entry_ptr = &(base_addr[idx]);
 
-	        HDassert( entry_ptr->index == idx );
-	        HDassert( entry_ptr->type == type );
+            HDassert( entry_ptr->index == idx );
+            HDassert( entry_ptr->type == type );
                 HDassert( entry_ptr == entry_ptr->self );
 
-		if ( ! ( (entry_ptr->header).is_pinned ) ) {
+        if ( ! ( (entry_ptr->header).is_pinned ) ) {
 
                     pass = FALSE;
                     failure_mssg = "entry to be dirty pinned is not pinned.";
 
                 } else {
 
-		    mark_entry_dirty(type, idx);
+            mark_entry_dirty(type, idx);
 
-		}
-	    }
+        }
+        }
         } else {
 
-	    protect_entry(file_ptr, type, idx);
+        protect_entry(file_ptr, type, idx);
             unprotect_entry(file_ptr, type, idx, H5C__DIRTIED_FLAG);
-	}
+    }
     }
 
     return;
 
 } /* dirty_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	execute_flush_op
+ * Function:    execute_flush_op
  *
- * Purpose:	Given a pointer to an instance of struct flush_op, execute
- * 		it.
+ * Purpose:    Given a pointer to an instance of struct flush_op, execute
+ *         it.
  *
- *		Do nothing if pass is false on entry.
+ *        Do nothing if pass is false on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/1/06
  *
  *-------------------------------------------------------------------------
@@ -1993,9 +1993,9 @@ dirty_entry(H5F_t * file_ptr,
 
 void
 execute_flush_op(H5F_t * file_ptr,
-		 struct test_entry_t * entry_ptr,
-		 struct flush_op * op_ptr,
-		 unsigned * flags_ptr)
+        struct test_entry_t * entry_ptr,
+        struct flush_op * op_ptr,
+        unsigned * flags_ptr)
 {
     H5C_t * cache_ptr;
 
@@ -2027,56 +2027,56 @@ execute_flush_op(H5F_t * file_ptr,
 
     if ( pass ) {
 
-	switch ( op_ptr->op_code )
-	{
-	    case FLUSH_OP__NO_OP:
-		break;
+    switch ( op_ptr->op_code )
+    {
+        case FLUSH_OP__NO_OP:
+        break;
 
-	    case FLUSH_OP__DIRTY:
-		HDassert( ( entry_ptr->type != op_ptr->type ) ||
-			  ( entry_ptr->index != op_ptr->idx ) );
+        case FLUSH_OP__DIRTY:
+        HDassert( ( entry_ptr->type != op_ptr->type ) ||
+            ( entry_ptr->index != op_ptr->idx ) );
 
-		dirty_entry(file_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag);
-		break;
+        dirty_entry(file_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag);
+        break;
 
             case FLUSH_OP__RESIZE:
-		if ( ( entry_ptr->type == op_ptr->type ) &&
+        if ( ( entry_ptr->type == op_ptr->type ) &&
                      ( entry_ptr->index == op_ptr->idx ) ) {
 
                     /* the flush operation is acting on the entry to
-		     * which it is attached.  Handle this here:
-		     */
+            * which it is attached.  Handle this here:
+            */
                     HDassert( entry_ptr->type == VARIABLE_ENTRY_TYPE );
-		    HDassert( op_ptr->size > 0 );
-		    HDassert( op_ptr->size <= VARIABLE_ENTRY_SIZE );
+            HDassert( op_ptr->size > 0 );
+            HDassert( op_ptr->size <= VARIABLE_ENTRY_SIZE );
 
                     entry_ptr->size = op_ptr->size;
 
-		    (*flags_ptr) |= H5C__SERIALIZE_RESIZED_FLAG;
+            (*flags_ptr) |= H5C__SERIALIZE_RESIZED_FLAG;
 
-		    entry_ptr->flush_op_self_resize_in_progress = TRUE;
+            entry_ptr->flush_op_self_resize_in_progress = TRUE;
 
-		} else {
+        } else {
 
-		    /* change the size of some other entry */
+            /* change the size of some other entry */
 
-		    resize_entry(file_ptr, op_ptr->type, op_ptr->idx,
+            resize_entry(file_ptr, op_ptr->type, op_ptr->idx,
                                  op_ptr->size, op_ptr->flag);
-		}
-		break;
+        }
+        break;
 
-	    case FLUSH_OP__MOVE:
-		if((entry_ptr->type == op_ptr->type) &&
+        case FLUSH_OP__MOVE:
+        if((entry_ptr->type == op_ptr->type) &&
                         (entry_ptr->index == op_ptr->idx)) {
 
                     /* the flush operation is acting on the entry to
-		     * which it is attached.  Handle this here:
-		     */
+            * which it is attached.  Handle this here:
+            */
 
-		    HDassert(((*flags_ptr) & H5C__SERIALIZE_RESIZED_FLAG) != 0);
+            HDassert(((*flags_ptr) & H5C__SERIALIZE_RESIZED_FLAG) != 0);
                     (*flags_ptr) |= H5C__SERIALIZE_MOVED_FLAG;
 
-		    if(op_ptr->flag) {
+            if(op_ptr->flag) {
                         HDassert(entry_ptr->addr == entry_ptr->alt_addr);
                         entry_ptr->addr = entry_ptr->main_addr;
                         entry_ptr->at_main_addr = TRUE;
@@ -2086,65 +2086,65 @@ execute_flush_op(H5F_t * file_ptr,
                         entry_ptr->addr = entry_ptr->alt_addr;
                         entry_ptr->at_main_addr = FALSE;
                     } /* end else */
-		} /* end if */
+        } /* end if */
                 else
-		    move_entry(cache_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag);
-		break;
+            move_entry(cache_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag);
+        break;
 
-	    case FLUSH_OP__ORDER:
+        case FLUSH_OP__ORDER:
                 HDassert( op_ptr->order_ptr );
                 entry_ptr->flush_order = *op_ptr->order_ptr;
                 (*op_ptr->order_ptr)++;
-		break;
-
-	    case FLUSH_OP__EXPUNGE:
-		/* the expunge flush op exists to allow us to simulate the 
-		 * case in which an entry is removed from the cashe as the 
- 		 * the result of the flush of a second entry.  At present,
-		 * this can only happen via the take ownership flag, but 
-		 * we will make this test feature more general to as to make
-		 * tests easier to write.
-		 *
-		 * When this operation is executed, the target entry is 
-		 * removed from the cache without being flushed if dirty
-		 * via the expunge_entry() test function (which calls 
- 		 * H5C_expunge_entry()).  Note that this flush operation 
-		 * must always be executed on an entry other than the 
-		 * entry being flushed.
-		 */
-		HDassert( ( entry_ptr->type != op_ptr->type ) ||
+        break;
+
+        case FLUSH_OP__EXPUNGE:
+        /* the expunge flush op exists to allow us to simulate the
+        * case in which an entry is removed from the cashe as the
+        * the result of the flush of a second entry.  At present,
+        * this can only happen via the take ownership flag, but
+        * we will make this test feature more general to as to make
+        * tests easier to write.
+        *
+        * When this operation is executed, the target entry is
+        * removed from the cache without being flushed if dirty
+        * via the expunge_entry() test function (which calls
+        * H5C_expunge_entry()).  Note that this flush operation
+        * must always be executed on an entry other than the
+        * entry being flushed.
+        */
+        HDassert( ( entry_ptr->type != op_ptr->type ) ||
                           ( entry_ptr->index != op_ptr->idx ) );
-		expunge_entry(file_ptr, op_ptr->type, op_ptr->idx);
-		break;
+        expunge_entry(file_ptr, op_ptr->type, op_ptr->idx);
+        break;
 
-	    case FLUSH_OP__DEST_FLUSH_DEP:
-		HDassert( ( entry_ptr->type != op_ptr->type ) ||
+        case FLUSH_OP__DEST_FLUSH_DEP:
+        HDassert( ( entry_ptr->type != op_ptr->type ) ||
                           ( entry_ptr->index != op_ptr->idx ) );
-		destroy_flush_dependency(op_ptr->type, op_ptr->idx,
+        destroy_flush_dependency(op_ptr->type, op_ptr->idx,
                                          entry_ptr->type, entry_ptr->index);
                 break;
 
-	    default:
+        default:
                 pass = FALSE;
                 failure_mssg = "Undefined flush op code.";
-		break;
-	}
+        break;
+    }
     }
 
     return;
 
 } /* execute_flush_op() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	entry_in_cache
+ * Function:    entry_in_cache
  *
- * Purpose:	Given a pointer to a cache, an entry type, and an index,
- *		determine if the entry is currently in the cache.
+ * Purpose:    Given a pointer to a cache, an entry type, and an index,
+ *        determine if the entry is currently in the cache.
  *
- * Return:	TRUE if the entry is in the cache, and FALSE otherwise.
+ * Return:    TRUE if the entry is in the cache, and FALSE otherwise.
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/10/04
  *
  *-------------------------------------------------------------------------
@@ -2184,7 +2184,7 @@ entry_in_cache(H5C_t * cache_ptr,
 
 } /* entry_in_cache() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    create_entry_arrays
  *
@@ -2192,7 +2192,7 @@ entry_in_cache(H5C_t * cache_ptr,
  *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:	Dana Robinson
+ * Programmer:    Dana Robinson
  *              Spring 2016
  *
  *-------------------------------------------------------------------------
@@ -2300,7 +2300,7 @@ error:
 
 } /* create_entry_arrays() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    free_entry_arrays
  *
@@ -2308,7 +2308,7 @@ error:
  *
  * Return:      void
  *
- * Programmer:	Dana Robinson
+ * Programmer:    Dana Robinson
  *              Spring 2016
  *
  *-------------------------------------------------------------------------
@@ -2366,15 +2366,15 @@ free_entry_arrays(void)
 
 } /* free_entry_arrays() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	reset_entries
+ * Function:    reset_entries
  *
- * Purpose:	reset the contents of the entries arrays to known values.
+ * Purpose:    reset the contents of the entries arrays to known values.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/10/04
  *
  *-------------------------------------------------------------------------
@@ -2518,15 +2518,15 @@ reset_entries(void)
 
 } /* reset_entries() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    resize_entry
  *
  * Purpose:     Given a pointer to a cache, an entry type, an index, and
- * 		a new size, set the size of the target entry to the new size.
+ *         a new size, set the size of the target entry to the new size.
  *
- *		Note that at present, the type of the entry must be
- * 		VARIABLE_ENTRY_TYPE.
+ *        Note that at present, the type of the entry must be
+ *         VARIABLE_ENTRY_TYPE.
  *
  *              Do nothing if pass is false on entry.
  *
@@ -2543,7 +2543,7 @@ resize_entry(H5F_t * file_ptr,
              int32_t type,
              int32_t idx,
              size_t new_size,
-	     hbool_t in_cache)
+        hbool_t in_cache)
 {
     test_entry_t * base_addr;
     test_entry_t * entry_ptr;
@@ -2606,28 +2606,28 @@ resize_entry(H5F_t * file_ptr,
             }
         } else {
 
-	    protect_entry(file_ptr, type, idx);
+        protect_entry(file_ptr, type, idx);
             resize_entry(file_ptr, type, idx, new_size, TRUE);
-	    unprotect_entry(file_ptr, type, idx, H5C__DIRTIED_FLAG);
-	}
+        unprotect_entry(file_ptr, type, idx, H5C__DIRTIED_FLAG);
+    }
     }
 
     return;
 
 } /* resize_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	verify_clean
+ * Function:    verify_clean
  *
- * Purpose:	Verify that all cache entries are marked as clean.  If any
- *		are not, set pass to FALSE.
+ * Purpose:    Verify that all cache entries are marked as clean.  If any
+ *        are not, set pass to FALSE.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/10/04
  *
  *-------------------------------------------------------------------------
@@ -2655,7 +2655,7 @@ verify_clean(void)
             for ( j = 0; j <= max_index; j++ )
             {
                 if ( ( base_addr[j].header.is_dirty ) ||
-		     ( base_addr[j].is_dirty ) ) {
+            ( base_addr[j].is_dirty ) ) {
 
                     dirty_count++;
                 }
@@ -2673,19 +2673,19 @@ verify_clean(void)
 
 } /* verify_clean() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	verify_entry_status
+ * Function:    verify_entry_status
  *
- * Purpose:	Verify that a list of entries have the expected status.
- * 		If any discrepencies are found, set the failure message
- * 		and set pass to FALSE.
+ * Purpose:    Verify that a list of entries have the expected status.
+ *         If any discrepencies are found, set the failure message
+ *         and set pass to FALSE.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/8/04
  *
  *-------------------------------------------------------------------------
@@ -2693,9 +2693,9 @@ verify_clean(void)
 
 void
 verify_entry_status(H5C_t * cache_ptr,
-		    int tag,
-		    int num_entries,
-		    struct expected_entry_status expected[])
+            int tag,
+            int num_entries,
+            struct expected_entry_status expected[])
 {
     static char    msg[256];
     int            i;
@@ -2708,222 +2708,222 @@ verify_entry_status(H5C_t * cache_ptr,
         hbool_t         in_cache = FALSE; /* will set to TRUE if necessary */
         unsigned        u;              /* Local index variable */
 
-	if ( ( ! expected[i].in_cache ) &&
+    if ( ( ! expected[i].in_cache ) &&
              ( ( expected[i].is_protected ) || ( expected[i].is_pinned ) ) ) {
 
-	    pass = FALSE;
-	    sprintf(msg, "%d: Contradictory data in expected[%d].\n", tag, i);
-	    failure_mssg = msg;
-	}
+        pass = FALSE;
+        HDsprintf(msg, "%d: Contradictory data in expected[%d].\n", tag, i);
+        failure_mssg = msg;
+    }
 
         if ( ( ! expected[i].in_cache ) &&
              ( expected[i].is_dirty ) &&
              ( ! entry_ptr->expunged ) ) {
 
-	    pass = FALSE;
-	    sprintf(msg, 
+        pass = FALSE;
+        HDsprintf(msg,
                   "%d: expected[%d] specs non-expunged, dirty, non-resident.\n",
                    tag, i);
-	    failure_mssg = msg;
+        failure_mssg = msg;
         }
 
         if ( pass ) {
 
-	    in_cache = entry_in_cache(cache_ptr, expected[i].entry_type,
-		                      expected[i].entry_index);
+        in_cache = entry_in_cache(cache_ptr, expected[i].entry_type,
+                            expected[i].entry_index);
 
-	    if ( in_cache != expected[i].in_cache ) {
+        if ( in_cache != expected[i].in_cache ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
-		      "%d entry (%d, %d) in cache actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)in_cache,
-		      (int)expected[i].in_cache);
-	        failure_mssg = msg;
-	    }
-	}
+            pass = FALSE;
+            HDsprintf(msg,
+            "%d entry (%d, %d) in cache actual/expected = %d/%d.\n",
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)in_cache,
+            (int)expected[i].in_cache);
+            failure_mssg = msg;
+        }
+    }
 
         if ( pass ) {
 
-	    if ( entry_ptr->size != expected[i].size ) {
+        if ( entry_ptr->size != expected[i].size ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                         "%d entry (%d, %d) size actual/expected = %ld/%ld.\n",
-			tag,
-	                (int)expected[i].entry_type,
-		        (int)expected[i].entry_index,
-		        (long)(entry_ptr->size),
-		        (long)expected[i].size);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+                    (int)expected[i].entry_type,
+                (int)expected[i].entry_index,
+                (long)(entry_ptr->size),
+                (long)expected[i].size);
+            failure_mssg = msg;
+        }
+    }
 
         if ( ( pass ) && ( in_cache ) ) {
 
-	    if ( entry_ptr->header.size != expected[i].size ) {
+        if ( entry_ptr->header.size != expected[i].size ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                         "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n",
-			tag,
-		        (int)expected[i].entry_type,
-		        (int)expected[i].entry_index,
-		        (long)(entry_ptr->header.size),
-		        (long)expected[i].size);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+                (int)expected[i].entry_type,
+                (int)expected[i].entry_index,
+                (long)(entry_ptr->header.size),
+                (long)expected[i].size);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( pass ) {
+    if ( pass ) {
 
-	    if ( entry_ptr->at_main_addr != expected[i].at_main_addr ) {
+        if ( entry_ptr->at_main_addr != expected[i].at_main_addr ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                       "%d entry (%d, %d) at main addr actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)(entry_ptr->at_main_addr),
-		      (int)expected[i].at_main_addr);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)(entry_ptr->at_main_addr),
+            (int)expected[i].at_main_addr);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( pass ) {
+    if ( pass ) {
 
-	    if ( entry_ptr->is_dirty != expected[i].is_dirty ) {
+        if ( entry_ptr->is_dirty != expected[i].is_dirty ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                       "%d entry (%d, %d) is_dirty actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)(entry_ptr->is_dirty),
-		      (int)expected[i].is_dirty);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)(entry_ptr->is_dirty),
+            (int)expected[i].is_dirty);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( ( pass ) && ( in_cache ) ) {
+    if ( ( pass ) && ( in_cache ) ) {
 
-	    if ( entry_ptr->header.is_dirty != expected[i].is_dirty ) {
+        if ( entry_ptr->header.is_dirty != expected[i].is_dirty ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                       "%d entry (%d, %d) header is_dirty actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)(entry_ptr->header.is_dirty),
-		      (int)expected[i].is_dirty);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)(entry_ptr->header.is_dirty),
+            (int)expected[i].is_dirty);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( pass ) {
+    if ( pass ) {
 
-	    if ( entry_ptr->is_protected != expected[i].is_protected ) {
+        if ( entry_ptr->is_protected != expected[i].is_protected ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                       "%d entry (%d, %d) is_protected actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)(entry_ptr->is_protected),
-		      (int)expected[i].is_protected);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)(entry_ptr->is_protected),
+            (int)expected[i].is_protected);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( ( pass ) && ( in_cache ) ) {
+    if ( ( pass ) && ( in_cache ) ) {
 
-	    if ( entry_ptr->header.is_protected != expected[i].is_protected ) {
+        if ( entry_ptr->header.is_protected != expected[i].is_protected ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                       "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)(entry_ptr->header.is_protected),
-		      (int)expected[i].is_protected);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)(entry_ptr->header.is_protected),
+            (int)expected[i].is_protected);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( pass ) {
+    if ( pass ) {
 
-	    if ( entry_ptr->is_pinned != expected[i].is_pinned ) {
+        if ( entry_ptr->is_pinned != expected[i].is_pinned ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                       "%d entry (%d, %d) is_pinned actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)(entry_ptr->is_pinned),
-		      (int)expected[i].is_pinned);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)(entry_ptr->is_pinned),
+            (int)expected[i].is_pinned);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( pass ) {
+    if ( pass ) {
 
-	    if ( entry_ptr->is_corked != expected[i].is_corked) {
+        if ( entry_ptr->is_corked != expected[i].is_corked) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                       "%d entry (%d, %d) is_corked actual/expected = %d/%d.\n",
-		      tag,
-		      (int)expected[i].entry_type,
-		      (int)expected[i].entry_index,
-		      (int)(entry_ptr->is_corked),
-		      (int)expected[i].is_corked);
-	        failure_mssg = msg;
-	    }
-	}
+            tag,
+            (int)expected[i].entry_type,
+            (int)expected[i].entry_index,
+            (int)(entry_ptr->is_corked),
+            (int)expected[i].is_corked);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( ( pass ) && ( in_cache ) ) {
+    if ( ( pass ) && ( in_cache ) ) {
 
-	    if ( entry_ptr->header.is_pinned != expected[i].is_pinned ) {
+        if ( entry_ptr->header.is_pinned != expected[i].is_pinned ) {
 
-	        pass = FALSE;
-	        sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                   "%d entry (%d, %d) header is_pinned actual/expected = %d/%d.\n",
-		  tag,
-		  (int)expected[i].entry_type,
-		  (int)expected[i].entry_index,
-		  (int)(entry_ptr->header.is_pinned),
-		  (int)expected[i].is_pinned);
-	        failure_mssg = msg;
-	    }
-	}
+        tag,
+        (int)expected[i].entry_type,
+        (int)expected[i].entry_index,
+        (int)(entry_ptr->header.is_pinned),
+        (int)expected[i].is_pinned);
+            failure_mssg = msg;
+        }
+    }
 
-	if ( pass ) {
+    if ( pass ) {
 
             if ( ( entry_ptr->deserialized != expected[i].deserialized ) ||
-	         ( entry_ptr->serialized != expected[i].serialized ) ||
-	         ( entry_ptr->destroyed != expected[i].destroyed ) ) {
+            ( entry_ptr->serialized != expected[i].serialized ) ||
+            ( entry_ptr->destroyed != expected[i].destroyed ) ) {
 
-	        pass = FALSE;
-                sprintf(msg,
+            pass = FALSE;
+            HDsprintf(msg,
                         "%d entry (%d,%d) deserialized = %d(%d), serialized = %d(%d), dest = %d(%d)\n",
-			tag,
-		        (int)expected[i].entry_type,
-		        (int)expected[i].entry_index,
-		        (int)(entry_ptr->deserialized),
-		        (int)(expected[i].deserialized),
-		        (int)(entry_ptr->serialized),
-		        (int)(expected[i].serialized),
-		        (int)(entry_ptr->destroyed),
-		        (int)(expected[i].destroyed));
+            tag,
+                (int)expected[i].entry_type,
+                (int)expected[i].entry_index,
+                (int)(entry_ptr->deserialized),
+                (int)(expected[i].deserialized),
+                (int)(entry_ptr->serialized),
+                (int)(expected[i].serialized),
+                (int)(entry_ptr->destroyed),
+                (int)(expected[i].destroyed));
                 failure_mssg = msg;
             }
         }
@@ -2934,7 +2934,7 @@ verify_entry_status(H5C_t * cache_ptr,
         if ( pass ) {
             if ( entry_ptr->flush_dep_npar != expected[i].flush_dep_npar ) {
                 pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                       "%d entry (%d, %d) flush_dep_npar actual/expected = %u/%u.\n",
                       tag,
                       expected[i].entry_type,
@@ -2947,7 +2947,7 @@ verify_entry_status(H5C_t * cache_ptr,
         if ( ( pass ) && ( in_cache ) ) {
             if ( entry_ptr->header.flush_dep_nparents != expected[i].flush_dep_npar ) {
                 pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                       "%d entry (%d, %d) header flush_dep_nparents actual/expected = %u/%u.\n",
                       tag,
                       expected[i].entry_type,
@@ -2964,7 +2964,7 @@ verify_entry_status(H5C_t * cache_ptr,
             for ( u = 0; u < entry_ptr->flush_dep_npar; u++ ) {
                 if ( entry_ptr->flush_dep_par_type[u] != expected[i].flush_dep_par_type[u] ) {
                     pass = FALSE;
-                    sprintf(msg,
+                    HDsprintf(msg,
                           "%d entry (%d, %d) flush_dep_par_type[%u] actual/expected = %d/%d.\n",
                           tag,
                           expected[i].entry_type,
@@ -2980,7 +2980,7 @@ verify_entry_status(H5C_t * cache_ptr,
             for ( u = 0; u < entry_ptr->flush_dep_npar; u++ ) {
                 if ( entry_ptr->flush_dep_par_idx[u] != expected[i].flush_dep_par_idx[u] ) {
                     pass = FALSE;
-                    sprintf(msg,
+                    HDsprintf(msg,
                           "%d entry (%d, %d) flush_dep_par_idx[%u] actual/expected = %d/%d.\n",
                           tag,
                           expected[i].entry_type,
@@ -2997,7 +2997,7 @@ verify_entry_status(H5C_t * cache_ptr,
         if ( pass ) {
             if ( entry_ptr->flush_dep_nchd != expected[i].flush_dep_nchd ) {
                 pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                       "%d entry (%d, %d) flush_dep_nchd actual/expected = %u/%u.\n",
                       tag,
                       expected[i].entry_type,
@@ -3010,7 +3010,7 @@ verify_entry_status(H5C_t * cache_ptr,
         if ( ( pass ) && ( in_cache ) ) {
             if ( entry_ptr->header.flush_dep_nchildren != expected[i].flush_dep_nchd ) {
                 pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                       "%d entry (%d, %d) header flush_dep_nchildren actual/expected = %u/%u.\n",
                       tag,
                       expected[i].entry_type,
@@ -3023,7 +3023,7 @@ verify_entry_status(H5C_t * cache_ptr,
         if ( pass ) {
             if ( entry_ptr->flush_dep_ndirty_chd != expected[i].flush_dep_ndirty_chd ) {
                 pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                       "%d entry (%d, %d) flush_dep_ndirty_chd actual/expected = %u/%u.\n",
                       tag,
                       expected[i].entry_type,
@@ -3036,7 +3036,7 @@ verify_entry_status(H5C_t * cache_ptr,
         if ( ( pass ) && ( in_cache ) ) {
             if ( entry_ptr->header.flush_dep_ndirty_children != expected[i].flush_dep_ndirty_chd ) {
                 pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                       "%d entry (%d, %d) header flush_dep_ndirty_children actual/expected = %u/%u.\n",
                       tag,
                       expected[i].entry_type,
@@ -3051,7 +3051,7 @@ verify_entry_status(H5C_t * cache_ptr,
         if ( pass ) {
             if ( expected[i].flush_order >= 0 && entry_ptr->flush_order != (unsigned)expected[i].flush_order ) {
                 pass = FALSE;
-                sprintf(msg,
+                HDsprintf(msg,
                       "%d entry (%d, %d) flush_order actual/expected = %u/%d.\n",
                       tag,
                       expected[i].entry_type,
@@ -3069,18 +3069,18 @@ verify_entry_status(H5C_t * cache_ptr,
 
 } /* verify_entry_status() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	verify_unprotected
+ * Function:    verify_unprotected
  *
- * Purpose:	Verify that no cache entries are marked as protected.  If
- *		any are, set pass to FALSE.
+ * Purpose:    Verify that no cache entries are marked as protected.  If
+ *        any are, set pass to FALSE.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/10/04
  *
  *-------------------------------------------------------------------------
@@ -3129,30 +3129,30 @@ verify_unprotected(void)
 
 } /* verify_unprotected() */
 
-
+
 /*****************************************************************************
  *
  * Function:    setup_cache()
  *
  * Purpose:     Open an HDF file.  This will allocate an instance and
- * 		initialize an associated instance of H5C_t.  However,
- * 		we want to test an instance of H5C_t, so allocate and
- * 		initialize one with the file ID returned by the call to
- * 		H5Fcreate().  Return a pointer to this instance of H5C_t.
+ *         initialize an associated instance of H5C_t.  However,
+ *         we want to test an instance of H5C_t, so allocate and
+ *         initialize one with the file ID returned by the call to
+ *         H5Fcreate().  Return a pointer to this instance of H5C_t.
  *
- *		Observe that we open a HDF file because the cache now
- *		writes directly to file, and we need the file I/O facilities
- *		associated with the file.
+ *        Observe that we open a HDF file because the cache now
+ *        writes directly to file, and we need the file I/O facilities
+ *        associated with the file.
  *
- *		To avoid tripping on error check code, must allocate enough
- *		space in the file to hold all the test entries and their
- *		alternates.  This is a little sticky, as the addresses of
- *		all the test entries are determined at compile time.
+ *        To avoid tripping on error check code, must allocate enough
+ *        space in the file to hold all the test entries and their
+ *        alternates.  This is a little sticky, as the addresses of
+ *        all the test entries are determined at compile time.
  *
- *		Deal with this by choosing BASE_ADDR large enough that
- *		the base address of the allocate space will be less than
- *		or equal to BASE_ADDR, and then requesting an extra BASE_ADDR
- *		bytes, so we don't have to wory about exceeding the allocation.
+ *        Deal with this by choosing BASE_ADDR large enough that
+ *        the base address of the allocate space will be less than
+ *        or equal to BASE_ADDR, and then requesting an extra BASE_ADDR
+ *        bytes, so we don't have to wory about exceeding the allocation.
  *
  * Return:      Success:        Ptr to H5C_t
  *
@@ -3198,7 +3198,7 @@ setup_cache(size_t max_cache_size,
             pass = FALSE;
             failure_mssg = "H5Pset_file_space_strategy() failed.\n";
             H5Pclose(fcpl_id);
-	    fcpl_id = H5P_DEFAULT;
+        fcpl_id = H5P_DEFAULT;
         }
     }
 
@@ -3208,11 +3208,11 @@ setup_cache(size_t max_cache_size,
             pass = FALSE;
             failure_mssg = "H5Pset_file_space_page_size() failed.\n";
             H5Pclose(fcpl_id);
-	    fcpl_id = H5P_DEFAULT;
+        fcpl_id = H5P_DEFAULT;
         }
     }
 
-    if(pass) 
+    if(pass)
         saved_fcpl_id = fcpl_id;
 
     /* setup the file name */
@@ -3228,24 +3228,24 @@ setup_cache(size_t max_cache_size,
                   FUNC, mile_stone++, (int)pass);
 
     if(pass && try_core_file_driver) {
-	if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) == FAIL) {
-	    pass = FALSE;
-	    failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n";
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) == FAIL) {
+        pass = FALSE;
+        failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n";
         }
-	else if(H5Pset_fapl_core(fapl_id, MAX_ADDR, FALSE) < 0) {
-	    H5Pclose(fapl_id);
-	    fapl_id = H5P_DEFAULT;
-	    pass = FALSE;
-	    failure_mssg = "H5P_set_fapl_core() failed.\n";
+    else if(H5Pset_fapl_core(fapl_id, MAX_ADDR, FALSE) < 0) {
+        H5Pclose(fapl_id);
+        fapl_id = H5P_DEFAULT;
+        pass = FALSE;
+        failure_mssg = "H5P_set_fapl_core() failed.\n";
         }
-	else if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, fapl_id)) < 0) {
-	    core_file_driver_failed = TRUE;
+    else if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, fapl_id)) < 0) {
+        core_file_driver_failed = TRUE;
 
             if(verbose)
                 HDfprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", FUNC);
         } else {
-	    saved_fapl_id = fapl_id;
-	}
+        saved_fapl_id = fapl_id;
+    }
     }
 
     if(show_progress) /* 3 */
@@ -3376,21 +3376,21 @@ setup_cache(size_t max_cache_size,
     if(pass) { /* allocate space for test entries */
         actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, (hsize_t)(ADDR_SPACE_SIZE + BASE_ADDR));
 
-	if(actual_base_addr == HADDR_UNDEF) {
+    if(actual_base_addr == HADDR_UNDEF) {
             pass = FALSE;
-	    failure_mssg = "H5MF_alloc() failed.";
+        failure_mssg = "H5MF_alloc() failed.";
 
-	    if(verbose)
+        if(verbose)
                 HDfprintf(stdout, "%s: H5MF_alloc() failed.\n", FUNC);
-	} else if(actual_base_addr > BASE_ADDR) {
-	    /* If this happens, must increase BASE_ADDR so that the
-	     * actual_base_addr is <= BASE_ADDR.  This should only happen
-	     * if the size of the superblock is increase.
-	     */
+    } else if(actual_base_addr > BASE_ADDR) {
+        /* If this happens, must increase BASE_ADDR so that the
+        * actual_base_addr is <= BASE_ADDR.  This should only happen
+        * if the size of the superblock is increase.
+        */
             pass = FALSE;
-	    failure_mssg = "actual_base_addr > BASE_ADDR";
+        failure_mssg = "actual_base_addr > BASE_ADDR";
 
-	    if(verbose)
+        if(verbose)
                 HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", FUNC);
         }
 
@@ -3416,19 +3416,19 @@ setup_cache(size_t max_cache_size,
     return(ret_val);
 } /* setup_cache() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	takedown_cache()
+ * Function:    takedown_cache()
  *
- * Purpose:	Flush the specified cache and destroy it.  If requested,
- *		dump stats first.  Then close and delete the associate
- *		file.
+ * Purpose:    Flush the specified cache and destroy it.  If requested,
+ *        dump stats first.  Then close and delete the associate
+ *        file.
  *
- *		If pass is FALSE, do nothing.
+ *        If pass is FALSE, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              9/14/07
  *
  *-------------------------------------------------------------------------
@@ -3528,22 +3528,22 @@ takedown_cache(H5F_t * file_ptr,
 
 } /* takedown_cache() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	expunge_entry()
+ * Function:    expunge_entry()
  *
- * Purpose:	Expunge the entry indicated by the type and index.
+ * Purpose:    Expunge the entry indicated by the type and index.
  *
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              7/6/06
  *
- * Changes:	Added code to set entry_ptr->expunged to TRUE if 
- *		H5C_expunge_entry() returns without error.
+ * Changes:    Added code to set entry_ptr->expunged to TRUE if
+ *        H5C_expunge_entry() returns without error.
  *
- *					JRM -- 8/21/14
+ *                    JRM -- 8/21/14
  *
  *-------------------------------------------------------------------------
  */
@@ -3573,11 +3573,11 @@ expunge_entry(H5F_t * file_ptr,
         HDassert( entry_ptr->index == idx );
         HDassert( entry_ptr->type == type );
         HDassert( entry_ptr == entry_ptr->self );
-	HDassert( entry_ptr->cache_ptr == cache_ptr );
+    HDassert( entry_ptr->cache_ptr == cache_ptr );
         HDassert( ! ( entry_ptr->header.is_protected ) );
         HDassert( ! ( entry_ptr->is_protected ) );
         HDassert( ! ( entry_ptr->header.is_pinned ) );
-	HDassert( ! ( entry_ptr->is_pinned ) );
+    HDassert( ! ( entry_ptr->is_pinned ) );
 
         result = H5C_expunge_entry(file_ptr, types[type], entry_ptr->addr, H5C__NO_FLAGS_SET);
 
@@ -3588,7 +3588,7 @@ expunge_entry(H5F_t * file_ptr,
 
         } else {
 
-	    entry_ptr->expunged = TRUE;
+        entry_ptr->expunged = TRUE;
         }
     }
 
@@ -3596,16 +3596,16 @@ expunge_entry(H5F_t * file_ptr,
 
 } /* expunge_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	flush_cache()
+ * Function:    flush_cache()
  *
- * Purpose:	Flush the specified cache, destroying all entries if
+ * Purpose:    Flush the specified cache, destroying all entries if
                 requested.  If requested, dump stats first.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/23/04
  *
  *-------------------------------------------------------------------------
@@ -3665,18 +3665,18 @@ flush_cache(H5F_t * file_ptr,
 
 } /* flush_cache() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cork_entry_type()
+ * Function:    cork_entry_type()
  *
- * Purpose:	To "cork" an object:
- *		--insert the base address of an entry type into
- *		  the cache's list of corked object addresses
+ * Purpose:    To "cork" an object:
+ *        --insert the base address of an entry type into
+ *          the cache's list of corked object addresses
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Vailin Choi
- *		Jan 2014
+ * Programmer:    Vailin Choi
+ *        Jan 2014
  *
  *-------------------------------------------------------------------------
  */
@@ -3701,18 +3701,18 @@ cork_entry_type(H5F_t *file_ptr, int32_t type)
 
 } /* cork_entry_type() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	uncork_entry_type()
+ * Function:    uncork_entry_type()
  *
- * Purpose:	To "uncork" an object:
- *		--insert the base address of an entry type into
- *		  the cache's list of corked object addresses
+ * Purpose:    To "uncork" an object:
+ *        --insert the base address of an entry type into
+ *          the cache's list of corked object addresses
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Vailin Choi
- *		Jan 2014
+ * Programmer:    Vailin Choi
+ *        Jan 2014
  *
  *-------------------------------------------------------------------------
  */
@@ -3737,17 +3737,17 @@ uncork_entry_type(H5F_t *file_ptr, int32_t type)
 
 } /* uncork_entry_type() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	insert_entry()
+ * Function:    insert_entry()
  *
- * Purpose:	Insert the entry indicated by the type and index.
+ * Purpose:    Insert the entry indicated by the type and index.
  *
- *		Do nothing if pass is false.
+ *        Do nothing if pass is false.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/16/04
  *
  *-------------------------------------------------------------------------
@@ -3810,7 +3810,7 @@ insert_entry(H5F_t * file_ptr,
             HDfprintf(stdout, "entry_ptr->header.is_protected = %d\n",
                       (int)(entry_ptr->header.is_protected));
             HDfprintf(stdout,
-		      "entry_ptr->header.type != types[type] = %d\n",
+            "entry_ptr->header.type != types[type] = %d\n",
                       (int)(entry_ptr->header.type != types[type]));
             HDfprintf(stdout,
                       "entry_ptr->size != entry_ptr->header.size = %d\n",
@@ -3843,17 +3843,17 @@ insert_entry(H5F_t * file_ptr,
 
 } /* insert_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	mark_entry_dirty()
+ * Function:    mark_entry_dirty()
  *
- * Purpose:	Mark the specified entry as dirty.
+ * Purpose:    Mark the specified entry as dirty.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              3/28/06
  *
  *-------------------------------------------------------------------------
@@ -3880,10 +3880,10 @@ mark_entry_dirty(int32_t type,
         HDassert( entry_ptr->type == type );
         HDassert( entry_ptr == entry_ptr->self );
         HDassert( entry_ptr->header.is_protected ||
-		  entry_ptr->header.is_pinned );
+        entry_ptr->header.is_pinned );
 
         was_dirty = entry_ptr->is_dirty;
-	entry_ptr->is_dirty = TRUE;
+    entry_ptr->is_dirty = TRUE;
 
         if(entry_ptr->flush_dep_npar > 0 && !was_dirty)
             mark_flush_dep_dirty(entry_ptr);
@@ -3911,17 +3911,17 @@ mark_entry_dirty(int32_t type,
 
 } /* mark_entry_dirty() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	move_entry()
+ * Function:    move_entry()
  *
- * Purpose:	Move the entry indicated by the type and index to its
- *		main or alternate address as indicated.  If the entry is
- *		already at the desired entry, do nothing.
+ * Purpose:    Move the entry indicated by the type and index to its
+ *        main or alternate address as indicated.  If the entry is
+ *        already at the desired entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/21/04
  *
  *-------------------------------------------------------------------------
@@ -3934,7 +3934,7 @@ move_entry(H5C_t * cache_ptr,
              hbool_t main_addr)
 {
     herr_t         result;
-    hbool_t	   done = TRUE; /* will set to FALSE if we have work to do */
+    hbool_t       done = TRUE; /* will set to FALSE if we have work to do */
     haddr_t        old_addr = HADDR_UNDEF;
     haddr_t        new_addr = HADDR_UNDEF;
     test_entry_t * base_addr;
@@ -3994,8 +3994,8 @@ move_entry(H5C_t * cache_ptr,
         if ( ! done ) {
 
             if ( ( result < 0 ) ||
-	         ( ( ! ( entry_ptr->header.destroy_in_progress ) ) &&
-	           ( entry_ptr->header.addr != new_addr ) ) ) {
+            ( ( ! ( entry_ptr->header.destroy_in_progress ) ) &&
+            ( entry_ptr->header.addr != new_addr ) ) ) {
 
                 pass = FALSE;
                 failure_mssg = "error in H5C_move_entry().";
@@ -4017,17 +4017,17 @@ move_entry(H5C_t * cache_ptr,
 
 } /* move_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	protect_entry()
+ * Function:    protect_entry()
  *
- * Purpose:	Protect the entry indicated by the type and index.
+ * Purpose:    Protect the entry indicated by the type and index.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/11/04
  *
  *-------------------------------------------------------------------------
@@ -4061,8 +4061,8 @@ protect_entry(H5F_t * file_ptr, int32_t type, int32_t idx)
         /* Use to cork entries for the object */
         H5AC_tag(baddrs, NULL);
 
-        cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr, 
-                types[type], entry_ptr->addr, &entry_ptr->addr, 
+        cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
+                types[type], entry_ptr->addr, &entry_ptr->addr,
                 H5C__NO_FLAGS_SET);
 
         if ( ( cache_entry_ptr != (void *)entry_ptr ) ||
@@ -4092,7 +4092,7 @@ protect_entry(H5F_t * file_ptr, int32_t type, int32_t idx)
             HDfprintf(stdout,
                       "entry_ptr->addr = %d, entry_ptr->header.addr = %d\n",
                       (int)(entry_ptr->addr), (int)(entry_ptr->header.addr));
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                     "entry_ptr->verify_ct = %d, entry_ptr->max_verify_ct = %d\n",
                     entry_ptr->verify_ct, entry_ptr->max_verify_ct);
             H5Eprint2(H5E_DEFAULT, stdout);
@@ -4103,35 +4103,35 @@ protect_entry(H5F_t * file_ptr, int32_t type, int32_t idx)
         } /* end if */
         else {
 
-	    HDassert( ( entry_ptr->cache_ptr == NULL ) ||
-		      ( entry_ptr->cache_ptr == cache_ptr ) );
+        HDassert( ( entry_ptr->cache_ptr == NULL ) ||
+            ( entry_ptr->cache_ptr == cache_ptr ) );
 
-	    entry_ptr->cache_ptr = cache_ptr;
-	    entry_ptr->file_ptr = file_ptr;
+        entry_ptr->cache_ptr = cache_ptr;
+        entry_ptr->file_ptr = file_ptr;
             entry_ptr->is_protected = TRUE;
 
         } /* end else */
 
         if(entry_ptr->header.tag_info && entry_ptr->header.tag_info->corked)
-	    entry_ptr->is_corked = TRUE;
+        entry_ptr->is_corked = TRUE;
 
         HDassert(((entry_ptr->header).type)->id == type);
     } /* end if */
 
 } /* protect_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	protect_entry_ro()
+ * Function:    protect_entry_ro()
  *
- * Purpose:	Do a read only protect the entry indicated by the type
- * 		and index.
+ * Purpose:    Do a read only protect the entry indicated by the type
+ *         and index.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/1/07
  *
  *-------------------------------------------------------------------------
@@ -4162,8 +4162,8 @@ protect_entry_ro(H5F_t * file_ptr,
         HDassert( entry_ptr->type == type );
         HDassert( entry_ptr == entry_ptr->self );
         HDassert( ( ! ( entry_ptr->is_protected ) ) ||
-		  ( ( entry_ptr->is_read_only ) &&
-		    ( entry_ptr->ro_ref_count > 0 ) ) );
+        ( ( entry_ptr->is_read_only ) &&
+            ( entry_ptr->ro_ref_count > 0 ) ) );
 
         cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
                 types[type], entry_ptr->addr, &entry_ptr->addr, H5C__READ_ONLY_FLAG);
@@ -4181,14 +4181,14 @@ protect_entry_ro(H5F_t * file_ptr,
 
         } else {
 
-	    HDassert( ( entry_ptr->cache_ptr == NULL ) ||
-		      ( entry_ptr->cache_ptr == cache_ptr ) );
+        HDassert( ( entry_ptr->cache_ptr == NULL ) ||
+            ( entry_ptr->cache_ptr == cache_ptr ) );
 
-	    entry_ptr->cache_ptr = cache_ptr;
-	    entry_ptr->file_ptr = file_ptr;
+        entry_ptr->cache_ptr = cache_ptr;
+        entry_ptr->file_ptr = file_ptr;
             entry_ptr->is_protected = TRUE;
-	    entry_ptr->is_read_only = TRUE;
-	    entry_ptr->ro_ref_count++;
+        entry_ptr->is_read_only = TRUE;
+        entry_ptr->ro_ref_count++;
         }
 
         HDassert( ((entry_ptr->header).type)->id == type );
@@ -4198,17 +4198,17 @@ protect_entry_ro(H5F_t * file_ptr,
 
 } /* protect_entry_ro() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	pin_entry()
+ * Function:    pin_entry()
  *
- * Purpose:	Pin the entry indicated by the type and index.
+ * Purpose:    Pin the entry indicated by the type and index.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              3/17/09
  *
  *-------------------------------------------------------------------------
@@ -4235,41 +4235,41 @@ pin_entry(int32_t type,
         HDassert( entry_ptr->is_protected );
         HDassert( !(entry_ptr->pinned_from_client) );
 
-	result = H5C_pin_protected_entry((void *)entry_ptr);
+    result = H5C_pin_protected_entry((void *)entry_ptr);
 
-	if ( result < 0 ) {
+    if ( result < 0 ) {
 
             pass = FALSE;
             failure_mssg = "H5C_pin_protected_entry() reports failure.";
 
-	} else if ( ! ( entry_ptr->header.is_pinned ) ) {
+    } else if ( ! ( entry_ptr->header.is_pinned ) ) {
 
             pass = FALSE;
             failure_mssg = "entry not pinned when it should be.";
 
-	} else {
+    } else {
 
             entry_ptr->pinned_from_client = TRUE;
-	    entry_ptr->is_pinned = TRUE;
+        entry_ptr->is_pinned = TRUE;
 
-	}
+    }
     } /* end if */
 
     return;
 
 } /* pin_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	unpin_entry()
+ * Function:    unpin_entry()
  *
- * Purpose:	Unpin the entry indicated by the type and index.
+ * Purpose:    Unpin the entry indicated by the type and index.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              3/28/06
  *
  *-------------------------------------------------------------------------
@@ -4295,8 +4295,8 @@ unpin_entry(int32_t type,
         HDassert( entry_ptr == entry_ptr->self );
         HDassert( entry_ptr->header.is_pinned );
         HDassert( entry_ptr->header.pinned_from_client );
-	HDassert( entry_ptr->is_pinned );
-	HDassert( entry_ptr->pinned_from_client );
+    HDassert( entry_ptr->is_pinned );
+    HDassert( entry_ptr->pinned_from_client );
 
         result = H5C_unpin_entry(entry_ptr);
 
@@ -4314,7 +4314,7 @@ unpin_entry(int32_t type,
 
         entry_ptr->pinned_from_client = FALSE;
 
-	entry_ptr->is_pinned = entry_ptr->pinned_from_cache;
+    entry_ptr->is_pinned = entry_ptr->pinned_from_cache;
 
         HDassert( ((entry_ptr->header).type)->id == type );
 
@@ -4324,17 +4324,17 @@ unpin_entry(int32_t type,
 
 } /* unpin_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	unprotect_entry()
+ * Function:    unprotect_entry()
  *
- * Purpose:	Unprotect the entry indicated by the type and index.
+ * Purpose:    Unprotect the entry indicated by the type and index.
  *
- *		Do nothing if pass is FALSE on entry.
+ *        Do nothing if pass is FALSE on entry.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/12/04
  *
  *-------------------------------------------------------------------------
@@ -4365,12 +4365,12 @@ unprotect_entry(H5F_t * file_ptr,
         HDassert( entry_ptr->header.is_protected );
         HDassert( entry_ptr->is_protected );
 
-	pin_flag_set = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0);
-	unpin_flag_set = (hbool_t)((flags & H5C__UNPIN_ENTRY_FLAG) != 0);
+    pin_flag_set = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0);
+    unpin_flag_set = (hbool_t)((flags & H5C__UNPIN_ENTRY_FLAG) != 0);
 
-	HDassert ( ! ( pin_flag_set && unpin_flag_set ) );
-	HDassert ( ( ! pin_flag_set ) || ( ! (entry_ptr->is_pinned) ) );
-	HDassert ( ( ! unpin_flag_set ) || ( entry_ptr->is_pinned ) );
+    HDassert ( ! ( pin_flag_set && unpin_flag_set ) );
+    HDassert ( ( ! pin_flag_set ) || ( ! (entry_ptr->is_pinned) ) );
+    HDassert ( ( ! unpin_flag_set ) || ( entry_ptr->is_pinned ) );
 
         if(flags & H5C__DIRTIED_FLAG) {
             hbool_t was_dirty = entry_ptr->is_dirty;
@@ -4385,8 +4385,8 @@ unprotect_entry(H5F_t * file_ptr,
 
         if ( ( result < 0 ) ||
              ( ( entry_ptr->header.is_protected ) &&
-	       ( ( ! ( entry_ptr->is_read_only ) ) ||
-		 ( entry_ptr->ro_ref_count <= 0 ) ) ) ||
+        ( ( ! ( entry_ptr->is_read_only ) ) ||
+        ( entry_ptr->ro_ref_count <= 0 ) ) ) ||
              ( entry_ptr->header.type != types[type] ) ||
              ( entry_ptr->size != entry_ptr->header.size ) ||
              ( entry_ptr->addr != entry_ptr->header.addr ) ) {
@@ -4397,33 +4397,33 @@ unprotect_entry(H5F_t * file_ptr,
         }
         else
         {
-	    if ( entry_ptr->ro_ref_count > 1 ) {
+        if ( entry_ptr->ro_ref_count > 1 ) {
 
-		entry_ptr->ro_ref_count--;
+        entry_ptr->ro_ref_count--;
 
-	    } else if ( entry_ptr->ro_ref_count == 1 ) {
+        } else if ( entry_ptr->ro_ref_count == 1 ) {
 
-		entry_ptr->is_protected = FALSE;
-		entry_ptr->is_read_only = FALSE;
-		entry_ptr->ro_ref_count = 0;
+        entry_ptr->is_protected = FALSE;
+        entry_ptr->is_read_only = FALSE;
+        entry_ptr->ro_ref_count = 0;
 
-	    } else {
+        } else {
 
-		entry_ptr->is_protected = FALSE;
+        entry_ptr->is_protected = FALSE;
 
-	    }
+        }
 
-	    if ( pin_flag_set ) {
+        if ( pin_flag_set ) {
 
-	        HDassert(entry_ptr->header.is_pinned);
-		entry_ptr->pinned_from_client = TRUE;
-		entry_ptr->is_pinned = TRUE;
+            HDassert(entry_ptr->header.is_pinned);
+        entry_ptr->pinned_from_client = TRUE;
+        entry_ptr->is_pinned = TRUE;
 
-	    } else if ( unpin_flag_set ) {
+        } else if ( unpin_flag_set ) {
 
-	        HDassert(entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache);
-		entry_ptr->pinned_from_client = FALSE;
-		entry_ptr->is_pinned = entry_ptr->pinned_from_cache;
+            HDassert(entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache);
+        entry_ptr->pinned_from_client = FALSE;
+        entry_ptr->is_pinned = entry_ptr->pinned_from_cache;
 
             }
         }
@@ -4437,26 +4437,26 @@ unprotect_entry(H5F_t * file_ptr,
             HDassert( entry_ptr->is_dirty );
         }
 
-	HDassert( entry_ptr->header.is_protected == entry_ptr->is_protected );
-	HDassert( entry_ptr->header.is_read_only == entry_ptr->is_read_only );
-	HDassert( entry_ptr->header.ro_ref_count == entry_ptr->ro_ref_count );
+    HDassert( entry_ptr->header.is_protected == entry_ptr->is_protected );
+    HDassert( entry_ptr->header.is_read_only == entry_ptr->is_read_only );
+    HDassert( entry_ptr->header.ro_ref_count == entry_ptr->ro_ref_count );
     }
 
     return;
 
 } /* unprotect_entry() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	row_major_scan_forward()
+ * Function:    row_major_scan_forward()
  *
- * Purpose:	Do a sequence of inserts, protects, unprotects, moves,
- *		destroys while scanning through the set of entries.  If
- *		pass is false on entry, do nothing.
+ * Purpose:    Do a sequence of inserts, protects, unprotects, moves,
+ *        destroys while scanning through the set of entries.  If
+ *        pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/12/04
  *
  *-------------------------------------------------------------------------
@@ -4473,7 +4473,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                        hbool_t do_moves,
                        hbool_t move_to_main_addr,
                        hbool_t do_destroys,
-		       hbool_t do_mult_ro_protects,
+            hbool_t do_mult_ro_protects,
                        int dirty_destroys,
                        int dirty_unprotects)
 {
@@ -4501,7 +4501,7 @@ row_major_scan_forward(H5F_t * file_ptr,
         while(pass && idx <= (local_max_index + lag)) {
             int32_t tmp_idx;
 
-	    if(verbose)
+        if(verbose)
                 HDfprintf(stdout, "%d:%d: ", type, idx);
 
             tmp_idx = idx + lag;
@@ -4512,7 +4512,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "1(i, %d, %d) ", type, tmp_idx);
 
                 insert_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             tmp_idx--;
@@ -4523,7 +4523,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "2(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             tmp_idx--;
@@ -4534,7 +4534,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "3(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             /* (don't decrement tmp_idx) */
@@ -4545,7 +4545,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "4(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr);
 
                 move_entry(cache_ptr, type, tmp_idx, move_to_main_addr);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             tmp_idx--;
@@ -4556,7 +4556,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "5(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             tmp_idx -= 2;
@@ -4567,83 +4567,83 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "6(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
-	    if(do_mult_ro_protects) {
+        if(do_mult_ro_protects) {
                 /* (don't decrement tmp_idx) */
-		if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
+        if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
                         (tmp_idx % 9) == 0) {
 
                     if(verbose)
                         HDfprintf(stdout, "7(p-ro, %d, %d) ", type, tmp_idx);
 
-		    protect_entry_ro(file_ptr, type, tmp_idx);
- 		    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
-		} /* end if */
+            protect_entry_ro(file_ptr, type, tmp_idx);
+            HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        } /* end if */
 
                 tmp_idx--;
-		if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
+        if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
                         (tmp_idx % 11) == 0) {
 
                     if(verbose)
                         HDfprintf(stdout, "8(p-ro, %d, %d) ", type, tmp_idx);
 
-		    protect_entry_ro(file_ptr, type, tmp_idx);
- 		    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
-		} /* end if */
+            protect_entry_ro(file_ptr, type, tmp_idx);
+            HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        } /* end if */
 
                 tmp_idx--;
-		if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
+        if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
                         (tmp_idx % 13) == 0) {
 
                     if(verbose)
                         HDfprintf(stdout, "9(p-ro, %d, %d) ", type, tmp_idx);
 
-		    protect_entry_ro(file_ptr, type, tmp_idx);
- 		    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
-		} /* end if */
+            protect_entry_ro(file_ptr, type, tmp_idx);
+            HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        } /* end if */
 
                 /* (don't decrement tmp_idx) */
-		if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
+        if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
                         (tmp_idx % 9) == 0) {
 
                     if(verbose)
                         HDfprintf(stdout, "10(u-ro, %d, %d) ", type, tmp_idx);
 
-		    unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
- 		    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
-		} /* end if */
+            unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
+            HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        } /* end if */
 
                 tmp_idx--;
-		if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
+        if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
                         (tmp_idx % 11) == 0) {
 
                     if(verbose)
                         HDfprintf(stdout, "11(u-ro, %d, %d) ", type, tmp_idx);
 
-		    unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
- 		    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
-		} /* end if */
+            unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
+            HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        } /* end if */
 
                 tmp_idx--;
-		if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
+        if(pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) &&
                         (tmp_idx % 13) == 0) {
 
                     if(verbose)
                         HDfprintf(stdout, "12(u-ro, %d, %d) ", type, tmp_idx);
 
-		    unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
- 		    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
-		} /* end if */
-	    } /* if ( do_mult_ro_protects ) */
+            unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
+            HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        } /* end if */
+        } /* if ( do_mult_ro_protects ) */
 
             if(pass && (idx >= 0) && (idx <= local_max_index)) {
                 if(verbose)
                     HDfprintf(stdout, "13(p, %d, %d) ", type, idx);
 
                 protect_entry(file_ptr, type, idx);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             tmp_idx = idx - lag + 2;
@@ -4654,7 +4654,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "14(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             tmp_idx--;
@@ -4665,7 +4665,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                     HDfprintf(stdout, "15(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
-		HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
             } /* end if */
 
             if(do_destroys) {
@@ -4677,7 +4677,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                                 HDfprintf(stdout, "16(u, %d, %d) ", type, tmp_idx);
 
                             unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-			    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+                HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
                             break;
 
                         case 1:
@@ -4686,14 +4686,14 @@ row_major_scan_forward(H5F_t * file_ptr,
                                     HDfprintf(stdout, "17(u, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-				HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+                HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
                             } /* end if */
                             else {
                                 if(verbose)
                                     HDfprintf(stdout, "18(u, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
-				HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+                HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
                             } /* end else */
                             break;
 
@@ -4702,7 +4702,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                                 HDfprintf(stdout, "19(u-del, %d, %d) ", type, tmp_idx);
 
                             unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG);
-			    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+                HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
                             break;
 
                         case 3:
@@ -4711,14 +4711,14 @@ row_major_scan_forward(H5F_t * file_ptr,
                                     HDfprintf(stdout, "20(u-del, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG);
-			        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+                    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
                             } /* end if */
                             else {
                                 if(verbose)
                                     HDfprintf(stdout, "21(u-del, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx, (dirty_destroys ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET) | H5C__DELETED_FLAG);
-			        HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+                    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
                             } /* end else */
                             break;
 
@@ -4735,7 +4735,7 @@ row_major_scan_forward(H5F_t * file_ptr,
                         HDfprintf(stdout, "22(u, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
-		    HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
+            HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
                 } /* end if */
             } /* end elsef */
 
@@ -4753,17 +4753,17 @@ row_major_scan_forward(H5F_t * file_ptr,
 
 } /* row_major_scan_forward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	hl_row_major_scan_forward()
+ * Function:    hl_row_major_scan_forward()
  *
- * Purpose:	Do a high locality sequence of inserts, protects, and
- *		unprotects while scanning through the set of entries.
- *		If pass is false on entry, do nothing.
+ * Purpose:    Do a high locality sequence of inserts, protects, and
+ *        unprotects while scanning through the set of entries.
+ *        If pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/21/04
  *
  *-------------------------------------------------------------------------
@@ -4858,17 +4858,17 @@ hl_row_major_scan_forward(H5F_t * file_ptr,
 
 } /* hl_row_major_scan_forward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	row_major_scan_backward()
+ * Function:    row_major_scan_backward()
  *
- * Purpose:	Do a sequence of inserts, protects, unprotects, moves,
- *		destroys while scanning backwards through the set of
- *		entries.  If pass is false on entry, do nothing.
+ * Purpose:    Do a sequence of inserts, protects, unprotects, moves,
+ *        destroys while scanning backwards through the set of
+ *        entries.  If pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/12/04
  *
  *-------------------------------------------------------------------------
@@ -4886,7 +4886,7 @@ row_major_scan_backward(H5F_t * file_ptr,
                         hbool_t do_moves,
                         hbool_t move_to_main_addr,
                         hbool_t do_destroys,
-			hbool_t do_mult_ro_protects,
+            hbool_t do_mult_ro_protects,
                         int dirty_destroys,
                         int dirty_unprotects)
 {
@@ -4962,7 +4962,7 @@ row_major_scan_backward(H5F_t * file_ptr,
 
                 if ( verbose )
                     HDfprintf(stdout, "(r, %d, %d, %d) ",
-			      type, tmp_idx, (int)move_to_main_addr);
+                type, tmp_idx, (int)move_to_main_addr);
 
                 move_entry(cache_ptr, type, tmp_idx, move_to_main_addr);
             }
@@ -4990,73 +4990,73 @@ row_major_scan_backward(H5F_t * file_ptr,
             }
 
             /* (don't increment tmp_idx) */
-	    if ( do_mult_ro_protects )
-	    {
-		if ( ( pass ) && ( tmp_idx >= 0 ) &&
-		     ( tmp_idx < local_max_index ) &&
-		     ( tmp_idx % 9 == 0 ) ) {
+        if ( do_mult_ro_protects )
+        {
+        if ( ( pass ) && ( tmp_idx >= 0 ) &&
+            ( tmp_idx < local_max_index ) &&
+            ( tmp_idx % 9 == 0 ) ) {
 
                     if ( verbose )
                         HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
 
-		    protect_entry_ro(file_ptr, type, tmp_idx);
-		}
+            protect_entry_ro(file_ptr, type, tmp_idx);
+        }
 
                 tmp_idx++;
-		if ( ( pass ) && ( tmp_idx >= 0 ) &&
-		     ( tmp_idx < local_max_index ) &&
-		     ( tmp_idx % 11 == 0 ) ) {
+        if ( ( pass ) && ( tmp_idx >= 0 ) &&
+            ( tmp_idx < local_max_index ) &&
+            ( tmp_idx % 11 == 0 ) ) {
 
                     if ( verbose )
                         HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
 
-		    protect_entry_ro(file_ptr, type, tmp_idx);
-		}
+            protect_entry_ro(file_ptr, type, tmp_idx);
+        }
 
                 tmp_idx++;
-		if ( ( pass ) && ( tmp_idx >= 0 ) &&
-		     ( tmp_idx < local_max_index ) &&
-		     ( tmp_idx % 13 == 0 ) ) {
+        if ( ( pass ) && ( tmp_idx >= 0 ) &&
+            ( tmp_idx < local_max_index ) &&
+            ( tmp_idx % 13 == 0 ) ) {
 
                     if ( verbose )
                         HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
 
-		    protect_entry_ro(file_ptr, type, tmp_idx);
-		}
+            protect_entry_ro(file_ptr, type, tmp_idx);
+        }
 
                 /* (don't increment tmp_idx) */
-		if ( ( pass ) && ( tmp_idx >= 0 ) &&
-		     ( tmp_idx < local_max_index ) &&
-		     ( tmp_idx % 9 == 0 ) ) {
+        if ( ( pass ) && ( tmp_idx >= 0 ) &&
+            ( tmp_idx < local_max_index ) &&
+            ( tmp_idx % 9 == 0 ) ) {
 
                     if ( verbose )
                         HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
 
-		    unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-		}
+            unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
+        }
 
                 tmp_idx++;
-		if ( ( pass ) && ( tmp_idx >= 0 ) &&
-		     ( tmp_idx < local_max_index ) &&
-		     ( tmp_idx % 11 == 0 ) ) {
+        if ( ( pass ) && ( tmp_idx >= 0 ) &&
+            ( tmp_idx < local_max_index ) &&
+            ( tmp_idx % 11 == 0 ) ) {
 
                     if ( verbose )
                         HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
 
-		    unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-		}
+            unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
+        }
 
                 tmp_idx++;
-		if ( ( pass ) && ( tmp_idx >= 0 ) &&
-		     ( tmp_idx < local_max_index ) &&
-		     ( tmp_idx % 13 == 0 ) ) {
+        if ( ( pass ) && ( tmp_idx >= 0 ) &&
+            ( tmp_idx < local_max_index ) &&
+            ( tmp_idx % 13 == 0 ) ) {
 
                     if ( verbose )
                         HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
 
-		    unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
-		}
-	    } /* if ( do_mult_ro_protects ) */
+            unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
+        }
+        } /* if ( do_mult_ro_protects ) */
 
             if ( ( pass ) && ( idx >= 0 ) && ( idx <= local_max_index ) ) {
 
@@ -5162,17 +5162,17 @@ row_major_scan_backward(H5F_t * file_ptr,
 
 } /* row_major_scan_backward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	hl_row_major_scan_backward()
+ * Function:    hl_row_major_scan_backward()
  *
- * Purpose:	Do a high locality sequence of inserts, protects, and
- *		unprotects while scanning through the set of entries.
- *		If pass is false on entry, do nothing.
+ * Purpose:    Do a high locality sequence of inserts, protects, and
+ *        unprotects while scanning through the set of entries.
+ *        If pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/21/04
  *
  *-------------------------------------------------------------------------
@@ -5267,17 +5267,17 @@ hl_row_major_scan_backward(H5F_t * file_ptr,
 
 } /* hl_row_major_scan_backward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	col_major_scan_forward()
+ * Function:    col_major_scan_forward()
  *
- * Purpose:	Do a sequence of inserts, protects, and unprotects
- *		while scanning through the set of entries.  If
- *		pass is false on entry, do nothing.
+ * Purpose:    Do a sequence of inserts, protects, and unprotects
+ *        while scanning through the set of entries.  If
+ *        pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/23/04
  *
  *-------------------------------------------------------------------------
@@ -5285,7 +5285,7 @@ hl_row_major_scan_backward(H5F_t * file_ptr,
 
 void
 col_major_scan_forward(H5F_t * file_ptr,
-		       int32_t max_index,
+            int32_t max_index,
                        int32_t lag,
                        hbool_t verbose,
                        hbool_t reset_stats,
@@ -5375,17 +5375,17 @@ col_major_scan_forward(H5F_t * file_ptr,
 
 } /* col_major_scan_forward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	hl_col_major_scan_forward()
+ * Function:    hl_col_major_scan_forward()
  *
- * Purpose:	Do a high locality sequence of inserts, protects, and
- *		unprotects while scanning through the set of entries.  If
- *		pass is false on entry, do nothing.
+ * Purpose:    Do a high locality sequence of inserts, protects, and
+ *        unprotects while scanning through the set of entries.  If
+ *        pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              19/25/04
  *
  *-------------------------------------------------------------------------
@@ -5491,17 +5491,17 @@ hl_col_major_scan_forward(H5F_t * file_ptr,
 
 } /* hl_col_major_scan_forward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	col_major_scan_backward()
+ * Function:    col_major_scan_backward()
  *
- * Purpose:	Do a sequence of inserts, protects, and unprotects
- *		while scanning backwards through the set of
- *		entries.  If pass is false on entry, do nothing.
+ * Purpose:    Do a sequence of inserts, protects, and unprotects
+ *        while scanning backwards through the set of
+ *        entries.  If pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              6/23/04
  *
  *-------------------------------------------------------------------------
@@ -5509,7 +5509,7 @@ hl_col_major_scan_forward(H5F_t * file_ptr,
 
 void
 col_major_scan_backward(H5F_t * file_ptr,
-		        int32_t max_index,
+                int32_t max_index,
                         int32_t lag,
                         hbool_t verbose,
                         hbool_t reset_stats,
@@ -5569,8 +5569,8 @@ col_major_scan_backward(H5F_t * file_ptr,
             }
 
             if ( ( pass ) &&
-		 ( idx >= 0 ) &&
-		 ( idx <= local_max_index[type] ) ) {
+        ( idx >= 0 ) &&
+        ( idx <= local_max_index[type] ) ) {
 
                 if ( verbose )
                     HDfprintf(stdout, "(p, %d, %d) ", type, idx);
@@ -5612,17 +5612,17 @@ col_major_scan_backward(H5F_t * file_ptr,
 
 } /* col_major_scan_backward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	hl_col_major_scan_backward()
+ * Function:    hl_col_major_scan_backward()
  *
- * Purpose:	Do a high locality sequence of inserts, protects, and
- *		unprotects while scanning backwards through the set of
- *		entries.  If pass is false on entry, do nothing.
+ * Purpose:    Do a high locality sequence of inserts, protects, and
+ *        unprotects while scanning backwards through the set of
+ *        entries.  If pass is false on entry, do nothing.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              10/25/04
  *
  *-------------------------------------------------------------------------
@@ -5727,17 +5727,17 @@ hl_col_major_scan_backward(H5F_t * file_ptr,
 
 } /* hl_col_major_scan_backward() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_flush_dependency()
+ * Function:    create_flush_dependency()
  *
- * Purpose:	Create a 'flush dependency' between two entries.
+ * Purpose:    Create a 'flush dependency' between two entries.
  *
- *		Do nothing if pass is false.
+ *        Do nothing if pass is false.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              3/16/09
  *
  *-------------------------------------------------------------------------
@@ -5808,17 +5808,17 @@ create_flush_dependency(int32_t par_type,
     } /* end if */
 } /* create_flush_dependency() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	destroy_flush_dependency()
+ * Function:    destroy_flush_dependency()
  *
- * Purpose:	Destroy a 'flush dependency' between two entries.
+ * Purpose:    Destroy a 'flush dependency' between two entries.
  *
- *		Do nothing if pass is false.
+ *        Do nothing if pass is false.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              3/16/09
  *
  *-------------------------------------------------------------------------
@@ -5899,7 +5899,7 @@ destroy_flush_dependency(int32_t par_type,
     } /* end if */
 } /* destroy_flush_dependency() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    mark_flush_dep_dirty()
  *
@@ -5942,7 +5942,7 @@ mark_flush_dep_dirty(test_entry_t * entry_ptr)
     } /* end if */
 } /* end mark_flush_dep_dirty() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    mark_flush_dep_clean()
  *
@@ -5985,31 +5985,31 @@ mark_flush_dep_clean(test_entry_t * entry_ptr)
     } /* end if */
 } /* end mark_flush_dep_clean() */
 
-
+
 /*** H5AC level utility functions ***/
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_and_validate_cache_hit_rate()
+ * Function:    check_and_validate_cache_hit_rate()
  *
- * Purpose:	Use the API functions to get and reset the cache hit rate.
- *		Verify that the value returned by the API call agrees with
- *		the cache internal data structures.
+ * Purpose:    Use the API functions to get and reset the cache hit rate.
+ *        Verify that the value returned by the API call agrees with
+ *        the cache internal data structures.
  *
- *		If the number of cache accesses exceeds the value provided
- *		in the min_accesses parameter, and the hit rate is less than
- *		min_hit_rate, set pass to FALSE, and set failure_mssg to
- *		a string indicating that hit rate was unexpectedly low.
+ *        If the number of cache accesses exceeds the value provided
+ *        in the min_accesses parameter, and the hit rate is less than
+ *        min_hit_rate, set pass to FALSE, and set failure_mssg to
+ *        a string indicating that hit rate was unexpectedly low.
  *
- *		Return hit rate in *hit_rate_ptr, and print the data to
- *		stdout if requested.
+ *        Return hit rate in *hit_rate_ptr, and print the data to
+ *        stdout if requested.
  *
- *		If an error is detected, set pass to FALSE, and set
- *		failure_mssg to an appropriate value.
+ *        If an error is detected, set pass to FALSE, and set
+ *        failure_mssg to an appropriate value.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/18/04
  *
  *-------------------------------------------------------------------------
@@ -6124,24 +6124,24 @@ check_and_validate_cache_hit_rate(hid_t file_id,
 
 } /* check_and_validate_cache_hit_rate() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_and_validate_cache_size()
+ * Function:    check_and_validate_cache_size()
  *
- * Purpose:	Use the API function to get the cache size data.  Verify
- *		that the values returned by the API call agree with
- *		the cache internal data structures.
+ * Purpose:    Use the API function to get the cache size data.  Verify
+ *        that the values returned by the API call agree with
+ *        the cache internal data structures.
  *
- *		Return size data in the locations specified by the pointer
- *		parameters if these parameters are not NULL.  Print the
- *		data to stdout if requested.
+ *        Return size data in the locations specified by the pointer
+ *        parameters if these parameters are not NULL.  Print the
+ *        data to stdout if requested.
  *
- *		If an error is detected, set pass to FALSE, and set
- *		failure_mssg to an appropriate value.
+ *        If an error is detected, set pass to FALSE, and set
+ *        failure_mssg to an appropriate value.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/18/04
  *
  *-------------------------------------------------------------------------
@@ -6315,21 +6315,21 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
     return(TRUE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	validate_mdc_config()
+ * Function:    validate_mdc_config()
  *
- * Purpose:	Verify that the file indicated by the file_id parameter
- *		has both internal and external configuration matching
- *		*config_ptr.
+ * Purpose:    Verify that the file indicated by the file_id parameter
+ *        has both internal and external configuration matching
+ *        *config_ptr.
  *
- *		Do nothin on success.  On failure, set pass to FALSE, and
- *		load an error message into failue_mssg.  Note that
- *		failure_msg is assumed to be at least 128 bytes in length.
+ *        Do nothin on success.  On failure, set pass to FALSE, and
+ *        load an error message into failue_mssg.  Note that
+ *        failure_msg is assumed to be at least 128 bytes in length.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	John Mainzer
+ * Programmer:    John Mainzer
  *              4/14/04
  *
  *-------------------------------------------------------------------------
@@ -6383,7 +6383,7 @@ validate_mdc_config(hid_t file_id,
     /* compare the cache's internal configuration with the expected value */
     if ( pass ) {
 
-	if ( ! resize_configs_are_equal(&int_config, &cache_ptr->resize_ctl,
+    if ( ! resize_configs_are_equal(&int_config, &cache_ptr->resize_ctl,
                                         compare_init) ) {
 
             pass = FALSE;
@@ -6434,12 +6434,12 @@ validate_mdc_config(hid_t file_id,
 
 } /* validate_mdc_config() */
 
-
+
 #if 0 /* debugging functions -- normally commented out */
 /*-------------------------------------------------------------------------
  * Function:    dump_LRU
  *
- * Purpose:     Display a summarize list of the contents of the LRU 
+ * Purpose:     Display a summarize list of the contents of the LRU
  *              from head to tail.
  *
  * Return:      void
@@ -6467,7 +6467,7 @@ dump_LRU(H5F_t * file_ptr)
 
     entry_ptr = cache_ptr->LRU_head_ptr;
 
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
               "\n\nIndex len/size/clean size/dirty size = %u/%lld/%lld/%lld\n",
               cache_ptr->index_len, (long long)(cache_ptr->index_size),
               (long long)(cache_ptr->clean_index_size),
@@ -6482,17 +6482,17 @@ dump_LRU(H5F_t * file_ptr)
 
     while ( entry_ptr != NULL )
     {
-        HDfprintf(stdout, 
+        HDfprintf(stdout,
                   "  %3d     %d     %10lld  0x%010llx  %s(%d)\n",
-                  i, 
-                  (int)(entry_ptr->is_dirty), 
+                  i,
+                  (int)(entry_ptr->is_dirty),
                   (long long)(entry_ptr->size),
                   (long long)(entry_ptr->addr),
                   entry_ptr->type->name,
                   entry_ptr->type->id);
         i++;
         entry_ptr = entry_ptr->next;
-    } 
+    }
 
     if ( cache_ptr->LRU_list_len > 0 )
     {
diff --git a/test/cache_image.c b/test/cache_image.c
index 3725787..d043dcd 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -169,7 +169,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
             /* 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);
@@ -363,7 +363,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
 
 			if ( verbose ) {
 
-                            fprintf(stdout, 
+                HDfprintf(stdout,
                                   "Chunk (%0d, %0d) in /dset%03d is invalid.\n",
                                   i, j, m);
 			}
@@ -470,7 +470,7 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset)
 
         while ( ( pass ) && ( i <= max_dset ) )
         {
-            sprintf(dset_name, "/dset%03d", i);
+            HDsprintf(dset_name, "/dset%03d", i);
 
 	    if ( H5Ldelete(file_id, dset_name, H5P_DEFAULT) < 0) {
 
@@ -713,6 +713,9 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
                 file_id = H5Fopen(hdf_file_name, H5F_ACC_RDWR, fapl_id);
         }
 
+        /* tidy up */
+        H5Pclose(fapl_id);
+
         if ( file_id < 0 ) {
 
             pass = FALSE;
@@ -1062,7 +1065,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
             /* open the dataset */
             if ( pass ) {
 
-                sprintf(dset_name, "/dset%03d", i);
+                HDsprintf(dset_name, "/dset%03d", i);
                 dataset_ids[i] = H5Dopen2(file_id, dset_name, H5P_DEFAULT);
 
                 if ( dataset_ids[i] < 0 ) {
@@ -1202,7 +1205,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
 
 			if ( verbose ) {
 
-                            fprintf(stdout, 
+                HDfprintf(stdout,
                                   "Chunk (%0d, %0d) in /dset%03d is invalid.\n",
                                   i, j, m);
 			}
@@ -4718,7 +4721,7 @@ cache_image_smoke_check_5(void)
     /* 2) Create a process specific group. */
     if ( pass ) {
 
-	sprintf(process_group_name, "/process_%d", min_group);
+        HDsprintf(process_group_name, "/process_%d", min_group);
 
         proc_gid = H5Gcreate2(file_id, process_group_name, H5P_DEFAULT, 
                               H5P_DEFAULT, H5P_DEFAULT);
@@ -4830,7 +4833,7 @@ cache_image_smoke_check_5(void)
         if ( pass ) {
 
 	    max_group++;
-	    sprintf(process_group_name, "/process_%d", max_group);
+        HDsprintf(process_group_name, "/process_%d", max_group);
 
             proc_gid = H5Gcreate2(file_id, process_group_name, H5P_DEFAULT, 
                                   H5P_DEFAULT, H5P_DEFAULT);
@@ -4909,7 +4912,7 @@ cache_image_smoke_check_5(void)
     /* 11) Validate all the zoos. */
     i = min_group;
     while(pass && i <= max_group) {
-	sprintf(process_group_name, "/process_%d", i);
+        HDsprintf(process_group_name, "/process_%d", i);
         validate_zoo(file_id, process_group_name, i++);
     }
  
@@ -4962,7 +4965,7 @@ cache_image_smoke_check_5(void)
     i = min_group;
     while ( ( pass ) && ( i <= max_group ) ) {
 
-	sprintf(process_group_name, "/process_%d", i);
+        HDsprintf(process_group_name, "/process_%d", i);
         validate_zoo(file_id, process_group_name, i++);
     }
  
@@ -5026,7 +5029,7 @@ cache_image_smoke_check_5(void)
      */
     i = min_group;
     while ( ( pass ) && ( i <= max_group ) ) {
-        sprintf(process_group_name, "/process_%d", i);
+        HDsprintf(process_group_name, "/process_%d", i);
         validate_zoo(file_id, process_group_name, i++);
     }
  
@@ -8045,10 +8048,10 @@ main(void)
 
     express_test = GetTestExpress();
 
-    printf("=========================================\n");
-    printf("Cache image tests\n");
-    printf("        express_test = %d\n", express_test);
-    printf("=========================================\n");
+    HDprintf("=========================================\n");
+    HDprintf("Cache image tests\n");
+    HDprintf("        express_test = %d\n", express_test);
+    HDprintf("=========================================\n");
 
     nerrs += check_cache_image_ctl_flow_1();
     nerrs += check_cache_image_ctl_flow_2();
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index df28079..6c65280 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -723,7 +723,7 @@ check_multi_group_creation_tags(void)
     hid_t fid = -1;          /* File Identifier */
     hid_t gid = -1;          /* Group Identifier */
     int verbose = FALSE;     /* verbose file outout */
-    char gname[10];          /* group name buffer */
+    char gname[16];          /* group name buffer */
     int i = 0;               /* iterator */
     hid_t fapl = -1;         /* File access prop list */
     haddr_t g_tag = 0;       /* Group tag value */
@@ -756,7 +756,7 @@ check_multi_group_creation_tags(void)
 
     for (i = 0; i < MULTIGROUPS; i++) {
 
-        sprintf(gname, "%d", i);
+        HDsprintf(gname, "%d", i);
         if ( (gid = H5Gcreate2(fid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
         if ( H5Gclose(gid) < 0 ) TEST_ERROR;
 
@@ -775,7 +775,7 @@ check_multi_group_creation_tags(void)
     for (i = 0; i < MULTIGROUPS; i++) {
 
         /* Re-open the group */
-        sprintf(gname, "%d", i);
+        HDsprintf(gname, "%d", i);
         if ( (gid = H5Gopen2(fid, gname, H5P_DEFAULT)) < 0 ) TEST_ERROR;
 
         /* Verify object header for root group */
@@ -874,7 +874,7 @@ check_link_iteration_tags(void)
     /* Create many datasets in root group */
     for (i=0;i<500;i++) {
 
-        sprintf(dsetname, "Dset %d", i);
+        HDsprintf(dsetname, "Dset %d", i);
         if ( (did = H5Dcreate2(fid, dsetname, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
         if ( H5Dclose(did) < 0 ) TEST_ERROR;
     }
@@ -1008,7 +1008,7 @@ check_dense_attribute_tags(void)
 
     for (i=0;i<50;i++) {
 
-        sprintf(attrname, "attr %d", i);
+        HDsprintf(attrname, "attr %d", i);
         if ( (aid = H5Acreate2(did, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
         if ( H5Awrite(aid, H5T_NATIVE_UINT, &i) < 0 ) TEST_ERROR;
         if ( H5Aclose(aid) < 0 ) TEST_ERROR;
@@ -3711,9 +3711,7 @@ error:
  *
  * Purpose:     Run tests on library's ability to tag metadata entries.
  *
- * Return:      Success:
- *
- *              Failure:
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:  Mike McGreevy
  *              January 15, 2009
@@ -3755,12 +3753,12 @@ main(void)
         /* Run tests on each fcpl set up above. */
         if (test_type == TEST_DEFAULT) {
 
-            if (!nerrs) printf("Testing standard tag application cases w/ default fcpl:\n");
+            if (!nerrs) HDprintf("Testing standard tag application cases w/ default fcpl:\n");
             fcpl = fcpl_default;
         
         } else if (test_type == TEST_SHMESG) {
 
-            if (!nerrs) printf("Testing standard tag application cases w/ shared messages:\n");
+            if (!nerrs) HDprintf("Testing standard tag application cases w/ shared messages:\n");
             fcpl = fcpl_shmesg_all;
 
         } else {
@@ -3780,7 +3778,7 @@ main(void)
         if (!nerrs) nerrs += check_link_removal_tags(fcpl, test_type);
     } /* end for */
 
-    if (!nerrs) printf("Testing other specific tag application cases:\n");
+    if (!nerrs) HDprintf("Testing other specific tag application cases:\n");
     if (!nerrs) nerrs += check_group_creation_tags();
     if (!nerrs) nerrs += check_multi_group_creation_tags();
     if (!nerrs) nerrs += check_group_open_tags();
@@ -3804,10 +3802,13 @@ main(void)
     HDremove(FILENAME2);
 
     /* Return Errors */
-    return nerrs > 0;
+    if (nerrs > 0)
+        return EXIT_FAILURE;
+    else
+        return EXIT_SUCCESS;
 
 error:
     /* Return with Error */
-    return 1;
+    return EXIT_FAILURE;
 
 } /* main */
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index 11bc2b7..eef2070 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -19,8 +19,8 @@
 /* See H5private.h for how to include headers */
 #undef NDEBUG
 
-#define H5T_FRIEND		/*suppress error about including H5Tpkg	  */
-#include "H5Tpkg.h"		/*to turn off hardware conversions*/
+#define H5T_FRIEND        /*suppress error about including H5Tpkg      */
+#include "H5Tpkg.h"        /*to turn off hardware conversions*/
 #include "H5Iprivate.h"
 
 #include "h5test.h"
@@ -120,29 +120,29 @@ typedef struct {
     long long r, s, t;
 } stype4;
 
-#define NX	100u
-#define NY	2000u
+#define NX    100u
+#define NY    2000u
 #define PACK_NMEMBS     100
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound
+ * Function:    test_compound
  *
- * Purpose:	Creates a simple dataset of a compound type and then reads
- *		it back.  The dataset is read back in various ways to
- *		exercise the I/O pipeline and compound type conversion.
+ * Purpose:    Creates a simple dataset of a compound type and then reads
+ *        it back.  The dataset is read back in various ways to
+ *        exercise the I/O pipeline and compound type conversion.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, January 23, 1998
  *
  * Modifications:
- *		Robb Matzke, 1999-06-23
- *		If the command line switch `--noopt' is present then the fast
- *		compound datatype conversion is turned off.
+ *        Robb Matzke, 1999-06-23
+ *        If the command line switch `--noopt' is present then the fast
+ *        compound datatype conversion is turned off.
  *
  *              Raymond Lu, 15 June 2007
  *              Moved this part of code from MAIN to TEST_COMPOUND function.
@@ -152,53 +152,53 @@ static unsigned
 test_compound (char *filename, hid_t fapl)
 {
     /* First dataset */
-    s1_t		*s1 = NULL;
-    hid_t		s1_tid;
+    s1_t        *s1 = NULL;
+    hid_t        s1_tid;
 
     /* Second dataset */
-    s2_t		*s2 = NULL;
-    hid_t		s2_tid;
+    s2_t        *s2 = NULL;
+    hid_t        s2_tid;
 
     /* Third dataset */
-    s3_t		*s3 = NULL;
-    hid_t		s3_tid;
+    s3_t        *s3 = NULL;
+    hid_t        s3_tid;
 
     /* Fourth dataset */
-    s4_t		*s4 = NULL;
-    hid_t		s4_tid;
+    s4_t        *s4 = NULL;
+    hid_t        s4_tid;
 
     /* Fifth dataset */
-    s5_t		*s5 = NULL;
-    hid_t		s5_tid;
+    s5_t        *s5 = NULL;
+    hid_t        s5_tid;
 
     /* Sixth dataset */
-    s6_t		*s6 = NULL;
-    hid_t		s6_tid;
+    s6_t        *s6 = NULL;
+    hid_t        s6_tid;
 
     /* Seventh dataset */
-    hid_t		s7_sid;
+    hid_t        s7_sid;
 
     /* Eighth dataset */
-    s1_t		*s8 = NULL;
-    hid_t		s8_f_sid;	/*file data space		*/
-    hid_t		s8_m_sid;	/*memory data space		*/
+    s1_t        *s8 = NULL;
+    hid_t        s8_f_sid;    /*file data space        */
+    hid_t        s8_m_sid;    /*memory data space        */
 
     /* Ninth dataset */
 
     /* Tenth dataset */
 
     /* Eleventh dataset */
-    s4_t		*s11 = NULL;
+    s4_t        *s11 = NULL;
 
     /* Other variables */
-    unsigned int	i, j;
-    hid_t		file, dataset, space, PRESERVE;
+    unsigned int    i, j;
+    hid_t        file, dataset, space, PRESERVE;
     hid_t       array_dt;
-    static hsize_t	dim[] = {NX, NY};
-    hsize_t 		f_offset[2];	/*offset of hyperslab in file	*/
-    hsize_t 		h_size[2];	/*size of hyperslab		*/
-    hsize_t		memb_size[1] = {4};
-    int			ret_code;
+    static hsize_t    dim[] = {NX, NY};
+    hsize_t         f_offset[2];    /*offset of hyperslab in file    */
+    hsize_t         h_size[2];    /*size of hyperslab        */
+    hsize_t        memb_size[1] = {4};
+    int            ret_code;
 
     /* Allocate buffers for datasets */
     if(NULL == (s1 = (s1_t *)HDmalloc(sizeof(s1_t) * NX * NY)))
@@ -216,7 +216,7 @@ test_compound (char *filename, hid_t fapl)
 
     /* Create the file */
     if ((file = H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Create the data space */
@@ -226,15 +226,15 @@ 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"
-	   " 0 (FALSE), got %d\n", ret_code);
-	goto error;
+    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"
-	   " 1 (TRUE), got %d\n", ret_code);
-	goto error;
+    HDprintf("Preserve status of dataset transfer property list should be"
+    " 1 (TRUE), got %d\n", ret_code);
+    goto error;
     }
 
     /*
@@ -245,14 +245,14 @@ test_compound (char *filename, hid_t fapl)
 
     /* Initialize the dataset */
     for (i=0; i<NX*NY; i++) {
-	s1[i].a = 8*i+0;
-	s1[i].b = 2000+2*i;
-	s1[i].c[0] = 8*i+2;
-	s1[i].c[1] = 8*i+3;
-	s1[i].c[2] = 8*i+4;
-	s1[i].c[3] = 8*i+5;
-	s1[i].d = 2001+2*i;
-	s1[i].e = 8*i+7;
+    s1[i].a = 8*i+0;
+    s1[i].b = 2000+2*i;
+    s1[i].c[0] = 8*i+2;
+    s1[i].c[1] = 8*i+3;
+    s1[i].c[2] = 8*i+4;
+    s1[i].c[3] = 8*i+5;
+    s1[i].d = 2001+2*i;
+    s1[i].e = 8*i+7;
     }
 
     /* Create the memory data type */
@@ -269,19 +269,19 @@ test_compound (char *filename, hid_t fapl)
 
     /* Create the dataset */
     if((dataset = H5Dcreate2(file, "s1", s1_tid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+    goto error;
 
     /* Write the data */
     if(H5Dwrite(dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1) < 0)
-	goto error;
+    goto error;
 
     PASSED();
 
     /*
      *######################################################################
      * STEP 2: We create a new type ID for the second dataset even though
-     * 	       it's the same as the first just to test things better, but
-     *	       in fact, we could have used s1_tid.
+     *            it's the same as the first just to test things better, but
+     *           in fact, we could have used s1_tid.
      */
     TESTING("basic compound read");
 
@@ -299,31 +299,31 @@ test_compound (char *filename, hid_t fapl)
 
     /* Read the data */
     if (H5Dread (dataset, s2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s2) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare s2 with s1.  They should be the same */
     for (i=0; i<NX*NY; i++) {
-	if (s1[i].a!=s2[i].a ||
-	    s1[i].b!=s2[i].b ||
-	    s1[i].c[0]!=s2[i].c[0] ||
-	    s1[i].c[1]!=s2[i].c[1] ||
-	    s1[i].c[2]!=s2[i].c[2] ||
-	    s1[i].c[3]!=s2[i].c[3] ||
-	    s1[i].d!=s2[i].d ||
-	    s1[i].e!=s2[i].e) {
-	    H5_FAILED();
-	    puts("    Incorrect values read from the file");
-	    goto error;
-	}
+    if (s1[i].a!=s2[i].a ||
+        s1[i].b!=s2[i].b ||
+        s1[i].c[0]!=s2[i].c[0] ||
+        s1[i].c[1]!=s2[i].c[1] ||
+        s1[i].c[2]!=s2[i].c[2] ||
+        s1[i].c[3]!=s2[i].c[3] ||
+        s1[i].d!=s2[i].d ||
+        s1[i].e!=s2[i].e) {
+        H5_FAILED();
+        puts("    Incorrect values read from the file");
+        goto error;
+    }
     }
     PASSED();
 
     /*
      *######################################################################
      * STEP 3: Read the dataset back into a third memory buffer. This buffer
-     * 	       has the same data space but the data type is different: the
-     *	       data type is a struct whose members are in the opposite order.
+     *            has the same data space but the data type is different: the
+     *           data type is a struct whose members are in the opposite order.
      */
     TESTING("reversal of struct members");
 
@@ -341,23 +341,23 @@ test_compound (char *filename, hid_t fapl)
 
     /* Read the data */
     if (H5Dread (dataset, s3_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s3) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare s3 with s1.  They should be the same */
     for (i=0; i<NX*NY; i++) {
-	if (s1[i].a!=s3[i].a ||
-	    s1[i].b!=s3[i].b ||
-	    s1[i].c[0]!=s3[i].c[0] ||
-	    s1[i].c[1]!=s3[i].c[1] ||
-	    s1[i].c[2]!=s3[i].c[2] ||
-	    s1[i].c[3]!=s3[i].c[3] ||
-	    s1[i].d!=s3[i].d ||
-	    s1[i].e!=s3[i].e) {
-	    H5_FAILED();
-	    puts("    Incorrect values read from the file");
-	    goto error;
-	}
+    if (s1[i].a!=s3[i].a ||
+        s1[i].b!=s3[i].b ||
+        s1[i].c[0]!=s3[i].c[0] ||
+        s1[i].c[1]!=s3[i].c[1] ||
+        s1[i].c[2]!=s3[i].c[2] ||
+        s1[i].c[3]!=s3[i].c[3] ||
+        s1[i].d!=s3[i].d ||
+        s1[i].e!=s3[i].e) {
+        H5_FAILED();
+        puts("    Incorrect values read from the file");
+        goto error;
+    }
     }
     PASSED();
 
@@ -375,33 +375,33 @@ test_compound (char *filename, hid_t fapl)
 
     /* Read the data */
     if (H5Dread (dataset, s4_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s4) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare s4 with s1 */
     for (i=0; i<NX*NY; i++) {
-	if (s1[i].b!=s4[i].b ||
-	    s1[i].d!=s4[i].d) {
-	    H5_FAILED();
-	    puts("    Incorrect values read from the file");
-	    goto error;
-	}
+    if (s1[i].b!=s4[i].b ||
+        s1[i].d!=s4[i].d) {
+        H5_FAILED();
+        puts("    Incorrect values read from the file");
+        goto error;
+    }
     }
     PASSED();
 
     /*
      *######################################################################
      * STEP 5: Read all the members into a struct which has other members
-     * 	       which have already been initialized.
+     *            which have already been initialized.
      */
     TESTING("partially initialized superset read");
 
     /* Initialize some members */
     for (i=0; i<NX*NY; i++) {
-	s5[i].pre =  1000+4*i;
-	s5[i].mid1 = 1001+4*i;
-	s5[i].mid2 = 1002+4*i;
-	s5[i].post = 1003+4*i;
+    s5[i].pre =  1000+4*i;
+    s5[i].mid1 = 1001+4*i;
+    s5[i].mid2 = 1002+4*i;
+    s5[i].post = 1003+4*i;
     }
 
     /* Create a data type for s5 */
@@ -418,42 +418,42 @@ test_compound (char *filename, hid_t fapl)
 
     /* Read the data */
     if (H5Dread (dataset, s5_tid, H5S_ALL, H5S_ALL, PRESERVE, s5) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Check that the data was read properly */
     for (i=0; i<NX*NY; i++) {
-	if (s1[i].a!=s5[i].a ||
-	    s1[i].b!=s5[i].b ||
-	    s1[i].c[0]!=s5[i].c[0] ||
-	    s1[i].c[1]!=s5[i].c[1] ||
-	    s1[i].c[2]!=s5[i].c[2] ||
-	    s1[i].c[3]!=s5[i].c[3] ||
-	    s1[i].d!=s5[i].d ||
-	    s1[i].e!=s5[i].e) {
-	    H5_FAILED();
-	    puts("    Incorrect values read from the file");
-	    goto error;
-	}
+    if (s1[i].a!=s5[i].a ||
+        s1[i].b!=s5[i].b ||
+        s1[i].c[0]!=s5[i].c[0] ||
+        s1[i].c[1]!=s5[i].c[1] ||
+        s1[i].c[2]!=s5[i].c[2] ||
+        s1[i].c[3]!=s5[i].c[3] ||
+        s1[i].d!=s5[i].d ||
+        s1[i].e!=s5[i].e) {
+        H5_FAILED();
+        puts("    Incorrect values read from the file");
+        goto error;
+    }
     }
 
     /* Check that no previous values were clobbered */
     for (i=0; i<NX*NY; i++) {
-	if (s5[i].pre  != 1000+4*i ||
-	    s5[i].mid1 != 1001+4*i ||
-	    s5[i].mid2 != 1002+4*i ||
-	    s5[i].post != 1003+4*i) {
-	    H5_FAILED();
-	    puts("    Memory values were clobbered");
-	    goto error;
-	}
+    if (s5[i].pre  != 1000+4*i ||
+        s5[i].mid1 != 1001+4*i ||
+        s5[i].mid2 != 1002+4*i ||
+        s5[i].post != 1003+4*i) {
+        H5_FAILED();
+        puts("    Memory values were clobbered");
+        goto error;
+    }
     }
     PASSED();
 
     /*
      *######################################################################
      * STEP 6: Read all the members into a struct which has other members
-     * 	       which have already been initialized.  This is to test the
+     *            which have already been initialized.  This is to test the
      *         optimization for the Chicago company.  The optimization is
      *         for the special case when the source members are a subset of
      *         destination, and the order is the same, and no conversion
@@ -470,10 +470,10 @@ test_compound (char *filename, hid_t fapl)
 
     /* Initialize some members */
     for (i=0; i<NX*NY; i++) {
-	s6[i].pre =  1000+4*i;
-	s6[i].mid1 = 1001+4*i;
-	s6[i].mid2 = 1002+4*i;
-	s6[i].post = 1003+4*i;
+    s6[i].pre =  1000+4*i;
+    s6[i].mid1 = 1001+4*i;
+    s6[i].mid2 = 1002+4*i;
+    s6[i].post = 1003+4*i;
     }
 
     /* Create a data type for s6 */
@@ -494,35 +494,35 @@ test_compound (char *filename, hid_t fapl)
 
     /* Read the data */
     if (H5Dread (dataset, s6_tid, H5S_ALL, H5S_ALL, PRESERVE, s6) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Check that the data was read properly */
     for (i=0; i<NX*NY; i++) {
-	if (s1[i].a!=s6[i].a ||
-	    s1[i].b!=s6[i].b ||
-	    s1[i].c[0]!=s6[i].c[0] ||
-	    s1[i].c[1]!=s6[i].c[1] ||
-	    s1[i].c[2]!=s6[i].c[2] ||
-	    s1[i].c[3]!=s6[i].c[3] ||
-	    s1[i].d!=s6[i].d ||
-	    s1[i].e!=s6[i].e) {
-	    H5_FAILED();
-	    puts("    Incorrect values read from the file");
-	    goto error;
-	}
+    if (s1[i].a!=s6[i].a ||
+        s1[i].b!=s6[i].b ||
+        s1[i].c[0]!=s6[i].c[0] ||
+        s1[i].c[1]!=s6[i].c[1] ||
+        s1[i].c[2]!=s6[i].c[2] ||
+        s1[i].c[3]!=s6[i].c[3] ||
+        s1[i].d!=s6[i].d ||
+        s1[i].e!=s6[i].e) {
+        H5_FAILED();
+        puts("    Incorrect values read from the file");
+        goto error;
+    }
     }
 
     /* Check that no previous values were clobbered */
     for (i=0; i<NX*NY; i++) {
-	if (s6[i].pre  != 1000+4*i ||
-	    s6[i].mid1 != 1001+4*i ||
-	    s6[i].mid2 != 1002+4*i ||
-	    s6[i].post != 1003+4*i) {
-	    H5_FAILED();
-	    puts("    Memory values were clobbered");
-	    goto error;
-	}
+    if (s6[i].pre  != 1000+4*i ||
+        s6[i].mid1 != 1001+4*i ||
+        s6[i].mid2 != 1002+4*i ||
+        s6[i].post != 1003+4*i) {
+        H5_FAILED();
+        puts("    Memory values were clobbered");
+        goto error;
+    }
     }
     PASSED();
 
@@ -531,45 +531,45 @@ test_compound (char *filename, hid_t fapl)
      *######################################################################
      * STEP 7: Update fields `b' and `d' on the file leaving the other
      *         fields unchanged.  This tests member alignment and background
-     *	       buffers.
+     *           buffers.
      */
     TESTING("partially initialized superset write");
 
     /* Initialize `s4' with new values */
     for (i=0; i<NX*NY; i++) {
-	s4[i].b = 8*i+1;
-	s4[i].d = 8*i+6;
+    s4[i].b = 8*i+1;
+    s4[i].d = 8*i+6;
     }
 
     /* Write the data to file */
     if (H5Dwrite (dataset, s4_tid, H5S_ALL, H5S_ALL, PRESERVE, s4) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Read the data back */
     if (H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare */
     for (i=0; i<NX*NY; i++) {
-	if (s1[i].a != 8*i+0 ||
-	    s1[i].b != 8*i+1 ||
-	    s1[i].c[0] != 8*i+2 ||
-	    s1[i].c[1] != 8*i+3 ||
-	    s1[i].c[2] != 8*i+4 ||
-	    s1[i].c[3] != 8*i+5 ||
-	    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",
-		   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",
-		   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;
-	}
+    if (s1[i].a != 8*i+0 ||
+        s1[i].b != 8*i+1 ||
+        s1[i].c[0] != 8*i+2 ||
+        s1[i].c[1] != 8*i+3 ||
+        s1[i].c[2] != 8*i+4 ||
+        s1[i].c[3] != 8*i+5 ||
+        s1[i].d != 8*i+6 ||
+        s1[i].e != 8*i+7) {
+        H5_FAILED();
+        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);
+        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;
+    }
     }
     PASSED();
 
@@ -586,23 +586,23 @@ test_compound (char *filename, hid_t fapl)
 
     /* Read the dataset */
     if (H5Dread (dataset, s2_tid, s7_sid, H5S_ALL, H5P_DEFAULT, s2) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare */
     for (i=0; i<NX*NY; i++) {
-	if (s2[i].a != s1[i].a ||
-	    s2[i].b != s1[i].b ||
-	    s2[i].c[0] != s1[i].c[0] ||
-	    s2[i].c[1] != s1[i].c[1] ||
-	    s2[i].c[2] != s1[i].c[2] ||
-	    s2[i].c[3] != s1[i].c[3] ||
-	    s2[i].d != s1[i].d ||
-	    s2[i].e != s1[i].e) {
-	    H5_FAILED();
-	    puts("    Incorrect values read from file");
-	    goto error;
-	}
+    if (s2[i].a != s1[i].a ||
+        s2[i].b != s1[i].b ||
+        s2[i].c[0] != s1[i].c[0] ||
+        s2[i].c[1] != s1[i].c[1] ||
+        s2[i].c[2] != s1[i].c[2] ||
+        s2[i].c[3] != s1[i].c[3] ||
+        s2[i].d != s1[i].d ||
+        s2[i].e != s1[i].e) {
+        H5_FAILED();
+        puts("    Incorrect values read from file");
+        goto error;
+    }
     }
     PASSED();
 
@@ -621,7 +621,7 @@ test_compound (char *filename, hid_t fapl)
     h_size[0] = 2*NX/3 - f_offset[0];
     h_size[1] = 2*NY/3 - f_offset[1];
     if (H5Sselect_hyperslab (s8_f_sid, H5S_SELECT_SET, f_offset, NULL,
-			     h_size, NULL) < 0) goto error;
+                h_size, NULL) < 0) goto error;
 
     /* Create memory data space */
     if ((s8_m_sid = H5Screate_simple (2, h_size, NULL)) < 0) goto error;
@@ -630,28 +630,28 @@ test_compound (char *filename, hid_t fapl)
     s8 = (s1_t *) HDcalloc ((size_t)(h_size[0]*h_size[1]), sizeof(s1_t));
     assert (s8);
     if (H5Dread (dataset, s1_tid, s8_m_sid, s8_f_sid, H5P_DEFAULT, s8) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare */
     for (i=0; i<h_size[0]; i++) {
-	for (j=0; j<h_size[1]; j++) {
-	    s1_t *ps1 = s1 + (f_offset[0]+i)*NY + f_offset[1] + j;
-	    s1_t *ps8 = s8 + i*h_size[1] + j;
-
-	    if (ps8->a != ps1->a ||
-		ps8->b != ps1->b ||
-		ps8->c[0] != ps1->c[0] ||
-		ps8->c[1] != ps1->c[1] ||
-		ps8->c[2] != ps1->c[2] ||
-		ps8->c[3] != ps1->c[3] ||
-		ps8->d != ps1->d ||
-		ps8->e != ps1->e) {
-		H5_FAILED();
-		puts("    Incorrect values read from file");
-		goto error;
-	    }
-	}
+    for (j=0; j<h_size[1]; j++) {
+        s1_t *ps1 = s1 + (f_offset[0]+i)*NY + f_offset[1] + j;
+        s1_t *ps8 = s8 + i*h_size[1] + j;
+
+        if (ps8->a != ps1->a ||
+        ps8->b != ps1->b ||
+        ps8->c[0] != ps1->c[0] ||
+        ps8->c[1] != ps1->c[1] ||
+        ps8->c[2] != ps1->c[2] ||
+        ps8->c[3] != ps1->c[3] ||
+        ps8->d != ps1->d ||
+        ps8->e != ps1->e) {
+        H5_FAILED();
+        puts("    Incorrect values read from file");
+        goto error;
+        }
+    }
     }
 
     HDfree (s8);
@@ -668,51 +668,51 @@ test_compound (char *filename, hid_t fapl)
 
     /* Initialize */
     for (i=0; i<NX*NY; i++) {
-	s2[i].a = s2[i].b = s2[i].d = s2[i].e = (unsigned)(-1);
-	s2[i].c[0] = s2[i].c[1] = s2[i].c[2] = s2[i].c[3] = (unsigned)(-1);
+    s2[i].a = s2[i].b = s2[i].d = s2[i].e = (unsigned)(-1);
+    s2[i].c[0] = s2[i].c[1] = s2[i].c[2] = s2[i].c[3] = (unsigned)(-1);
     }
 
     /* Read the hyperslab */
     if (H5Dread (dataset, s2_tid, s8_f_sid, s8_f_sid, H5P_DEFAULT, s2) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare */
     for (i=0; i<NX; i++) {
-	for (j=0; j<NY; j++) {
-	    s1_t *ps1 = s1 + i*NY + j;
-	    s2_t *ps2 = s2 + i*NY + j;
-	    if (i>=f_offset[0] &&
-		i<f_offset[0]+h_size[0] &&
-		j>=f_offset[1] &&
-		j<f_offset[1]+h_size[1]) {
-		if (ps2->a != ps1->a ||
-		    ps2->b != ps1->b ||
-		    ps2->c[0] != ps1->c[0] ||
-		    ps2->c[1] != ps1->c[1] ||
-		    ps2->c[2] != ps1->c[2] ||
-		    ps2->c[3] != ps1->c[3] ||
-		    ps2->d != ps1->d ||
-		    ps2->e != ps1->e) {
-		    H5_FAILED();
-		    puts("    Memory values clobbered");
-		    goto error;
-		}
-	    } else {
-		if (ps2->a != (unsigned)(-1) ||
-		    ps2->b != (unsigned)(-1) ||
-		    ps2->c[0] != (unsigned)(-1) ||
-		    ps2->c[1] != (unsigned)(-1) ||
-		    ps2->c[2] != (unsigned)(-1) ||
-		    ps2->c[3] != (unsigned)(-1) ||
-		    ps2->d != (unsigned)(-1) ||
-		    ps2->e != (unsigned)(-1)) {
-		    H5_FAILED();
-		    puts("    Incorrect values read from file");
-		    goto error;
-		}
-	    }
-	}
+    for (j=0; j<NY; j++) {
+        s1_t *ps1 = s1 + i*NY + j;
+        s2_t *ps2 = s2 + i*NY + j;
+        if (i>=f_offset[0] &&
+        i<f_offset[0]+h_size[0] &&
+        j>=f_offset[1] &&
+        j<f_offset[1]+h_size[1]) {
+        if (ps2->a != ps1->a ||
+            ps2->b != ps1->b ||
+            ps2->c[0] != ps1->c[0] ||
+            ps2->c[1] != ps1->c[1] ||
+            ps2->c[2] != ps1->c[2] ||
+            ps2->c[3] != ps1->c[3] ||
+            ps2->d != ps1->d ||
+            ps2->e != ps1->e) {
+            H5_FAILED();
+            puts("    Memory values clobbered");
+            goto error;
+        }
+        } else {
+        if (ps2->a != (unsigned)(-1) ||
+            ps2->b != (unsigned)(-1) ||
+            ps2->c[0] != (unsigned)(-1) ||
+            ps2->c[1] != (unsigned)(-1) ||
+            ps2->c[2] != (unsigned)(-1) ||
+            ps2->c[3] != (unsigned)(-1) ||
+            ps2->d != (unsigned)(-1) ||
+            ps2->e != (unsigned)(-1)) {
+            H5_FAILED();
+            puts("    Incorrect values read from file");
+            goto error;
+        }
+        }
+    }
     }
     PASSED();
 
@@ -725,60 +725,60 @@ test_compound (char *filename, hid_t fapl)
 
     /* Initialize */
     for (i=0; i<NX*NY; i++) {
-	s5[i].a = s5[i].b = s5[i].d = s5[i].e = (unsigned)(-1);
-	s5[i].c[0] = s5[i].c[1] = s5[i].c[2] = s5[i].c[3] = (unsigned)(-1);
-	s5[i].pre = s5[i].mid1 = s5[i].mid2 = s5[i].post = (unsigned)(-1);
+    s5[i].a = s5[i].b = s5[i].d = s5[i].e = (unsigned)(-1);
+    s5[i].c[0] = s5[i].c[1] = s5[i].c[2] = s5[i].c[3] = (unsigned)(-1);
+    s5[i].pre = s5[i].mid1 = s5[i].mid2 = s5[i].post = (unsigned)(-1);
     }
 
     /* Read the hyperslab */
     if (H5Dread (dataset, s5_tid, s8_f_sid, s8_f_sid, PRESERVE, s5) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare */
     for (i=0; i<NX; i++) {
-	for (j=0; j<NY; j++) {
-	    s1_t *ps1 = s1 + i*NY + j;
-	    s5_t *ps5 = s5 + i*NY + j;
-	    if (i>=f_offset[0] &&
-		i<f_offset[0]+h_size[0] &&
-		j>=f_offset[1] &&
-		j<f_offset[1]+h_size[1]) {
-		if (ps5->pre != (unsigned)(-1) ||
-		    ps5->a != ps1->a ||
-		    ps5->b != ps1->b ||
-		    ps5->mid1 != (unsigned)(-1) ||
-		    ps5->c[0] != ps1->c[0] ||
-		    ps5->c[1] != ps1->c[1] ||
-		    ps5->c[2] != ps1->c[2] ||
-		    ps5->c[3] != ps1->c[3] ||
-		    ps5->mid2 != (unsigned)(-1) ||
-		    ps5->d != ps1->d ||
-		    ps5->e != ps1->e ||
-		    ps5->post != (unsigned)(-1)) {
-		    H5_FAILED();
-		    puts("    Memory values clobbered");
-		    goto error;
-		}
-	    } else {
-		if (ps5->pre != (unsigned)(-1) ||
-		    ps5->a != (unsigned)(-1) ||
-		    ps5->b != (unsigned)(-1) ||
-		    ps5->mid1 != (unsigned)(-1) ||
-		    ps5->c[0] != (unsigned)(-1) ||
-		    ps5->c[1] != (unsigned)(-1) ||
-		    ps5->c[2] != (unsigned)(-1) ||
-		    ps5->c[3] != (unsigned)(-1) ||
-		    ps5->mid2 != (unsigned)(-1) ||
-		    ps5->d != (unsigned)(-1) ||
-		    ps5->e != (unsigned)(-1) ||
-		    ps5->post != (unsigned)(-1)) {
-		    H5_FAILED();
-		    puts("    Incorrect values read from file");
-		    goto error;
-		}
-	    }
-	}
+    for (j=0; j<NY; j++) {
+        s1_t *ps1 = s1 + i*NY + j;
+        s5_t *ps5 = s5 + i*NY + j;
+        if (i>=f_offset[0] &&
+        i<f_offset[0]+h_size[0] &&
+        j>=f_offset[1] &&
+        j<f_offset[1]+h_size[1]) {
+        if (ps5->pre != (unsigned)(-1) ||
+            ps5->a != ps1->a ||
+            ps5->b != ps1->b ||
+            ps5->mid1 != (unsigned)(-1) ||
+            ps5->c[0] != ps1->c[0] ||
+            ps5->c[1] != ps1->c[1] ||
+            ps5->c[2] != ps1->c[2] ||
+            ps5->c[3] != ps1->c[3] ||
+            ps5->mid2 != (unsigned)(-1) ||
+            ps5->d != ps1->d ||
+            ps5->e != ps1->e ||
+            ps5->post != (unsigned)(-1)) {
+            H5_FAILED();
+            puts("    Memory values clobbered");
+            goto error;
+        }
+        } else {
+        if (ps5->pre != (unsigned)(-1) ||
+            ps5->a != (unsigned)(-1) ||
+            ps5->b != (unsigned)(-1) ||
+            ps5->mid1 != (unsigned)(-1) ||
+            ps5->c[0] != (unsigned)(-1) ||
+            ps5->c[1] != (unsigned)(-1) ||
+            ps5->c[2] != (unsigned)(-1) ||
+            ps5->c[3] != (unsigned)(-1) ||
+            ps5->mid2 != (unsigned)(-1) ||
+            ps5->d != (unsigned)(-1) ||
+            ps5->e != (unsigned)(-1) ||
+            ps5->post != (unsigned)(-1)) {
+            H5_FAILED();
+            puts("    Incorrect values read from file");
+            goto error;
+        }
+        }
+    }
     }
     PASSED();
 
@@ -799,56 +799,56 @@ test_compound (char *filename, hid_t fapl)
 
     /* Initialize */
     for (i=0; i<h_size[0]*h_size[1]; i++) {
-	s11[i].b = s11[i].d = (unsigned)(-1);
+    s11[i].b = s11[i].d = (unsigned)(-1);
     }
 
     /* Write to disk */
     if (H5Dwrite (dataset, s4_tid, s8_m_sid, s8_f_sid, PRESERVE, s11) < 0) {
-	goto error;
+    goto error;
     }
     HDfree (s11);
     s11=NULL;
 
     /* Read the whole thing */
     if (H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1) < 0) {
-	goto error;
+    goto error;
     }
 
     /* Compare */
     for (i=0; i<NX; i++) {
-	for (j=0; j<NY; j++) {
-	    s1_t *ps1 = s1 + i*NY + j;
-
-	    if (ps1->a != 8*(i*NY+j)+0 ||
-		ps1->c[0] != 8*(i*NY+j)+2 ||
-		ps1->c[1] != 8*(i*NY+j)+3 ||
-		ps1->c[2] != 8*(i*NY+j)+4 ||
-		ps1->c[3] != 8*(i*NY+j)+5 ||
-		ps1->e != 8*(i*NY+j)+7) {
-		H5_FAILED();
-		puts("    Write clobbered values");
-		goto error;
-	    }
-
-	    if (i>=f_offset[0] &&
-		i<f_offset[0]+h_size[0] &&
-		j>=f_offset[1] &&
-		j<f_offset[1]+h_size[1]) {
-		if (ps1->b != (unsigned)(-1) ||
-		    ps1->d != (unsigned)(-1)) {
-		    H5_FAILED();
-		    puts("    Wrong values written or read");
-		    goto error;
-		}
-	    } else {
-		if (ps1->b != 8*(i*NY+j)+1 ||
-		    ps1->d != 8*(i*NY+j)+6) {
-		    H5_FAILED();
-		    puts("    Write clobbered values");
-		    goto error;
-		}
-	    }
-	}
+    for (j=0; j<NY; j++) {
+        s1_t *ps1 = s1 + i*NY + j;
+
+        if (ps1->a != 8*(i*NY+j)+0 ||
+        ps1->c[0] != 8*(i*NY+j)+2 ||
+        ps1->c[1] != 8*(i*NY+j)+3 ||
+        ps1->c[2] != 8*(i*NY+j)+4 ||
+        ps1->c[3] != 8*(i*NY+j)+5 ||
+        ps1->e != 8*(i*NY+j)+7) {
+        H5_FAILED();
+        puts("    Write clobbered values");
+        goto error;
+        }
+
+        if (i>=f_offset[0] &&
+        i<f_offset[0]+h_size[0] &&
+        j>=f_offset[1] &&
+        j<f_offset[1]+h_size[1]) {
+        if (ps1->b != (unsigned)(-1) ||
+            ps1->d != (unsigned)(-1)) {
+            H5_FAILED();
+            puts("    Wrong values written or read");
+            goto error;
+        }
+        } else {
+        if (ps1->b != 8*(i*NY+j)+1 ||
+            ps1->d != 8*(i*NY+j)+6) {
+            H5_FAILED();
+            puts("    Write clobbered values");
+            goto error;
+        }
+        }
+    }
     }
 
     /*
@@ -873,29 +873,29 @@ error:
     puts("*** DATASET TESTS FAILED ***");
 
     /* Release resources */
-    if(s1) 
+    if(s1)
         HDfree(s1);
-    if(s2) 
+    if(s2)
         HDfree(s2);
-    if(s3) 
+    if(s3)
         HDfree(s3);
-    if(s4) 
+    if(s4)
         HDfree(s4);
-    if(s5) 
+    if(s5)
         HDfree(s5);
-    if(s6) 
+    if(s6)
         HDfree(s6);
 
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	initialize_stype1
+ * Function:    initialize_stype1
  *
- * Purpose:	Initialize data buffer.
+ * Purpose:    Initialize data buffer.
  *
- * Return:	void
+ * Return:    void
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -906,22 +906,22 @@ error:
 static void
 initialize_stype1(unsigned char *buf, size_t num)
 {
-    int	  i, j;
+    int      i, j;
     stype1 *s_ptr;
 
     for(i = 0; i < (int)num; i++) {
-	s_ptr = (stype1 *)((void *)buf) + i;
-	s_ptr->a    = i * 8 + 0;
-	s_ptr->b    = i * 8 + 1;
+    s_ptr = (stype1 *)((void *)buf) + i;
+    s_ptr->a    = i * 8 + 0;
+    s_ptr->b    = i * 8 + 1;
         for(j = 0; j < 8; j++)
-	    s_ptr->c[j] = i * 8 + j;
-	s_ptr->d    = i * 8 + 6;
-	s_ptr->e    = i * 8 + 7;
+        s_ptr->c[j] = i * 8 + j;
+    s_ptr->d    = i * 8 + 6;
+    s_ptr->e    = i * 8 + 7;
 
         s_ptr->f    = (float)(i * 2 / 3);
         s_ptr->g    = (float)(i * 2 / 3 + 1);
         for(j = 0; j < 16; j++)
-	    s_ptr->h[j] = (float)(i * j / 5 + j);
+        s_ptr->h[j] = (float)(i * j / 5 + j);
         s_ptr->i    = (float)(i * 2 / 3 + 2);
         s_ptr->j    = (float)(i * 2 / 3 + 3);
 
@@ -932,13 +932,13 @@ initialize_stype1(unsigned char *buf, size_t num)
     }
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	initialize_stype2
+ * Function:    initialize_stype2
  *
- * Purpose:	Initialize data buffer.
+ * Purpose:    Initialize data buffer.
  *
- * Return:	void
+ * Return:    void
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -953,18 +953,18 @@ initialize_stype2(unsigned char *buf, size_t num)
     stype2 *s_ptr;
 
     for(i = 0; i < num; i++) {
-	s_ptr = (stype2 *)((void *)buf) + i;
-	s_ptr->a    = (int)(i * 8 + 0);
-	s_ptr->b    = (int)(i * 8 + 1);
+    s_ptr = (stype2 *)((void *)buf) + i;
+    s_ptr->a    = (int)(i * 8 + 0);
+    s_ptr->b    = (int)(i * 8 + 1);
         for(j = 0; j < 8; j++)
-	    s_ptr->c[j] = (int)(i * 8 + j);
-	s_ptr->d    = (int)(i * 8 + 6);
-	s_ptr->e    = (int)(i * 8 + 7);
+        s_ptr->c[j] = (int)(i * 8 + j);
+    s_ptr->d    = (int)(i * 8 + 6);
+    s_ptr->e    = (int)(i * 8 + 7);
 
         s_ptr->f    = (float)(i * 2 / 3);
         s_ptr->g    = (float)(i * 2 / 3 + 1);
         for(j = 0; j < 16; j++)
-	    s_ptr->h[j] = (float)(i * j / 5 + j);
+        s_ptr->h[j] = (float)(i * j / 5 + j);
         s_ptr->i    = (float)(i * 2 / 3 + 2);
         s_ptr->j    = (float)(i * 2 / 3 + 3);
 
@@ -979,13 +979,13 @@ initialize_stype2(unsigned char *buf, size_t num)
     }
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	initialize_stype3
+ * Function:    initialize_stype3
  *
- * Purpose:	Initialize data buffer.
+ * Purpose:    Initialize data buffer.
  *
- * Return:	Success:
+ * Return:    Success:
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -996,27 +996,27 @@ initialize_stype2(unsigned char *buf, size_t num)
 static void
 initialize_stype3(unsigned char *buf, size_t num)
 {
-    int	  i, j;
+    int      i, j;
     stype3 *s_ptr;
 
     for(i = 0; i < (int)num; i++) {
-	s_ptr = (stype3 *)((void *)buf) + i;
-	s_ptr->a    = i * 8 + 0;
-	s_ptr->b    = i * 8 + 1;
+    s_ptr = (stype3 *)((void *)buf) + i;
+    s_ptr->a    = i * 8 + 0;
+    s_ptr->b    = i * 8 + 1;
         for(j = 0; j < 8; j++)
-	    s_ptr->c[j] = i * 8 + j;
-	s_ptr->d    = i * 8 + 6;
-	s_ptr->e    = i * 8 + 7;
+        s_ptr->c[j] = i * 8 + j;
+    s_ptr->d    = i * 8 + 6;
+    s_ptr->e    = i * 8 + 7;
     }
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	initialize_stype4
+ * Function:    initialize_stype4
  *
- * Purpose:	Initialize data buffer.
+ * Purpose:    Initialize data buffer.
  *
- * Return:	void
+ * Return:    void
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -1031,18 +1031,18 @@ initialize_stype4(unsigned char *buf, size_t num)
     stype4 *s_ptr;
 
     for(i = 0; i < num; i++) {
-	s_ptr = (stype4 *)((void *)buf) + i;
-	s_ptr->a    = (int)(i * 8 + 0);
-	s_ptr->b    = (int)(i * 8 + 1);
+    s_ptr = (stype4 *)((void *)buf) + i;
+    s_ptr->a    = (int)(i * 8 + 0);
+    s_ptr->b    = (int)(i * 8 + 1);
         for(j = 0; j < 8; j++)
-	    s_ptr->c[j] = (int)(i * 8 + j);
-	s_ptr->d    = (int)(i * 8 + 6);
-	s_ptr->e    = (int)(i * 8 + 7);
+        s_ptr->c[j] = (int)(i * 8 + j);
+    s_ptr->d    = (int)(i * 8 + 6);
+    s_ptr->e    = (int)(i * 8 + 7);
 
         s_ptr->f    = (float)(i * 2 / 3);
         s_ptr->g    = (float)(i * 2 / 3 + 1);
         for(j = 0; j < 16; j++)
-	    s_ptr->h[j] = (float)(i * j / 5 + j);
+        s_ptr->h[j] = (float)(i * j / 5 + j);
         s_ptr->i    = (float)(i * 2 / 3 + 2);
         s_ptr->j    = (float)(i * 2 / 3 + 3);
 
@@ -1061,13 +1061,13 @@ initialize_stype4(unsigned char *buf, size_t num)
     }
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_stype1
+ * Function:    create_stype1
  *
- * Purpose:	Create HDF5 compound datatype for stype1.
+ * Purpose:    Create HDF5 compound datatype for stype1.
  *
- * Return:	Success:        datatype ID
+ * Return:    Success:        datatype ID
  *
  *              Failure:        negative
  *
@@ -1081,7 +1081,7 @@ static hid_t
 create_stype1(void)
 {
     hid_t   array_dt1, array_dt2, tid;
-    const hsize_t	eight = 8, sixteen = 16;
+    const hsize_t    eight = 8, sixteen = 16;
 
     /* Build hdf5 datatypes */
     if((array_dt1 = H5Tarray_create2(H5T_NATIVE_INT,1, &eight)) < 0)
@@ -1117,13 +1117,13 @@ error:
     return FAIL;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_stype2
+ * Function:    create_stype2
  *
- * Purpose:	Create HDF5 compound datatype for stype2.
+ * Purpose:    Create HDF5 compound datatype for stype2.
  *
- * Return:	Success:        datatype ID
+ * Return:    Success:        datatype ID
  *
  *              Failure:        negative
  *
@@ -1137,7 +1137,7 @@ static hid_t
 create_stype2(void)
 {
     hid_t   array_dt1, array_dt2, tid;
-    const hsize_t	eight = 8, sixteen = 16;
+    const hsize_t    eight = 8, sixteen = 16;
 
     /* Build hdf5 datatypes */
     if((array_dt1 = H5Tarray_create2(H5T_NATIVE_INT,1, &eight)) < 0)
@@ -1176,13 +1176,13 @@ error:
     return FAIL;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_stype3
+ * Function:    create_stype3
  *
- * Purpose:	Create HDF5 compound datatype for stype3.
+ * Purpose:    Create HDF5 compound datatype for stype3.
  *
- * Return:	Success:        datatype ID
+ * Return:    Success:        datatype ID
  *
  *              Failure:        negative
  *
@@ -1196,7 +1196,7 @@ static hid_t
 create_stype3(void)
 {
     hid_t   array_dt1, tid;
-    const hsize_t	eight = 8;
+    const hsize_t    eight = 8;
 
     /* Build hdf5 datatypes */
     if((array_dt1 = H5Tarray_create2(H5T_NATIVE_INT,1, &eight)) < 0)
@@ -1219,13 +1219,13 @@ error:
     return FAIL;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_stype4
+ * Function:    create_stype4
  *
- * Purpose:	Create HDF5 compound datatype for stype4.
+ * Purpose:    Create HDF5 compound datatype for stype4.
  *
- * Return:	Success:        datatype ID
+ * Return:    Success:        datatype ID
  *
  *              Failure:        negative
  *
@@ -1239,7 +1239,7 @@ static hid_t
 create_stype4(void)
 {
     hid_t   array_dt1, array_dt2, tid;
-    const hsize_t	eight = 8, sixteen = 16;
+    const hsize_t    eight = 8, sixteen = 16;
 
     /* Build hdf5 datatypes */
     if((array_dt1 = H5Tarray_create2(H5T_NATIVE_INT,1, &eight)) < 0)
@@ -1281,13 +1281,13 @@ error:
     return FAIL;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	compare_data
+ * Function:    compare_data
  *
- * Purpose:	Compare data of stype1 and stype2.
+ * Purpose:    Compare data of stype1 and stype2.
  *
- * Return:	Success:        0
+ * Return:    Success:        0
  *
  *              Failure:        negative
  *
@@ -1306,21 +1306,21 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset)
 
     for(i = 0; i < (int)(NX * NY); i++) {
         if(src_subset) {
-	   s_ptr = ((stype1 *)src_data) + i;
-	   d_ptr = ((stype2 *)dst_data) + i;
+    s_ptr = ((stype1 *)src_data) + i;
+    d_ptr = ((stype2 *)dst_data) + i;
         } else {
-	   s_ptr = (stype1 *)(((stype2 *)src_data) + i);
-	   d_ptr = (stype2 *)(((stype1 *)dst_data) + i);
+    s_ptr = (stype1 *)(((stype2 *)src_data) + i);
+    d_ptr = (stype2 *)(((stype1 *)dst_data) + i);
         }
 
-	if (s_ptr->a    != d_ptr->a    ||
-	    s_ptr->b    != d_ptr->b    ||
-	    s_ptr->c[0] != d_ptr->c[0] ||
-	    s_ptr->c[1] != d_ptr->c[1] ||
-	    s_ptr->c[2] != d_ptr->c[2] ||
-	    s_ptr->c[3] != d_ptr->c[3] ||
-	    s_ptr->d    != d_ptr->d    ||
-	    s_ptr->e    != d_ptr->e    ||
+    if (s_ptr->a    != d_ptr->a    ||
+        s_ptr->b    != d_ptr->b    ||
+        s_ptr->c[0] != d_ptr->c[0] ||
+        s_ptr->c[1] != d_ptr->c[1] ||
+        s_ptr->c[2] != d_ptr->c[2] ||
+        s_ptr->c[3] != d_ptr->c[3] ||
+        s_ptr->d    != d_ptr->d    ||
+        s_ptr->e    != d_ptr->e    ||
             !H5_FLT_ABS_EQUAL(s_ptr->f, d_ptr->f) ||
             !H5_FLT_ABS_EQUAL(s_ptr->g, d_ptr->g) ||
             !H5_FLT_ABS_EQUAL(s_ptr->h[0], d_ptr->h[0]) ||
@@ -1332,25 +1332,25 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset)
             !H5_DBL_ABS_EQUAL(s_ptr->m, d_ptr->m) ||
             !H5_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",
-		   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],
+        H5_FAILED();
+        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, (double)s_ptr->f, (double)s_ptr->g,(double)s_ptr->h[0],(double)s_ptr->h[1],(double)s_ptr->h[2],
                    (double)s_ptr->h[3],(double)s_ptr->h[4],(double)s_ptr->h[5],(double)s_ptr->h[6],(double)s_ptr->h[7],(double)s_ptr->h[8],
                    (double)s_ptr->h[9],(double)s_ptr->h[10],(double)s_ptr->h[11],(double)s_ptr->h[12],(double)s_ptr->h[13],(double)s_ptr->h[14],
                    (double)s_ptr->h[15], (double)s_ptr->i,(double)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",
-		   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],
+        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, (double)d_ptr->f, (double)d_ptr->g,(double)d_ptr->h[0],(double)d_ptr->h[1],(double)d_ptr->h[2],
                    (double)d_ptr->h[3],(double)d_ptr->h[4],(double)d_ptr->h[5],(double)d_ptr->h[6],(double)d_ptr->h[7],(double)d_ptr->h[8],
                    (double)d_ptr->h[9],(double)d_ptr->h[10],(double)d_ptr->h[11],(double)d_ptr->h[12],(double)d_ptr->h[13],
                    (double)d_ptr->h[14],(double)d_ptr->h[15],(double)d_ptr->i,(double)d_ptr->j,d_ptr->k,d_ptr->l,
                    d_ptr->m,d_ptr->n);
-	    goto error;
-	}
+        goto error;
+    }
     }
 
     return SUCCEED;
@@ -1359,11 +1359,11 @@ error:
     return FAIL;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_hdf5_src_subset
+ * Function:    test_hdf5_src_subset
  *
- * Purpose:	Test the optimization of compound data writing, rewriting,
+ * Purpose:    Test the optimization of compound data writing, rewriting,
  *              and reading when the source type is a subset of destination
  *              type.  For example:
  *                  struct source {            struct destination {
@@ -1375,11 +1375,11 @@ error:
  *                                             };
  *              This optimization is for the Chicago company.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Friday, 15 June 2007
  *
  * Modifications:
@@ -1399,7 +1399,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Create the file for this test */
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+    goto error;
 
     /* Build hdf5 datatypes */
     if ((src_tid=create_stype1()) < 0)
@@ -1413,7 +1413,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Create the data space */
     if((space = H5Screate_simple(2, dims, NULL)) < 0)
-	goto error;
+    goto error;
 
     /* Allocate space and initialize data */
     orig = (unsigned char*)HDmalloc(NX * NY * sizeof(stype1));
@@ -1441,7 +1441,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, src_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig) < 0)
-	goto error;
+    goto error;
 
     if(H5Dclose(dataset) < 0)
         goto error;
@@ -1456,7 +1456,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, src_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig) < 0)
-	goto error;
+    goto error;
 
     if(H5Dclose(dataset) < 0)
         goto error;
@@ -1482,7 +1482,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     if(H5Dclose(dataset) < 0)
         FAIL_STACK_ERROR
@@ -1493,7 +1493,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	FAIL_STACK_ERROR
+    FAIL_STACK_ERROR
 
     if(H5Dclose(dataset) < 0)
         FAIL_STACK_ERROR
@@ -1559,15 +1559,15 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
     return 0;
 
 error:
-    puts("*** DATASET TESTS FAILED ***");
+    HDputs("*** DATASET TESTS FAILED ***");
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_hdf5_dst_subset
+ * Function:    test_hdf5_dst_subset
  *
- * Purpose:	Test the optimization of compound data writing, rewriting,
+ * Purpose:    Test the optimization of compound data writing, rewriting,
  *              and reading when the destination type is a subset of the
  *              source type.  For example:
  *                  struct source {            struct destination {
@@ -1580,11 +1580,11 @@ error:
  *              This optimization is for the Chicago company.  This test
  *              is in opposite of test_hdf5_src_subset.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Friday, 15 June 2007
  *
  * Modifications:
@@ -1604,7 +1604,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 
     /* Create the file for this test */
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+    goto error;
 
     /* Build hdf5 datatypes */
     if ((src_tid=create_stype2()) < 0)
@@ -1618,7 +1618,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 
     /* Create the data space */
     if((space = H5Screate_simple(2, dims, NULL)) < 0)
-	goto error;
+    goto error;
 
     /* Allocate space and initialize data */
     orig = (unsigned char*)HDmalloc(NX * NY * sizeof(stype2));
@@ -1645,7 +1645,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, src_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig) < 0)
-	goto error;
+    goto error;
 
     if(H5Dclose(dataset) < 0)
         goto error;
@@ -1660,7 +1660,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, src_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig) < 0)
-	goto error;
+    goto error;
 
     if(H5Dclose(dataset) < 0)
         goto error;
@@ -1686,7 +1686,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	goto error;
+    goto error;
 
     if(H5Dclose(dataset) < 0)
         goto error;
@@ -1697,7 +1697,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	goto error;
+    goto error;
 
     if(H5Dclose(dataset) < 0)
         goto error;
@@ -1773,27 +1773,27 @@ 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;                                                                \
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_pack_ooo
+ * Function:    test_pack_ooo
  *
- * Purpose:	Test inserting fields into a compound out of offset order.
+ * Purpose:    Test inserting fields into a compound out of offset order.
  *              Verifies that the compound is correctly marked as packed
  *              or non-packed.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Neil Fortner
+ * Programmer:    Neil Fortner
  *              Thursday, 22 January 2009
  *
  * Modifications:
@@ -1840,9 +1840,9 @@ test_pack_ooo(void)
 
     for(extra_space=0; extra_space<2; extra_space ++) {
         if(extra_space)
-            puts("With extra space at the end of compound...");
+            HDputs("With extra space at the end of compound...");
         else
-            puts("Without extra space at the end of compound...");
+            HDputs("Without extra space at the end of compound...");
 
         TESTING("random member insertion with empty compound subtype");
 
@@ -1854,7 +1854,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
@@ -1880,7 +1880,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
@@ -1907,7 +1907,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
@@ -1933,7 +1933,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
@@ -1960,7 +1960,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
@@ -1986,7 +1986,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
@@ -2007,32 +2007,32 @@ test_pack_ooo(void)
     return 0;
 
 error:
-    puts("*** DATASET TESTS FAILED ***");
+HDputs("*** DATASET TESTS FAILED ***");
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_ooo_order
+ * Function:    test_ooo_order
  *
- * Purpose:	Test inserting fields into a compound out of offset order.
+ * Purpose:    Test inserting fields into a compound out of offset order.
  *              Verifies that the order of compound members is the same as
  *              the order in which they were inserted.  While this is
  *              explicitly not guaranteed by the documentation, the H5TB
  *              API currently makes this assumption.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Neil Fortner
+ * Programmer:    Neil Fortner
  *              Monday, 19 October 2009
  *
  * Modifications:
  *-------------------------------------------------------------------------
  */
 static unsigned
-test_ooo_order(char *filename)
+test_ooo_order(char *filename, hid_t fapl_id)
 {
     hid_t       file = -1;          /* File ID */
     hid_t       dtype = -1;         /* Datatype IDs */
@@ -2042,7 +2042,7 @@ test_ooo_order(char *filename)
     TESTING("that compound member insertion order is preserved")
 
     /* Create the file */
-    if ((file = H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((file = H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR
 
     /* Create the compound */
@@ -2070,7 +2070,7 @@ test_ooo_order(char *filename)
     /* Close and reopen the file */
     if(H5Tclose(dtype)) TEST_ERROR
     if(H5Fclose(file)) TEST_ERROR
-    if((file = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR
 
     /* Open the type */
     if((dtype_tmp = H5Topen2(file, "dtype", H5P_DEFAULT)) < 0) TEST_ERROR
@@ -2123,7 +2123,7 @@ test_ooo_order(char *filename)
     if(H5Tclose(dtype_tmp)) TEST_ERROR
     if(H5Tclose(dtype)) TEST_ERROR
     if(H5Fclose(file)) TEST_ERROR
-    if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id)) < 0) TEST_ERROR
 
     /* Open the type, and verify status */
     if((dtype_tmp = H5Topen2(file, "dtype2", H5P_DEFAULT)) < 0) TEST_ERROR
@@ -2183,18 +2183,18 @@ error:
         H5Tclose(dtype);
         H5Fclose(file);
     } H5E_END_TRY
-    puts("*** DATASET TESTS FAILED ***");
+    HDputs("*** DATASET TESTS FAILED ***");
     return 1;
 } /* test_ooo_order */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test different cases of I/O for compound data and the
+ * Purpose:    Test different cases of I/O for compound data and the
  *              compound optimization for the Chicago company.
  *
- * Return:	Success:         0
+ * Return:    Success:         0
  *
  *              Failure:         1
  *
@@ -2207,19 +2207,19 @@ error:
 int
 main (int argc, char *argv[])
 {
-    hid_t	fapl_id;
-    char	fname[256];
-    unsigned 	nerrors = 0;
+    hid_t    fapl_id;
+    char    fname[256];
+    unsigned     nerrors = 0;
 
     h5_reset();
 
     /* Turn off optimized compound converter? */
     if (argc>1) {
-	if (argc>2 || strcmp("--noopt", argv[1])) {
-	    fprintf(stderr, "usage: %s [--noopt]\n", argv[0]);
-	    exit(EXIT_FAILURE);
-	}
-	H5Tunregister(H5T_PERS_DONTCARE, NULL, (hid_t)-1, (hid_t)-1, H5T__conv_struct_opt);
+    if (argc>2 || strcmp("--noopt", argv[1])) {
+        HDfprintf(stderr, "usage: %s [--noopt]\n", argv[0]);
+        exit(EXIT_FAILURE);
+    }
+    H5Tunregister(H5T_PERS_DONTCARE, NULL, (hid_t)-1, (hid_t)-1, (H5T_conv_t)((void (*) (void))H5T__conv_struct_opt));
     }
 
     /* Create the file */
@@ -2227,33 +2227,33 @@ main (int argc, char *argv[])
 
     h5_fixname(FILENAME[0], fapl_id, fname, sizeof(fname));
 
-    puts("Testing compound dataset:");
+    HDputs("Testing compound dataset:");
     nerrors += test_compound(fname, fapl_id);
 
-    puts("Testing the optimization of when the source type is a subset of the dest:");
+    HDputs("Testing the optimization of when the source type is a subset of the dest:");
     h5_fixname(FILENAME[1], fapl_id, fname, sizeof(fname));
     nerrors += test_hdf5_src_subset(fname, fapl_id);
 
-    puts("Testing the optimization of when the dest type is a subset of the source:");
+    HDputs("Testing the optimization of when the dest type is a subset of the source:");
     h5_fixname(FILENAME[2], fapl_id, fname, sizeof(fname));
     nerrors += test_hdf5_dst_subset(fname, fapl_id);
 
-    puts("Testing that compound types can be packed out of order:");
+    HDputs("Testing that compound types can be packed out of order:");
     nerrors += test_pack_ooo();
 
-    puts("Testing compound member ordering:");
-    nerrors += test_ooo_order(fname);
+    HDputs("Testing compound member ordering:");
+    nerrors += test_ooo_order(fname, fapl_id);
 
     /* Verify symbol table messages are cached */
     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(EXIT_FAILURE);
     }
 
     h5_cleanup(FILENAME, fapl_id);
-    puts("All compound dataset tests passed.");
+    HDputs("All compound dataset tests passed.");
     return 0;
 }
diff --git a/test/cork.c b/test/cork.c
index 240be77..09076d2 100644
--- a/test/cork.c
+++ b/test/cork.c
@@ -24,9 +24,9 @@
  * This file needs to access private information from the H5C package.
  * This file also needs to access the metadata cache testing code.
  */
-#define H5C_FRIEND		/*suppress error about including H5Cpkg	  */
-#define H5C_TESTING		/*suppress warning about H5C testing funcs*/
-#include "H5Cpkg.h"		/* Cache				*/
+#define H5C_FRIEND        /*suppress error about including H5Cpkg      */
+#define H5C_TESTING        /*suppress warning about H5C testing funcs*/
+#include "H5Cpkg.h"        /* Cache                */
 
 
 /* ============ */
@@ -74,7 +74,7 @@ static unsigned verify_group_cork(hbool_t swmr);
 static unsigned verify_named_cork(hbool_t swmr);
 static unsigned verify_multiple_cork(hbool_t swmr);
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    verify_old_dset_cork
  *
@@ -120,15 +120,15 @@ verify_old_dset_cork(void)
         FAIL_STACK_ERROR
 
     /* Create chunked dataset with v1-btree indexing: DSET_BT1 */
-    if((sid = H5Screate_simple(2, dims, max_dims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, max_dims)) < 0)
         TEST_ERROR
     if((did = H5Dcreate2(fid, DSET_BT1, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    
+
     /* Get dataset object header address: DSET_BT1 */
     if(H5Oget_info2(did, &oinfo, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    
+
     /* Cork the dataset: DSET_BT1 */
     if(H5Odisable_mdc_flushes(did) < 0)
         TEST_ERROR
@@ -159,13 +159,13 @@ verify_old_dset_cork(void)
         FAIL_STACK_ERROR
     if(H5Pset_alloc_time(dcpl2, H5D_ALLOC_TIME_EARLY) < 0)
         FAIL_STACK_ERROR
-    if((did2 = H5Dcreate2(fid, DSET_COMPACT, H5T_NATIVE_INT, sid2, H5P_DEFAULT, dcpl2, H5P_DEFAULT)) < 0) 
+    if((did2 = H5Dcreate2(fid, DSET_COMPACT, H5T_NATIVE_INT, sid2, H5P_DEFAULT, dcpl2, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Get dataset object address */
     if(H5Oget_info2(did2, &oinfo2, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    
+
     /* Cork the dataset: DSET_COMPACT */
     if(H5Odisable_mdc_flushes(did2) < 0)
         TEST_ERROR
@@ -212,7 +212,7 @@ verify_old_dset_cork(void)
         FAIL_STACK_ERROR
     if(H5Pset_layout(dcpl3, H5D_CONTIGUOUS) < 0)
         FAIL_STACK_ERROR
-    if((did3 = H5Dcreate2(fid, DSET_CONTIG, H5T_NATIVE_INT, sid3, H5P_DEFAULT, dcpl3, H5P_DEFAULT)) < 0) 
+    if((did3 = H5Dcreate2(fid, DSET_CONTIG, H5T_NATIVE_INT, sid3, H5P_DEFAULT, dcpl3, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Get dataset object address: DSET_CONTIG */
@@ -224,11 +224,11 @@ verify_old_dset_cork(void)
         TEST_ERROR
 
     /* Verify the cork status for DSET_CONTIG */
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Verify the cork status for DSET_BT1 */
-    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Un-cork the dataset: DSET_CONTIG */
@@ -236,7 +236,7 @@ verify_old_dset_cork(void)
         TEST_ERROR
 
     /* Verify the cork status for DSET_CONTIG */
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Closing */
@@ -268,7 +268,7 @@ error:
     return 1;
 } /* verify_old_dset_cork */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    verify_obj_dset_cork
  *
@@ -325,23 +325,23 @@ verify_obj_dset_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Create dataset: DSET */
-    if((did = H5Dcreate2(fid, DSET, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((did = H5Dcreate2(fid, DSET, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Get dataset object header address */
     if(H5Oget_info2(did, &oinfo, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    
+
     /* Verify cork status of the dataset: DSET */
     if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0)
         TEST_ERROR
-    
+
     /* Cork the dataset: DSET */
     if(H5Odisable_mdc_flushes(did) < 0)
         TEST_ERROR
 
     /* Attach and write to an attribute to the dataset: DSET */
-    if((aid = H5Acreate2(did, ATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((aid = H5Acreate2(did, ATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Verify cork status of the dataset: DSET */
@@ -349,24 +349,24 @@ verify_obj_dset_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Close the attribute */
-    if(H5Aclose(aid) < 0) 
+    if(H5Aclose(aid) < 0)
         TEST_ERROR
 
     /* Verify cork status of the dataset: DSET */
     if(H5C__verify_cork_tag_test(fid, oinfo.addr, TRUE) < 0)
         TEST_ERROR
-    
+
     /* Create dcpl */
     if((dcpl2 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         TEST_ERROR
     /* Set to early allocation for dataset space */
-    if(H5Pset_alloc_time(dcpl2, H5D_ALLOC_TIME_EARLY) < 0) 
+    if(H5Pset_alloc_time(dcpl2, H5D_ALLOC_TIME_EARLY) < 0)
         TEST_ERROR
 
     /* Create chunked dataset with implicit indexing: DSET_NONE */
     if(H5Pset_chunk(dcpl2, 1, chunk_dim) < 0)
         FAIL_STACK_ERROR
-    if((sid2 = H5Screate_simple(1, dim, NULL)) < 0) 
+    if((sid2 = H5Screate_simple(1, dim, NULL)) < 0)
         TEST_ERROR
     if((did2 = H5Dcreate2(fid, DSET_NONE, H5T_NATIVE_INT, sid2, H5P_DEFAULT, dcpl2, H5P_DEFAULT)) < 0)
         TEST_ERROR
@@ -391,7 +391,7 @@ verify_obj_dset_cork(hbool_t swmr)
     } /* end for */
 
     /* Verify cork status of the dataset: DSET_NONE */
-    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Closing */
@@ -412,11 +412,11 @@ verify_obj_dset_cork(hbool_t swmr)
     flags = H5F_ACC_RDWR;
     if(swmr)
         flags |= H5F_ACC_SWMR_WRITE;
-    if((fid = H5Fopen(FILENAME, flags, fapl)) < 0) 
+    if((fid = H5Fopen(FILENAME, flags, fapl)) < 0)
         TEST_ERROR
 
     /* Open the dataset object: DSET_NONE */
-    if((oid = H5Oopen(fid, DSET_NONE, H5P_DEFAULT)) < 0) 
+    if((oid = H5Oopen(fid, DSET_NONE, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Verify cork status of the dataset: DSET */
@@ -469,7 +469,7 @@ error:
     return 1;
 } /* verify_obj_dset_cork */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    verify_dset_cork
  *
@@ -540,15 +540,15 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format)
         FAIL_STACK_ERROR
 
     /* Create chunked dataset with extensive array indexing: DSET_EA */
-    if((sid = H5Screate_simple(2, dims, max_dims)) < 0) 
+    if((sid = H5Screate_simple(2, dims, max_dims)) < 0)
         TEST_ERROR
     if((did = H5Dcreate2(fid, DSET_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    
+
     /* Get dataset object header address: DSET_EA */
     if(H5Oget_info2(did, &oinfo, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    
+
     /* Cork the dataset: DSET_EA */
     if(H5Odisable_mdc_flushes(did) < 0)
         TEST_ERROR
@@ -558,7 +558,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format)
         TEST_ERROR
 
     /* Create chunked dataset with fixed array indexing: DSET_FA */
-    if((sid2 = H5Screate_simple(2, dims, NULL)) < 0) 
+    if((sid2 = H5Screate_simple(2, dims, NULL)) < 0)
         TEST_ERROR
     if((did2 = H5Dcreate2(fid, DSET_FA, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
@@ -566,7 +566,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format)
     /* Get dataset object header address: DSET_FA */
     if(H5Oget_info2(did2, &oinfo2, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    
+
     /* Cork the dataset: DSET_FA */
     if(H5Odisable_mdc_flushes(did2) < 0)
         TEST_ERROR
@@ -585,7 +585,7 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format)
 
     /* Create chunked dataset with v2-Btree indexing */
     max_dims[0] = H5S_UNLIMITED;
-    if((sid3 = H5Screate_simple(2, dims, max_dims)) < 0) 
+    if((sid3 = H5Screate_simple(2, dims, max_dims)) < 0)
         TEST_ERROR
     if((did3 = H5Dcreate2(fid, DSET_BT2, H5T_NATIVE_INT, sid3, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         TEST_ERROR
@@ -708,7 +708,7 @@ error:
 } /* verify_dset_cork */
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    verify_group_cork
  *
@@ -758,11 +758,11 @@ verify_group_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Create 3 groups */
-    if((gid = H5Gcreate2(fid, GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gid2 = H5Gcreate2(gid, GRP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid2 = H5Gcreate2(gid, GRP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gid3 = H5Gcreate2(gid2, GRP3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid3 = H5Gcreate2(gid2, GRP3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Cork the second group: GRP2 */
@@ -778,23 +778,23 @@ verify_group_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Verify cork status of the groups */
-    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0)
         TEST_ERROR
-    
+
     /* Close the second group: GRP2 */
     if(H5Gclose(gid2) < 0)
         TEST_ERROR
 
     /* Re-open the second group: GRP2 */
-    if((gid2 = H5Gopen2(gid, GRP2, H5P_DEFAULT)) < 0) 
+    if((gid2 = H5Gopen2(gid, GRP2, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Verify cork status of the second group: GRP2 */
-    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Closing */
@@ -813,11 +813,11 @@ verify_group_cork(hbool_t swmr)
         flags |= H5F_ACC_SWMR_WRITE;
     if((fid = H5Fopen(FILENAME, flags, fapl)) < 0)
         FAIL_STACK_ERROR
-    if((gid = H5Gopen2(fid, GRP, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gopen2(fid, GRP, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((gid2 = H5Gopen2(gid, GRP2, H5P_DEFAULT)) < 0) 
+    if((gid2 = H5Gopen2(gid, GRP2, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((gid3 = H5Gopen2(gid2, GRP3, H5P_DEFAULT)) < 0) 
+    if((gid3 = H5Gopen2(gid2, GRP3, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Create dataspace */
@@ -826,7 +826,7 @@ verify_group_cork(hbool_t swmr)
 
     /* Attach 8 attributes to the third group: GRP3 */
     for(i = 0;i < 8; i++) {
-        sprintf(attrname, "attr %d", i);
+        HDsprintf(attrname, "attr %d", i);
         if((aid = H5Acreate2(gid3, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             TEST_ERROR
         if(H5Awrite(aid, H5T_NATIVE_UINT, &i) < 0)
@@ -835,7 +835,7 @@ verify_group_cork(hbool_t swmr)
         if(i == 3) {
             if(H5Odisable_mdc_flushes(gid3) < 0)
                 TEST_ERROR
-            if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0) 
+            if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0)
                 TEST_ERROR
         }
         if(H5Aclose(aid) < 0)
@@ -843,7 +843,7 @@ verify_group_cork(hbool_t swmr)
     } /* end for */
 
     /* Verify cork status of the third group: GRP3 */
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Closing */
@@ -875,7 +875,7 @@ error:
     return 1;
 } /* verify_group_cork */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    verify_named_cork
  *
@@ -935,21 +935,21 @@ verify_named_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Commit datatype /DT */
-    if(H5Tcommit2(fid, DT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) 
+    if(H5Tcommit2(fid, DT, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Create /GRP */
-    if((gid = H5Gcreate2(fid, GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
     /* Commit datatype /GRP/DT2 */
-    if(H5Tcommit2(gid, DT2, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) 
+    if(H5Tcommit2(gid, DT2, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Create /GRP/GRP2 */
-    if((gid2 = H5Gcreate2(gid, GRP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid2 = H5Gcreate2(gid, GRP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
     /* Commit datatype /GRP/GRP2/DT3 */
-    if(H5Tcommit2(gid2, DT3, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) 
+    if(H5Tcommit2(gid2, DT3, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Cork 2 named datatypes: /DT and /GRP/GRP2/DT3 */
@@ -967,11 +967,11 @@ verify_named_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Verify cork status of the named datatypes */
-    if(H5C__verify_cork_tag_test(fid, oinfo.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo.addr, TRUE) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, FALSE) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Close the datatypes */
@@ -983,19 +983,19 @@ verify_named_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Re-open the named datatypes */
-    if((tid = H5Topen2(fid, DT, H5P_DEFAULT)) < 0) 
+    if((tid = H5Topen2(fid, DT, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((tid2 = H5Topen2(gid, DT2, H5P_DEFAULT)) < 0) 
+    if((tid2 = H5Topen2(gid, DT2, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((tid3 = H5Topen2(gid2, DT3, H5P_DEFAULT)) < 0) 
+    if((tid3 = H5Topen2(gid2, DT3, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Verify cork status of the named datatypes */
-    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, FALSE) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Closing */
@@ -1019,17 +1019,17 @@ verify_named_cork(hbool_t swmr)
         flags |= H5F_ACC_SWMR_WRITE;
     if((fid = H5Fopen(FILENAME, flags, fapl)) < 0)
         FAIL_STACK_ERROR
-    if((gid = H5Gopen2(fid, GRP, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gopen2(fid, GRP, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((gid2 = H5Gopen2(gid, GRP2, H5P_DEFAULT)) < 0) 
+    if((gid2 = H5Gopen2(gid, GRP2, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Re-open the named datatypes */
-    if((tid = H5Topen2(fid, DT, H5P_DEFAULT)) < 0) 
+    if((tid = H5Topen2(fid, DT, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((tid2 = H5Topen2(gid, DT2, H5P_DEFAULT)) < 0) 
+    if((tid2 = H5Topen2(gid, DT2, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((tid3 = H5Topen2(gid2, DT3, H5P_DEFAULT)) < 0) 
+    if((tid3 = H5Topen2(gid2, DT3, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Cork the datatype: DT2 */
@@ -1042,7 +1042,7 @@ verify_named_cork(hbool_t swmr)
 
     /* Attach 8 attributes to datatype: DT3 */
     for(i = 0;i < 8; i++) {
-        sprintf(attrname, "attr %d", i);
+        HDsprintf(attrname, "attr %d", i);
         if((aid = H5Acreate2(tid3, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             TEST_ERROR
         if(H5Awrite(aid, H5T_NATIVE_UINT, &i) < 0)
@@ -1051,7 +1051,7 @@ verify_named_cork(hbool_t swmr)
         if(i == 3) {
             if(H5Odisable_mdc_flushes(tid3) < 0)
                 TEST_ERROR
-            if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0) 
+            if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0)
                 TEST_ERROR
         }
         if(H5Aclose(aid) < 0)
@@ -1059,7 +1059,7 @@ verify_named_cork(hbool_t swmr)
     } /* end for */
 
     /* Create a dataset with named datatype: DT */
-    if((did = H5Dcreate2(fid, DSET, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((did = H5Dcreate2(fid, DSET, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Get dataset object header address */
@@ -1071,20 +1071,20 @@ verify_named_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Verify cork status of the datatype: DT */
-    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo.addr, FALSE) < 0)
         TEST_ERROR
     /* Verify cork status of the datatype: DT2 */
-    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0)
         TEST_ERROR
     /* Verify cork status of the datatype: DT3 */
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Un-cork the datatype: DT3 */
     if(H5Oenable_mdc_flushes(tid3) < 0)
         TEST_ERROR
     /* Verify cork status of the datatype: DT3 */
-    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo3.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Cork the datatype: DT */
@@ -1092,14 +1092,14 @@ verify_named_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Verify cork status of the datatype: DT */
-    if(H5C__verify_cork_tag_test(fid, oinfo.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo.addr, TRUE) < 0)
         TEST_ERROR
     /* Verify cork status of the datatype: DT2 */
-    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo2.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Verify cork status of the dataset: DSET */
-    if(H5C__verify_cork_tag_test(fid, oinfo4.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo4.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Close the dataset */
@@ -1107,11 +1107,11 @@ verify_named_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Verify cork status of the datatype: DT */
-    if(H5C__verify_cork_tag_test(fid, oinfo.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Verify cork status of the dataset: DSET */
-    if(H5C__verify_cork_tag_test(fid, oinfo4.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid, oinfo4.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Closing */
@@ -1149,7 +1149,7 @@ error:
     return 1;
 } /* verify_named_cork */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    verify_multiple_cork
  *
@@ -1279,7 +1279,7 @@ verify_multiple_cork(hbool_t swmr)
     /* Verify cork status of the group: gid2 */
     if(H5Oget_info2(gid2, &oinfo1, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid2, oinfo1.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid2, oinfo1.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Check cork status of the group: gid1 */
@@ -1307,7 +1307,7 @@ verify_multiple_cork(hbool_t swmr)
     /* Verify cork status of the dataset: did1 */
     if(H5Oget_info2(did1, &oinfo2, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid1, oinfo2.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid1, oinfo2.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Check cork status of the dataset: did2 */
@@ -1335,7 +1335,7 @@ verify_multiple_cork(hbool_t swmr)
     /* Verify cork status of the datatype: tid2 */
     if(H5Oget_info2(tid2, &oinfo3, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid2, oinfo3.addr, TRUE) < 0) 
+    if(H5C__verify_cork_tag_test(fid2, oinfo3.addr, TRUE) < 0)
         TEST_ERROR
 
     /* Check cork status of the datatype: tid1 */
@@ -1351,7 +1351,7 @@ verify_multiple_cork(hbool_t swmr)
     /* Verify cork status of the group: gid1 */
     if(H5Oget_info2(gid1, &oinfo1, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid1, oinfo1.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid1, oinfo1.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Check cork status of the group: gid2 */
@@ -1371,7 +1371,7 @@ verify_multiple_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Verify cork status of the group: gid1 */
-    if(H5C__verify_cork_tag_test(fid1, oinfo1.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid1, oinfo1.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Close the group: gid1 */
@@ -1385,7 +1385,7 @@ verify_multiple_cork(hbool_t swmr)
     /* Verify cork status of the dataset: did2 */
     if(H5Oget_info2(did2, &oinfo2, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    if(H5C__verify_cork_tag_test(fid2, oinfo2.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid2, oinfo2.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Check cork status of the dataset: did1 */
@@ -1405,7 +1405,7 @@ verify_multiple_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Verify cork status of the dataset: did1 */
-    if(H5C__verify_cork_tag_test(fid1, oinfo2.addr, FALSE) < 0) 
+    if(H5C__verify_cork_tag_test(fid1, oinfo2.addr, FALSE) < 0)
         TEST_ERROR
 
     /* Close the dataset: did1 */
@@ -1517,7 +1517,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_objs_cork
  *
- * Purpose:     This function verifies H5Odisable_mdc_flushes/H5Oenable_mdc_flushes/H5Oare_mdc_flushes_disabled public 
+ * Purpose:     This function verifies H5Odisable_mdc_flushes/H5Oenable_mdc_flushes/H5Oare_mdc_flushes_disabled public
  *      routines are working as specified.
  *
  * Return:      0 on Success, 1 on Failure
@@ -1723,7 +1723,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
     } H5E_END_TRY;
     if(ret >= 0)
         TEST_ERROR
-    
+
     /* Cork the named datatype */
     if(H5Odisable_mdc_flushes(tid) < 0)
         TEST_ERROR
@@ -1796,7 +1796,7 @@ error:
     return 1;
 } /* test_objs_cork() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_dset_cork
  *
@@ -1847,7 +1847,7 @@ test_dset_cork(hbool_t swmr, hbool_t new_format)
     } /* end if */
 
     /* Create fapl */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) 
+    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         TEST_ERROR
 
     /* Set to use latest format */
@@ -1880,7 +1880,7 @@ test_dset_cork(hbool_t swmr, hbool_t new_format)
     /* Set up dataset creation property list */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         TEST_ERROR
-    
+
     /* Enable chunking */
     if(H5Pset_chunk(dcpl, RANK, cdims) < 0)
         TEST_ERROR
@@ -2003,7 +2003,7 @@ test_dset_cork(hbool_t swmr, hbool_t new_format)
         TEST_ERROR
     if(!corked)
         TEST_ERROR
-    
+
     /* Close the dataset */
     if(H5Dclose(did1) < 0)
         TEST_ERROR
@@ -2053,7 +2053,7 @@ test_dset_cork(hbool_t swmr, hbool_t new_format)
         TEST_ERROR
 
     /* Second open of the named datatype */
-    if((tid2 = H5Topen2(gid, "datatype", H5P_DEFAULT)) < 0) 
+    if((tid2 = H5Topen2(gid, "datatype", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check cork status of the second opened named datatype */
@@ -2124,7 +2124,7 @@ error:
 } /* test_dset_cork() */
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -2138,12 +2138,12 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-int 
-main(void) 
+int
+main(void)
 {
     unsigned swmr;              /* Loop over SWMR/non-SWMR */
     unsigned nerrs = 0;         /* Error Encountered */
-    
+
     /* Test for dataset created with old library format */
     nerrs += verify_old_dset_cork();
 
@@ -2158,10 +2158,10 @@ main(void)
 
         /* Tests with/without SWMR access */
         nerrs += verify_obj_dset_cork(swmr);
-        nerrs += verify_dset_cork(swmr, TRUE); 
-        nerrs += verify_dset_cork(swmr, FALSE); 
-        nerrs += verify_group_cork(swmr); 
-        nerrs += verify_named_cork(swmr); 
+        nerrs += verify_dset_cork(swmr, TRUE);
+        nerrs += verify_dset_cork(swmr, FALSE);
+        nerrs += verify_group_cork(swmr);
+        nerrs += verify_named_cork(swmr);
         nerrs += verify_multiple_cork(swmr);
     } /* end for */
 
diff --git a/test/cross_read.c b/test/cross_read.c
index 2219151..5444aae 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -109,7 +109,7 @@ check_data_i(const char *dsetname, hid_t fid)
             if(data_out[i][j] != data_in[i][j])
                 if(!nerrors++) {
                     H5_FAILED();
-                    printf("element [%d][%d] is %lld but should have been %lld\n",
+                    HDprintf("element [%d][%d] is %lld but should have been %lld\n",
                             (int)i, (int)j, data_out[i][j], data_in[i][j]);
                 } /* end if */
 
@@ -119,7 +119,7 @@ check_data_i(const char *dsetname, hid_t fid)
 
     /* Failure */
     if(nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, (int)(NX*NY));
+        HDprintf("total of %d errors out of %d elements\n", nerrors, (int)(NX*NY));
         return 1;
     } /* end if */
 
@@ -182,7 +182,7 @@ check_data_f(const char *dsetname, hid_t fid)
             if(!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], (double)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",
                         (int)i, (int)j, data_out[i][j], data_in[i][j]);
                 } /* end if */
 
@@ -192,7 +192,7 @@ check_data_f(const char *dsetname, hid_t fid)
 
     /* Failure */
     if(nerrors) {
-        printf("total of %d errors out of %d elements\n", nerrors, (int)(NX*NY));
+        HDprintf("total of %d errors out of %d elements\n", nerrors, (int)(NX*NY));
         return 1;
     } /* end if */
 
@@ -369,11 +369,11 @@ main(void)
     nerrors += check_file(filename);
 
     if(nerrors) {
-        printf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         return EXIT_FAILURE;
     } /* end if */
 
-    printf("All data type tests passed.\n");
+    HDprintf("All data type tests passed.\n");
     return EXIT_SUCCESS;
 } /* end main() */
 
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 447e827..7b17043 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -2192,40 +2192,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/test/dtransform.c b/test/dtransform.c
index f022699..6f7e8a4 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -34,17 +34,17 @@ hid_t dset_id_float_chunk = -1;
 
 const float windchillFfloat[ROWS][COLS] =
     {   {36.0f, 31.0f, 25.0f, 19.0f, 13.0f,   7.0f,   1.0f,  -5.0f, -11.0f, -16.0f, -22.0f, -28.0f, -34.0f, -40.0f, -46.0f, -52.0f, -57.0f, -63.0f},
-	{34.0f, 27.0f, 21.0f, 15.0f,  9.0f,   3.0f,  -4.0f, -10.0f, -16.0f, -22.0f, -28.0f, -35.0f, -41.0f, -47.0f, -53.0f, -59.0f, -66.0f, -72.0f} ,
-	{32.0f, 25.0f, 19.0f, 13.0f,  6.0f,   0.0f,  -7.0f, -13.0f, -19.0f, -26.0f, -32.0f, -39.0f, -45.0f, -51.0f, -58.0f, -64.0f, -71.0f, -77.0f},
-	{30.0f, 24.0f, 17.0f, 11.0f,  4.0f,  -2.0f,  -9.0f, -15.0f, -22.0f, -29.0f, -35.0f, -42.0f, -48.0f, -55.0f, -61.0f, -68.0f, -74.0f, -81.0f},
-	{29.0f, 23.0f, 16.0f,  9.0f,  3.0f,  -4.0f, -11.0f, -17.0f, -24.0f, -31.0f, -37.0f, -44.0f, -51.0f, -58.0f, -64.0f, -71.0f, -78.0f, -84.0f},
-	{28.0f, 22.0f, 15.0f,  8.0f,  1.0f,  -5.0f, -12.0f, -19.0f, -26.0f, -33.0f, -39.0f, -46.0f, -53.0f, -60.0f, -67.0f, -73.0f, -80.0f, -87.0f},
-	{28.0f, 21.0f, 14.0f,  7.0f,  0.0f,  -7.0f, -14.0f, -21.0f, -27.0f, -34.0f, -41.0f, -48.0f, -55.0f, -62.0f, -69.0f, -76.0f, -82.0f, -89.0f},
-	{27.0f, 20.0f, 13.0f,  6.0f, -1.0f,  -8.0f, -15.0f, -22.0f, -29.0f, -36.0f, -43.0f, -50.0f, -57.0f, -64.0f, -71.0f, -78.0f, -84.0f, -91.0f},
-	{26.0f, 19.0f, 12.0f,  5.0f, -2.0f,  -9.0f, -16.0f, -23.0f, -30.0f, -37.0f, -44.0f, -51.0f, -58.0f, -65.0f, -72.0f, -79.0f, -86.0f, -93.0f},
-	{26.0f, 19.0f, 12.0f,  4.0f, -3.0f, -10.0f, -17.0f, -24.0f, -31.0f, -38.0f, -45.0f, -52.0f, -60.0f, -67.0f, -74.0f, -81.0f, -88.0f, -95.0f},
-	{25.0f, 18.0f, 11.0f,  4.0f, -3.0f, -11.0f, -18.0f, -25.0f, -32.0f, -39.0f, -46.0f, -54.0f, -61.0f, -68.0f, -75.0f, -82.0f, -89.0f, -97.0f},
-	{25.0f, 17.0f, 10.0f,  3.0f, -4.0f, -11.0f, -19.0f, -26.0f, -33.0f, -40.0f, -48.0f, -55.0f, -62.0f, -69.0f, -76.0f, -84.0f, -91.0f, -98.0f}
+    {34.0f, 27.0f, 21.0f, 15.0f,  9.0f,   3.0f,  -4.0f, -10.0f, -16.0f, -22.0f, -28.0f, -35.0f, -41.0f, -47.0f, -53.0f, -59.0f, -66.0f, -72.0f} ,
+    {32.0f, 25.0f, 19.0f, 13.0f,  6.0f,   0.0f,  -7.0f, -13.0f, -19.0f, -26.0f, -32.0f, -39.0f, -45.0f, -51.0f, -58.0f, -64.0f, -71.0f, -77.0f},
+    {30.0f, 24.0f, 17.0f, 11.0f,  4.0f,  -2.0f,  -9.0f, -15.0f, -22.0f, -29.0f, -35.0f, -42.0f, -48.0f, -55.0f, -61.0f, -68.0f, -74.0f, -81.0f},
+    {29.0f, 23.0f, 16.0f,  9.0f,  3.0f,  -4.0f, -11.0f, -17.0f, -24.0f, -31.0f, -37.0f, -44.0f, -51.0f, -58.0f, -64.0f, -71.0f, -78.0f, -84.0f},
+    {28.0f, 22.0f, 15.0f,  8.0f,  1.0f,  -5.0f, -12.0f, -19.0f, -26.0f, -33.0f, -39.0f, -46.0f, -53.0f, -60.0f, -67.0f, -73.0f, -80.0f, -87.0f},
+    {28.0f, 21.0f, 14.0f,  7.0f,  0.0f,  -7.0f, -14.0f, -21.0f, -27.0f, -34.0f, -41.0f, -48.0f, -55.0f, -62.0f, -69.0f, -76.0f, -82.0f, -89.0f},
+    {27.0f, 20.0f, 13.0f,  6.0f, -1.0f,  -8.0f, -15.0f, -22.0f, -29.0f, -36.0f, -43.0f, -50.0f, -57.0f, -64.0f, -71.0f, -78.0f, -84.0f, -91.0f},
+    {26.0f, 19.0f, 12.0f,  5.0f, -2.0f,  -9.0f, -16.0f, -23.0f, -30.0f, -37.0f, -44.0f, -51.0f, -58.0f, -65.0f, -72.0f, -79.0f, -86.0f, -93.0f},
+    {26.0f, 19.0f, 12.0f,  4.0f, -3.0f, -10.0f, -17.0f, -24.0f, -31.0f, -38.0f, -45.0f, -52.0f, -60.0f, -67.0f, -74.0f, -81.0f, -88.0f, -95.0f},
+    {25.0f, 18.0f, 11.0f,  4.0f, -3.0f, -11.0f, -18.0f, -25.0f, -32.0f, -39.0f, -46.0f, -54.0f, -61.0f, -68.0f, -75.0f, -82.0f, -89.0f, -97.0f},
+    {25.0f, 17.0f, 10.0f,  3.0f, -4.0f, -11.0f, -19.0f, -26.0f, -33.0f, -40.0f, -48.0f, -55.0f, -62.0f, -69.0f, -76.0f, -84.0f, -91.0f, -98.0f}
     };
 
 const int transformData[ROWS][COLS] =
@@ -62,202 +62,202 @@ const int transformData[ROWS][COLS] =
         {25, 17, 10, 3, 4, 11, 19, 26, 33, 40, 48, 55, 62, 69, 4, 12, 19, 26}
     };
 
-#define UCOMPARE(TYPE,VAR1,VAR2,TOL)			\
-{							\
-    size_t i,j;						\
-							\
-    for(i=0; i<ROWS; i++)				\
-        for(j=0; j<COLS; j++)				\
-        {							\
-            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");	\
-                goto error;					\
-            }						\
-        }							\
-    PASSED();						\
+#define UCOMPARE(TYPE,VAR1,VAR2,TOL)            \
+{                            \
+    size_t i,j;                        \
+                            \
+    for(i=0; i<ROWS; i++)                \
+        for(j=0; j<COLS; j++)                \
+        {                            \
+            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();                \
+                HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");    \
+                goto error;                    \
+            }                        \
+        }                            \
+    PASSED();                        \
 }
 
-#define COMPARE(TYPE,VAR1,VAR2,TOL)			\
-{							\
-    size_t i,j;						\
-							\
-    for(i=0; i<ROWS; i++)				\
-        for(j=0; j<COLS; j++)				\
-        {							\
-            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");	\
-                goto error;					\
-            }						\
-        }							\
-    PASSED();						\
+#define COMPARE(TYPE,VAR1,VAR2,TOL)            \
+{                            \
+    size_t i,j;                        \
+                            \
+    for(i=0; i<ROWS; i++)                \
+        for(j=0; j<COLS; j++)                \
+        {                            \
+            if( !(((VAR1)[i][j] <= ((TYPE)(VAR2)[i][j] + TOL)) && ((VAR1)[i][j] >= ((TYPE)(VAR2)[i][j] - TOL))) )    \
+            {                        \
+                H5_FAILED();                \
+                HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");    \
+                goto error;                    \
+            }                        \
+        }                            \
+    PASSED();                        \
 }
 
-#define COMPARE_INT(VAR1,VAR2)			        \
-{							\
-    size_t i,j;						\
-							\
-    for(i=0; i<ROWS; i++)				\
-        for(j=0; j<COLS; j++)				\
-        {						\
-            if( (VAR1)[i][j] != (VAR2)[i][j] )	        \
-            {						\
-                H5_FAILED();				\
-                fprintf(stderr, "    ERROR: data  failed to match computed data\n");	\
-                goto error;				\
-            }						\
-        }						\
+#define COMPARE_INT(VAR1,VAR2)                    \
+{                            \
+    size_t i,j;                        \
+                            \
+    for(i=0; i<ROWS; i++)                \
+        for(j=0; j<COLS; j++)                \
+        {                        \
+            if( (VAR1)[i][j] != (VAR2)[i][j] )            \
+            {                        \
+                H5_FAILED();                \
+                HDfprintf(stderr, "    ERROR: data  failed to match computed data\n");    \
+                goto error;                \
+            }                        \
+        }                        \
 }
 
-#define TEST_TYPE_CONTIG(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED)	\
-{										\
-    TYPE array[ROWS][COLS];							\
-    const char* f_to_c = "(5/9.0)*(x-32)";					\
+#define TEST_TYPE_CONTIG(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED)    \
+{                                        \
+    TYPE array[ROWS][COLS];                            \
+    const char* f_to_c = "(5/9.0)*(x-32)";                    \
     /* utrans is a transform for unsigned types: no negative numbers involved and results are < 255 to fit into uchar */ \
-    const char* utrans = "((x+100)/4)*3";					\
-										\
-    hid_t dataspace, dxpl_id_f_to_c, dxpl_id_utrans, dset, dset_nn, dt_nn;	\
+    const char* utrans = "((x+100)/4)*3";                    \
+                                        \
+    hid_t dataspace, dxpl_id_f_to_c, dxpl_id_utrans, dset, dset_nn, dt_nn;    \
     H5T_order_t order;                                                          \
-    hsize_t dim[2] = {ROWS, COLS};						\
-										\
-    if((dataspace = H5Screate_simple(2, dim, NULL)) < 0) TEST_ERROR;		\
+    hsize_t dim[2] = {ROWS, COLS};                        \
+                                        \
+    if((dataspace = H5Screate_simple(2, dim, NULL)) < 0) TEST_ERROR;        \
     if((dset = H5Dcreate2(file_id, "/transformtest_"TEST_STR, HDF_TYPE, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; \
                                                                                 \
     if((dt_nn = H5Tcopy(HDF_TYPE)) < 0) TEST_ERROR                              \
     if((order = H5Tget_order(dt_nn)) == H5T_ORDER_ERROR) TEST_ERROR             \
     if(H5Tset_order(dt_nn, order == H5T_ORDER_LE ? H5T_ORDER_BE : H5T_ORDER_LE) < 0) TEST_ERROR \
-    if((dset_nn = H5Dcreate2(file_id, "/nonnative_transformtest_"TEST_STR, dt_nn, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR	\
+    if((dset_nn = H5Dcreate2(file_id, "/nonnative_transformtest_"TEST_STR, dt_nn, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR    \
     if(H5Tclose(dt_nn) < 0) TEST_ERROR                                          \
-										\
-    if(SIGNED)									\
-    {										\
-	if((dxpl_id_f_to_c = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;	\
-	if(H5Pset_data_transform(dxpl_id_f_to_c, f_to_c) < 0) TEST_ERROR;	\
-	if(H5Dwrite(dset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillFfloat) < 0) TEST_ERROR;	\
-	if(H5Dwrite(dset_nn, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillFfloat) < 0) TEST_ERROR;	\
-	if(H5Pclose(dxpl_id_f_to_c) < 0) TEST_ERROR;			\
-    }										\
-    else									\
-    {										\
-	if((dxpl_id_utrans = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;	\
-	if(H5Pset_data_transform(dxpl_id_utrans, utrans) < 0) TEST_ERROR;	\
-	if(H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_utrans, transformData) < 0) TEST_ERROR;	\
-	if(H5Dwrite(dset_nn, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_utrans, transformData) < 0) TEST_ERROR;	\
-	if(H5Pclose(dxpl_id_utrans) < 0) TEST_ERROR;			\
-    }										\
-										\
-										\
-    TESTING("contiguous, no data type conversion ("TEST_STR"->"TEST_STR")")	\
-										\
-    if(H5Dread(dset, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) TEST_ERROR;	\
-    if(SIGNED)									\
-        COMPARE(TYPE, array, COMPARE_DATA, 2)					\
-    else									\
-        UCOMPARE(TYPE, array, COMPARE_DATA, 4)					\
+                                        \
+    if(SIGNED)                                    \
+    {                                        \
+    if((dxpl_id_f_to_c = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;    \
+    if(H5Pset_data_transform(dxpl_id_f_to_c, f_to_c) < 0) TEST_ERROR;    \
+    if(H5Dwrite(dset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillFfloat) < 0) TEST_ERROR;    \
+    if(H5Dwrite(dset_nn, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillFfloat) < 0) TEST_ERROR;    \
+    if(H5Pclose(dxpl_id_f_to_c) < 0) TEST_ERROR;            \
+    }                                        \
+    else                                    \
+    {                                        \
+    if((dxpl_id_utrans = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;    \
+    if(H5Pset_data_transform(dxpl_id_utrans, utrans) < 0) TEST_ERROR;    \
+    if(H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_utrans, transformData) < 0) TEST_ERROR;    \
+    if(H5Dwrite(dset_nn, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_utrans, transformData) < 0) TEST_ERROR;    \
+    if(H5Pclose(dxpl_id_utrans) < 0) TEST_ERROR;            \
+    }                                        \
+                                        \
+                                        \
+    TESTING("contiguous, no data type conversion ("TEST_STR"->"TEST_STR")")    \
+                                        \
+    if(H5Dread(dset, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) TEST_ERROR;    \
+    if(SIGNED)                                    \
+        COMPARE(TYPE, array, COMPARE_DATA, 2)                    \
+    else                                    \
+        UCOMPARE(TYPE, array, COMPARE_DATA, 4)                    \
                                                                                 \
-    TESTING("contiguous, byte order conversion ("TEST_STR"->"TEST_STR")")	\
-										\
-    if(H5Dread(dset_nn, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) TEST_ERROR;	\
-    if(SIGNED)									\
-        COMPARE(TYPE, array, COMPARE_DATA, 2)					\
-    else									\
-        UCOMPARE(TYPE, array, COMPARE_DATA, 4)					\
-										\
-    if(SIGNED)									\
-    {    									\
-        TESTING("contiguous, with type conversion (float->"TEST_STR")")	\
-										\
-	if(H5Dread(dset_id_float, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) TEST_ERROR;	\
-	COMPARE(TYPE, array, COMPARE_DATA, 2)				\
-    }										\
-										\
-   if(H5Dclose(dset) < 0) TEST_ERROR;					\
-   if(H5Sclose(dataspace) < 0) TEST_ERROR;				\
+    TESTING("contiguous, byte order conversion ("TEST_STR"->"TEST_STR")")    \
+                                        \
+    if(H5Dread(dset_nn, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) TEST_ERROR;    \
+    if(SIGNED)                                    \
+        COMPARE(TYPE, array, COMPARE_DATA, 2)                    \
+    else                                    \
+        UCOMPARE(TYPE, array, COMPARE_DATA, 4)                    \
+                                        \
+    if(SIGNED)                                    \
+    {                                        \
+        TESTING("contiguous, with type conversion (float->"TEST_STR")")    \
+                                        \
+    if(H5Dread(dset_id_float, HDF_TYPE, H5S_ALL, H5S_ALL, XFORM, array) < 0) TEST_ERROR;    \
+    COMPARE(TYPE, array, COMPARE_DATA, 2)                \
+    }                                        \
+                                        \
+   if(H5Dclose(dset) < 0) TEST_ERROR;                    \
+   if(H5Sclose(dataspace) < 0) TEST_ERROR;                \
 }
 
-#define TEST_TYPE_CHUNK(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED)	\
-{										\
-    TYPE array[ROWS][COLS];							\
-    const char* f_to_c = "(5/9.0)*(x-32)";					\
+#define TEST_TYPE_CHUNK(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED)    \
+{                                        \
+    TYPE array[ROWS][COLS];                            \
+    const char* f_to_c = "(5/9.0)*(x-32)";                    \
     /* utrans is a transform for unsigned types: no negative numbers involved and results are < 255 to fit into uchar */ \
-    const char* utrans = "((x+100)/4)*3";					\
-										\
-    hid_t dataspace, dxpl_id_f_to_c, dxpl_id_utrans, cparms, memspace, dset_chunk, filespace;	\
-    hsize_t dim[2] = {ROWS, COLS};						\
-    hsize_t offset[2] = {0, 0};							\
-										\
-										\
-    if((dataspace = H5Screate_simple(2, dim, NULL)) < 0) TEST_ERROR;		\
-										\
-    if((cparms = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;		\
-    if(H5Pset_chunk(cparms, 2, dim) < 0) TEST_ERROR;				\
-										\
-    if((dset_chunk = H5Dcreate2(file_id, "/transformtest_chunk_"TEST_STR, HDF_TYPE, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT)) < 0) TEST_ERROR;	\
-    if((filespace = H5Dget_space(dset_chunk)) < 0) TEST_ERROR			\
-    if((memspace = H5Screate_simple(2, dim, NULL)) < 0) TEST_ERROR		\
-    if(H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, dim, NULL) < 0) TEST_ERROR;			\
-    										\
-    if(SIGNED)									\
-    {										\
-	if((dxpl_id_f_to_c = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;	\
-	if(H5Pset_data_transform(dxpl_id_f_to_c, f_to_c) < 0) TEST_ERROR;	\
-	if(H5Dwrite(dset_chunk, H5T_NATIVE_FLOAT, dataspace, filespace, dxpl_id_f_to_c, windchillFfloat) < 0) TEST_ERROR;	\
-	if(H5Pclose(dxpl_id_f_to_c) < 0) TEST_ERROR;				\
-    }										\
-    else									\
-    {										\
-	if((dxpl_id_utrans = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;	\
-	if(H5Pset_data_transform(dxpl_id_utrans, utrans) < 0) TEST_ERROR;	\
-	if(H5Dwrite(dset_chunk, H5T_NATIVE_INT, dataspace, filespace, dxpl_id_utrans, transformData) < 0) TEST_ERROR;	\
-	if(H5Pclose(dxpl_id_utrans) < 0) TEST_ERROR;				\
-    }										\
-										\
-										\
-    TESTING("chunked, no data type conversion ("TEST_STR"->"TEST_STR")")	\
-										\
-    if(H5Dread(dset_chunk, HDF_TYPE, memspace, filespace, XFORM, array) < 0) TEST_ERROR;	\
-    if(SIGNED)									\
-        COMPARE(TYPE, array, COMPARE_DATA, 2)					\
-    else									\
-        UCOMPARE(TYPE, array, COMPARE_DATA, 4)					\
-										\
-    if(SIGNED)									\
-    {    									\
-        TESTING("chunked, with type conversion (float->"TEST_STR")")		\
-										\
-	if(H5Dread(dset_id_float_chunk, HDF_TYPE, memspace, filespace, XFORM, array) < 0) TEST_ERROR;	\
-	COMPARE(TYPE, array, COMPARE_DATA, 2)					\
-    }										\
-										\
-										\
-   if(H5Pclose(cparms) < 0) TEST_ERROR;						\
-   if(H5Dclose(dset_chunk) < 0) TEST_ERROR;					\
-   if(H5Sclose(dataspace) < 0) TEST_ERROR;					\
-   if(H5Sclose(memspace) < 0) TEST_ERROR;					\
+    const char* utrans = "((x+100)/4)*3";                    \
+                                        \
+    hid_t dataspace, dxpl_id_f_to_c, dxpl_id_utrans, cparms, memspace, dset_chunk, filespace;    \
+    hsize_t dim[2] = {ROWS, COLS};                        \
+    hsize_t offset[2] = {0, 0};                            \
+                                        \
+                                        \
+    if((dataspace = H5Screate_simple(2, dim, NULL)) < 0) TEST_ERROR;        \
+                                        \
+    if((cparms = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;        \
+    if(H5Pset_chunk(cparms, 2, dim) < 0) TEST_ERROR;                \
+                                        \
+    if((dset_chunk = H5Dcreate2(file_id, "/transformtest_chunk_"TEST_STR, HDF_TYPE, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT)) < 0) TEST_ERROR;    \
+    if((filespace = H5Dget_space(dset_chunk)) < 0) TEST_ERROR            \
+    if((memspace = H5Screate_simple(2, dim, NULL)) < 0) TEST_ERROR        \
+    if(H5Sselect_hyperslab(filespace, H5S_SELECT_SET, offset, NULL, dim, NULL) < 0) TEST_ERROR;            \
+                                            \
+    if(SIGNED)                                    \
+    {                                        \
+    if((dxpl_id_f_to_c = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;    \
+    if(H5Pset_data_transform(dxpl_id_f_to_c, f_to_c) < 0) TEST_ERROR;    \
+    if(H5Dwrite(dset_chunk, H5T_NATIVE_FLOAT, dataspace, filespace, dxpl_id_f_to_c, windchillFfloat) < 0) TEST_ERROR;    \
+    if(H5Pclose(dxpl_id_f_to_c) < 0) TEST_ERROR;                \
+    }                                        \
+    else                                    \
+    {                                        \
+    if((dxpl_id_utrans = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;    \
+    if(H5Pset_data_transform(dxpl_id_utrans, utrans) < 0) TEST_ERROR;    \
+    if(H5Dwrite(dset_chunk, H5T_NATIVE_INT, dataspace, filespace, dxpl_id_utrans, transformData) < 0) TEST_ERROR;    \
+    if(H5Pclose(dxpl_id_utrans) < 0) TEST_ERROR;                \
+    }                                        \
+                                        \
+                                        \
+    TESTING("chunked, no data type conversion ("TEST_STR"->"TEST_STR")")    \
+                                        \
+    if(H5Dread(dset_chunk, HDF_TYPE, memspace, filespace, XFORM, array) < 0) TEST_ERROR;    \
+    if(SIGNED)                                    \
+        COMPARE(TYPE, array, COMPARE_DATA, 2)                    \
+    else                                    \
+        UCOMPARE(TYPE, array, COMPARE_DATA, 4)                    \
+                                        \
+    if(SIGNED)                                    \
+    {                                        \
+        TESTING("chunked, with type conversion (float->"TEST_STR")")        \
+                                        \
+    if(H5Dread(dset_id_float_chunk, HDF_TYPE, memspace, filespace, XFORM, array) < 0) TEST_ERROR;    \
+    COMPARE(TYPE, array, COMPARE_DATA, 2)                    \
+    }                                        \
+                                        \
+                                        \
+   if(H5Pclose(cparms) < 0) TEST_ERROR;                        \
+   if(H5Dclose(dset_chunk) < 0) TEST_ERROR;                    \
+   if(H5Sclose(dataspace) < 0) TEST_ERROR;                    \
+   if(H5Sclose(memspace) < 0) TEST_ERROR;                    \
 }
 
-#define INVALID_SET_TEST(TRANSFORM)			\
-{							\
-    if(H5Pset_data_transform(dxpl_id, TRANSFORM) < 0)	\
-    {							\
-	PASSED();					\
-    }							\
-    else						\
-    {							\
-	H5_FAILED();					\
-	fprintf(stderr, "    ERROR: Data transform allowed invalid TRANSFORM transform to be set\n");	\
-	goto error;					\
-    }							\
+#define INVALID_SET_TEST(TRANSFORM)            \
+{                            \
+    if(H5Pset_data_transform(dxpl_id, TRANSFORM) < 0)    \
+    {                            \
+    PASSED();                    \
+    }                            \
+    else                        \
+    {                            \
+    H5_FAILED();                    \
+    HDfprintf(stderr, "    ERROR: Data transform allowed invalid TRANSFORM transform to be set\n");    \
+    goto error;                    \
+    }                            \
 }
 
 int main(void)
 {
     hid_t dxpl_id_c_to_f = -1;
     hid_t dxpl_id_c_to_f_copy = 1;
-    hid_t dxpl_id_simple = -1; 
+    hid_t dxpl_id_simple = -1;
     hid_t dxpl_id_polynomial = -1;
     hid_t dxpl_id_polynomial_copy = -1;
     hid_t dxpl_id_utrans_inv = -1;
@@ -440,8 +440,8 @@ init_test(hid_t file_id)
     PASSED();
 
     return 0;
-    
-error: 
+
+error:
     H5E_BEGIN_TRY {
         H5Pclose(cparms);
         H5Pclose(dxpl_id_f_to_c);
@@ -472,7 +472,7 @@ test_poly(const hid_t dxpl_id_polynomial)
     if(H5Dread(dset_id_int, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
             dxpl_id_polynomial, polyflread) < 0)
         TEST_ERROR
-        
+
     COMPARE(float, polyflread, polyflres, 2.0f)
 
     for(row = 0; row < ROWS; row++)
@@ -485,12 +485,12 @@ test_poly(const hid_t dxpl_id_polynomial)
     if(H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             dxpl_id_polynomial, polyintread) < 0)
         TEST_ERROR
-        
+
     COMPARE(int, polyintread, polyflres, 4)
 
     return 0;
 
-error: 
+error:
      return -1;
 }
 
@@ -533,7 +533,7 @@ test_specials(hid_t file)
     if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             H5P_DEFAULT, read_buf) < 0)
         TEST_ERROR
- 
+
     COMPARE_INT(read_buf, data_res)
 
     if(H5Dclose(dset_id) < 0)
@@ -557,7 +557,7 @@ test_specials(hid_t file)
     if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             H5P_DEFAULT, read_buf) < 0)
         TEST_ERROR
- 
+
     COMPARE_INT(read_buf, data_res)
 
     if(H5Dclose(dset_id) < 0)
@@ -581,7 +581,7 @@ test_specials(hid_t file)
     if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             H5P_DEFAULT, read_buf) < 0)
         TEST_ERROR
- 
+
     COMPARE_INT(read_buf, data_res)
 
     if(H5Dclose(dset_id) < 0)
@@ -605,7 +605,7 @@ test_specials(hid_t file)
     if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             H5P_DEFAULT, read_buf) < 0)
         TEST_ERROR
- 
+
     COMPARE_INT(read_buf, data_res)
 
     if(H5Dclose(dset_id) < 0)
@@ -629,7 +629,7 @@ test_specials(hid_t file)
     if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             H5P_DEFAULT, read_buf) < 0)
         TEST_ERROR
- 
+
     COMPARE_INT(read_buf, data_res)
 
     if(H5Dclose(dset_id) < 0)
@@ -644,7 +644,7 @@ test_specials(hid_t file)
     PASSED();
     return 0;
 
-error: 
+error:
      return -1;
 }
 
@@ -667,19 +667,19 @@ test_copy(const hid_t dxpl_id_c_to_f_copy, const hid_t dxpl_id_polynomial_copy)
     if(H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             dxpl_id_c_to_f_copy, windchillFintread) < 0)
         TEST_ERROR
-        
+
     COMPARE(int, windchillFintread, windchillFfloat, 2)
 
     TESTING("data transform, polynomial transform w/ copied property")
     if(H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
             dxpl_id_polynomial_copy, polyintread) < 0)
         TEST_ERROR
-        
+
     COMPARE(int, polyintread, polyflres, 2)
 
     return 0;
 
-error: 
+error:
     return -1;
 }
 
@@ -696,7 +696,7 @@ test_trivial(const hid_t dxpl_id_simple)
         TEST_ERROR
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            if((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL) 
+            if((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n");
         }
 
@@ -708,7 +708,7 @@ test_trivial(const hid_t dxpl_id_simple)
         TEST_ERROR
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            if(windchillFintread[row][col] != 4) 
+            if(windchillFintread[row][col] != 4)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n")
         }
 
@@ -740,7 +740,7 @@ test_getset(const hid_t dxpl_id_c_to_f)
         FAIL_PUTS_ERROR("    ERROR: Data transform failed to match what was set\n")
 
     PASSED()
-    
+
     HDfree(ptrgetTest);
     ptrgetTest = NULL;
 
@@ -752,10 +752,10 @@ test_getset(const hid_t dxpl_id_c_to_f)
     if(H5Dread(dset_id_float, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
                 dxpl_id_c_to_f, windchillFfloatread) < 0)
         TEST_ERROR
-        
+
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            if((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL) 
+            if((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n")
         }
 
@@ -767,7 +767,7 @@ test_getset(const hid_t dxpl_id_c_to_f)
         TEST_ERROR
     if(H5Pget_data_transform(dxpl_id_c_to_f, ptrgetTest, HDstrlen(simple) + 1) < 0)
         TEST_ERROR
-    if(HDstrcmp(simple, ptrgetTest) != 0) 
+    if(HDstrcmp(simple, ptrgetTest) != 0)
         FAIL_PUTS_ERROR("    ERROR: Data transform failed to match what was set\n")
 
     PASSED()
@@ -793,11 +793,11 @@ test_set(void)
     char *ptrgetTest = NULL;
 
     TESTING("H5Pget_data_transform (get before set)")
-    
+
     if(NULL == (ptrgetTest = (char *)HDmalloc(HDstrlen(str) + 1)))
         TEST_ERROR
 
-    if((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) 
+    if((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
         TEST_ERROR
 
     /* Test get before set */
@@ -807,7 +807,7 @@ test_set(void)
 
     if(H5Pget_data_transform(dxpl_id, ptrgetTest, HDstrlen(str) + 1) < 0)
         PASSED()
-    else 
+    else
         FAIL_PUTS_ERROR("    ERROR: Data transform get before set succeeded (it shouldn't have)\n");
 
     HDfree(ptrgetTest);
diff --git a/test/dtypes.c b/test/dtypes.c
index e14ec5c..f676ac9 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -23,7 +23,7 @@
 #include "H5Iprivate.h"     /* For checking that datatype id's don't leak */
 
 /* Number of elements in each test */
-#define NTESTELEM	100000
+#define NTESTELEM    100000
 
 /* For test_compound_8 and test_compound_10 */
 #define ARRAY_DIM       4
@@ -32,7 +32,7 @@
  * Offset from alinged memory returned by malloc().  This can be used to test
  * that type conversions handle non-aligned buffers correctly.
  */
-#define ALIGNMENT	1
+#define ALIGNMENT    1
 
 /*
  * Define if you want to test alignment code on a machine that doesn't
@@ -43,7 +43,7 @@
 
 /* Alignment test stuff */
 #ifdef TEST_ALIGNMENT
-#define H5T_FRIEND		/*suppress error about including H5Tpkg	  */
+#define H5T_FRIEND        /*suppress error about including H5Tpkg      */
 #include "H5Tpkg.h"
 #endif
 
@@ -71,7 +71,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;                                                            \
     }
@@ -136,22 +136,22 @@ static int num_opaque_conversions_g = 0;
 static int opaque_check(int tag_it);
 static herr_t convert_opaque(hid_t st, hid_t dt,
                H5T_cdata_t *cdata,
-	       size_t nelmts, size_t buf_stride,
+        size_t nelmts, size_t buf_stride,
                size_t bkg_stride, void *_buf,
-	       void *bkg, hid_t dset_xfer_plid);
+        void *bkg, hid_t dset_xfer_plid);
 static int opaque_long(void);
 static int opaque_funcs(void);
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	reset_hdf5
+ * Function:    reset_hdf5
  *
- * Purpose:	Reset the hdf5 library.  This causes statistics to be printed
- *		and counters to be reset.
+ * Purpose:    Reset the hdf5 library.  This causes statistics to be printed
+ *        and counters to be reset.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, November 16, 1998
  *
  * Modifications:
@@ -182,7 +182,7 @@ reset_hdf5(void)
 
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_classes
  *
@@ -283,7 +283,7 @@ test_classes(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_copy
  *
@@ -304,7 +304,7 @@ static int
 test_copy(void)
 {
     hid_t               a_copy;
-    herr_t		status;
+    herr_t        status;
 
     TESTING("H5Tcopy()");
 
@@ -313,12 +313,12 @@ test_copy(void)
 
     /* We should not be able to close a built-in byte */
     H5E_BEGIN_TRY {
-	status = H5Tclose (H5T_NATIVE_SCHAR);
+    status = H5Tclose (H5T_NATIVE_SCHAR);
     } H5E_END_TRY;
     if (status>=0) {
-	H5_FAILED();
-	HDputs ("    Should not be able to close a predefined type!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Should not be able to close a predefined type!");
+    goto error;
     }
 
     PASSED();
@@ -328,7 +328,7 @@ test_copy(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_detect
  *
@@ -505,7 +505,7 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_1
  *
@@ -669,19 +669,19 @@ error:
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_2
+ * Function:    test_compound_2
  *
- * Purpose:	Tests a compound type conversion where the source and
- *		destination are the same except for the order of the
- *		elements.
+ * Purpose:    Tests a compound type conversion where the source and
+ *        destination are the same except for the order of the
+ *        elements.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, June 17, 1999
  *
  * Modifications:
@@ -692,19 +692,19 @@ static int
 test_compound_2(void)
 {
     struct st {
-	int a, b, c[4], d, e;
+    int a, b, c[4], d, e;
     } *s_ptr;
     struct dt {
-	int e, d, c[4], b, a;
+    int e, d, c[4], b, a;
     } *d_ptr;
 
-    const size_t	nelmts = NTESTELEM;
-    const hsize_t	four = 4;
-    unsigned char	*buf=NULL, *orig=NULL, *bkg=NULL;
-    hid_t		st=-1, dt=-1;
+    const size_t    nelmts = NTESTELEM;
+    const hsize_t    four = 4;
+    unsigned char    *buf=NULL, *orig=NULL, *bkg=NULL;
+    hid_t        st=-1, dt=-1;
     hid_t               array_dt;
-    int64_t		nmembs;
-    int			i;
+    int64_t        nmembs;
+    int            i;
 
     TESTING("compound element reordering");
 
@@ -716,15 +716,15 @@ test_compound_2(void)
     bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
     orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)((void *)orig)) + i;
-	s_ptr->a    = i*8+0;
-	s_ptr->b    = i*8+1;
-	s_ptr->c[0] = i*8+2;
-	s_ptr->c[1] = i*8+3;
-	s_ptr->c[2] = i*8+4;
-	s_ptr->c[3] = i*8+5;
-	s_ptr->d    = i*8+6;
-	s_ptr->e    = i*8+7;
+    s_ptr = ((struct st*)((void *)orig)) + i;
+    s_ptr->a    = i*8+0;
+    s_ptr->b    = i*8+1;
+    s_ptr->c[0] = i*8+2;
+    s_ptr->c[1] = i*8+3;
+    s_ptr->c[2] = i*8+4;
+    s_ptr->c[3] = i*8+5;
+    s_ptr->d    = i*8+6;
+    s_ptr->e    = i*8+7;
     }
     HDmemcpy(buf, orig, nelmts*sizeof(struct st));
 
@@ -754,26 +754,26 @@ test_compound_2(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)((void *)orig)) + i;
-	d_ptr = ((struct dt*)((void *)buf))  + i;
-	if (s_ptr->a    != d_ptr->a    ||
-	    s_ptr->b    != d_ptr->b    ||
-	    s_ptr->c[0] != d_ptr->c[0] ||
-	    s_ptr->c[1] != d_ptr->c[1] ||
-	    s_ptr->c[2] != d_ptr->c[2] ||
-	    s_ptr->c[3] != d_ptr->c[3] ||
-	    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",
-		   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",
-		   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;
-	}
+    s_ptr = ((struct st*)((void *)orig)) + i;
+    d_ptr = ((struct dt*)((void *)buf))  + i;
+    if (s_ptr->a    != d_ptr->a    ||
+        s_ptr->b    != d_ptr->b    ||
+        s_ptr->c[0] != d_ptr->c[0] ||
+        s_ptr->c[1] != d_ptr->c[1] ||
+        s_ptr->c[2] != d_ptr->c[2] ||
+        s_ptr->c[3] != d_ptr->c[3] ||
+        s_ptr->d    != d_ptr->d    ||
+        s_ptr->e    != d_ptr->e) {
+        H5_FAILED();
+        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);
+        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;
+    }
     }
 
     /* Release resources */
@@ -800,19 +800,19 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_3
+ * Function:    test_compound_3
  *
- * Purpose:	Tests compound conversions where the source and destination
- *		are the same except the destination is missing a couple
- *		members which appear in the source.
+ * Purpose:    Tests compound conversions where the source and destination
+ *        are the same except the destination is missing a couple
+ *        members which appear in the source.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, June 17, 1999
  *
  * Modifications:
@@ -823,19 +823,19 @@ static int
 test_compound_3(void)
 {
     struct st {
-	int a, b, c[4], d, e;
+    int a, b, c[4], d, e;
     } *s_ptr;
     struct dt {
-	int a,    c[4],    e;
+    int a,    c[4],    e;
     } *d_ptr;
 
-    const size_t	nelmts = NTESTELEM;
-    const hsize_t	four = 4;
-    unsigned char	*buf=NULL, *orig=NULL, *bkg=NULL;
-    hid_t		st=-1, dt=-1;
+    const size_t    nelmts = NTESTELEM;
+    const hsize_t    four = 4;
+    unsigned char    *buf=NULL, *orig=NULL, *bkg=NULL;
+    hid_t        st=-1, dt=-1;
     hid_t               array_dt;
-    int64_t		nmembs;
-    int			i;
+    int64_t        nmembs;
+    int            i;
 
     TESTING("compound subset conversions");
 
@@ -884,24 +884,24 @@ test_compound_3(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)((void *)orig)) + i;
-	d_ptr = ((struct dt*)((void *)buf))  + i;
-	if (s_ptr->a    != d_ptr->a    ||
-	    s_ptr->c[0] != d_ptr->c[0] ||
-	    s_ptr->c[1] != d_ptr->c[1] ||
-	    s_ptr->c[2] != d_ptr->c[2] ||
-	    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",
-		   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",
-		   d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
-		   d_ptr->c[3], d_ptr->e);
-	    goto error;
-	}
+    s_ptr = ((struct st*)((void *)orig)) + i;
+    d_ptr = ((struct dt*)((void *)buf))  + i;
+    if (s_ptr->a    != d_ptr->a    ||
+        s_ptr->c[0] != d_ptr->c[0] ||
+        s_ptr->c[1] != d_ptr->c[1] ||
+        s_ptr->c[2] != d_ptr->c[2] ||
+        s_ptr->c[3] != d_ptr->c[3] ||
+        s_ptr->e    != d_ptr->e) {
+        H5_FAILED();
+        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);
+        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;
+    }
     }
 
     /* Release resources */
@@ -927,19 +927,19 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_4
+ * Function:    test_compound_4
  *
- * Purpose:	Tests compound conversions when the destination has the same
- *		fields as the source but one or more of the fields are
- *		smaller.
+ * Purpose:    Tests compound conversions when the destination has the same
+ *        fields as the source but one or more of the fields are
+ *        smaller.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, June 17, 1999
  *
  * Modifications:
@@ -951,22 +951,22 @@ test_compound_4(void)
 {
 
     struct st {
-	int a, b, c[4], d, e;
+    int a, b, c[4], d, e;
     } *s_ptr;
     struct dt {
-	short b;
-	int a, c[4];
-	short d;
-	int e;
+    short b;
+    int a, c[4];
+    short d;
+    int e;
     } *d_ptr;
 
-    const size_t	nelmts = NTESTELEM;
-    const hsize_t	four = 4;
-    unsigned char	*buf=NULL, *orig=NULL, *bkg=NULL;
-    hid_t		st=-1, dt=-1;
+    const size_t    nelmts = NTESTELEM;
+    const hsize_t    four = 4;
+    unsigned char    *buf=NULL, *orig=NULL, *bkg=NULL;
+    hid_t        st=-1, dt=-1;
     hid_t               array_dt;
-    int64_t		nmembs;
-    int			i;
+    int64_t        nmembs;
+    int            i;
 
     TESTING("compound element shrinking & reordering");
 
@@ -1017,26 +1017,26 @@ test_compound_4(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)((void *)orig)) + i;
-	d_ptr = ((struct dt*)((void *)buf))  + i;
-	if (s_ptr->a    != d_ptr->a    ||
-	    s_ptr->b    != d_ptr->b    ||
-	    s_ptr->c[0] != d_ptr->c[0] ||
-	    s_ptr->c[1] != d_ptr->c[1] ||
-	    s_ptr->c[2] != d_ptr->c[2] ||
-	    s_ptr->c[3] != d_ptr->c[3] ||
-	    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",
-		   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",
-		   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;
-	}
+    s_ptr = ((struct st*)((void *)orig)) + i;
+    d_ptr = ((struct dt*)((void *)buf))  + i;
+    if (s_ptr->a    != d_ptr->a    ||
+        s_ptr->b    != d_ptr->b    ||
+        s_ptr->c[0] != d_ptr->c[0] ||
+        s_ptr->c[1] != d_ptr->c[1] ||
+        s_ptr->c[2] != d_ptr->c[2] ||
+        s_ptr->c[3] != d_ptr->c[3] ||
+        s_ptr->d    != d_ptr->d    ||
+        s_ptr->e    != d_ptr->e) {
+        H5_FAILED();
+        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);
+        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;
+    }
     }
 
     /* Release resources */
@@ -1062,20 +1062,20 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_5
+ * Function:    test_compound_5
  *
- * Purpose:	Many versions of HDF5 have a bug in the optimized compound
+ * Purpose:    Many versions of HDF5 have a bug in the optimized compound
  *              datatype conversion function, H5T_conv_struct_opt(), which
  *              is triggered when the top-level type contains a struct
  *              which must undergo a conversion.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, June 17, 1999
  *
  * Modifications:
@@ -1167,19 +1167,19 @@ test_compound_5(void)
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_6
+ * Function:    test_compound_6
  *
- * Purpose:	Tests compound conversions when the destination has the same
- *		fields as the source but one or more of the fields are
- *		larger.
+ * Purpose:    Tests compound conversions when the destination has the same
+ *        fields as the source but one or more of the fields are
+ *        larger.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Wednesday, December 13, 2000
  *
  * Modifications:
@@ -1199,11 +1199,11 @@ test_compound_6(void)
         long d;
     } *d_ptr;
 
-    const size_t	nelmts = NTESTELEM;
-    unsigned char	*buf=NULL, *orig=NULL, *bkg=NULL;
-    hid_t		st=-1, dt=-1;
-    int64_t		nmembs;
-    int			i;
+    const size_t    nelmts = NTESTELEM;
+    unsigned char    *buf=NULL, *orig=NULL, *bkg=NULL;
+    hid_t        st=-1, dt=-1;
+    int64_t        nmembs;
+    int            i;
 
     TESTING("compound element growing");
 
@@ -1244,18 +1244,18 @@ test_compound_6(void)
 
     /* Compare results */
     for (i=0; i<(int)nelmts; i++) {
-	s_ptr = ((struct st*)((void *)orig)) + i;
-	d_ptr = ((struct dt*)((void *)buf))  + i;
-	if (s_ptr->b    != d_ptr->b    ||
-	    s_ptr->d    != d_ptr->d) {
-	    H5_FAILED();
-	    printf("    i=%d\n", i);
-	    printf("    src={b=%d, d=%d\n",
+    s_ptr = ((struct st*)((void *)orig)) + i;
+    d_ptr = ((struct dt*)((void *)buf))  + i;
+    if (s_ptr->b    != d_ptr->b    ||
+        s_ptr->d    != d_ptr->d) {
+        H5_FAILED();
+        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;
-	}
+        goto error;
+    }
     }
 
     /* Release resources */
@@ -1282,17 +1282,17 @@ error:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_compound_7
+ * Function:    test_compound_7
  *
- * Purpose:	Tests inserting fields into compound datatypes when the field
+ * Purpose:    Tests inserting fields into compound datatypes when the field
  *              overlaps the end of the compound datatype.  Also, tests
  *              increasing compound type size.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, December 18, 2001
  *
  * Modifications:
@@ -1325,43 +1325,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 */
 
@@ -1371,7 +1371,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 */
 
@@ -1381,33 +1381,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 */
 
@@ -1428,7 +1428,7 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_8
  *
@@ -1473,59 +1473,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 */
 
@@ -1535,61 +1535,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 */
 
@@ -1599,20 +1599,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 */
 
@@ -1622,46 +1622,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 */
 
@@ -1674,7 +1674,7 @@ test_compound_8(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_9
  *
@@ -1694,14 +1694,20 @@ test_compound_8(void)
 static int
 test_compound_9(void)
 {
-    typedef struct cmpd_struct {
+    typedef struct cmpd_struct_w {
        int    i1;
        const char* str;
        int    i2;
-    } cmpd_struct;
+    } cmpd_struct_w;
 
-    cmpd_struct wdata = {11, "variable-length string", 22};
-    cmpd_struct rdata;
+    typedef struct cmpd_struct_r {
+       int    i1;
+       char* str;
+       int    i2;
+    } cmpd_struct_r;
+
+    cmpd_struct_w wdata = {11, "variable-length string", 22};
+    cmpd_struct_r rdata;
     hid_t       file;
     hid_t       cmpd_tid, str_id, dup_tid;
     hid_t       space_id;
@@ -1715,51 +1721,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) {
+    if((cmpd_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_w))) < 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) {
+    if(H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct_w, 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) {
+    if(H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct_w, 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) {
+    if(H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct_w, 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 */
 
@@ -1768,44 +1774,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;
@@ -1826,31 +1832,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 */
 
@@ -1859,19 +1865,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;
@@ -1896,7 +1902,7 @@ test_compound_9(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_10
  *
@@ -1954,84 +1960,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 */
 
@@ -2039,13 +2045,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 */
 
@@ -2053,18 +2059,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 */
 
@@ -2090,7 +2096,7 @@ test_compound_10(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_11
  *
@@ -2175,7 +2181,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 */
@@ -2184,7 +2190,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 */
 
@@ -2200,29 +2206,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 */
 
@@ -2244,29 +2250,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 */
 
@@ -2282,29 +2288,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 */
 
@@ -2333,7 +2339,7 @@ error:
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_12
  *
@@ -2375,14 +2381,14 @@ test_compound_12(void)
     size+=tmp_size;
     if (H5Tset_size(complex_id, size) < 0) goto error;
     if (H5Tinsert(complex_id, "real", offset,
-		  H5T_NATIVE_DOUBLE) < 0) goto error;
+        H5T_NATIVE_DOUBLE) < 0) goto error;
 
     offset = size;
     if((tmp_size=H5Tget_size(H5T_NATIVE_DOUBLE))==0) goto error;
     size+=tmp_size;
     if (H5Tset_size(complex_id, size) < 0) goto error;
     if (H5Tinsert(complex_id, "imaginary", offset,
-		  H5T_NATIVE_DOUBLE) < 0) goto error;
+        H5T_NATIVE_DOUBLE) < 0) goto error;
 
     /* Increase and decrease the size. */
     if((tmp_size=H5Tget_size(H5T_NATIVE_DOUBLE))==0) goto error;
@@ -2416,7 +2422,7 @@ test_compound_12(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_13
  *
@@ -2518,7 +2524,7 @@ error:
     return 1;
 } /* end test_compound_13() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_14
  *
@@ -2541,27 +2547,42 @@ error:
 static int
 test_compound_14(void)
 {
-    typedef struct cmpd_struct_1 {
+    typedef struct cmpd_struct_1_w {
        char         c1;
        char         c2;
        const char*  str;
-    } cmpd_struct_1;
+    } cmpd_struct_1_w;
 
-    typedef struct cmpd_struct_2 {
+    typedef struct cmpd_struct_1_r {
        char         c1;
        char         c2;
        char*        str;
+    } cmpd_struct_1_r;
+
+    typedef struct cmpd_struct_2_w {
+       char         c1;
+       char         c2;
+       const char*  str;
        long         l1;
        long         l2;
        long         l3;
        long         l4;
-    } cmpd_struct_2;
+    } cmpd_struct_2_w;
 
-    cmpd_struct_1 wdata1 = {'A', 'B', "variable-length string"};
+    typedef struct cmpd_struct_2_r {
+       char         c1;
+       char         c2;
+       char*        str;
+       long         l1;
+       long         l2;
+       long         l3;
+       long         l4;
+    } cmpd_struct_2_r;
 
-    cmpd_struct_1 rdata1;
-    cmpd_struct_2 wdata2 = {'C', 'D', "another vlen!", 1, 2, -1, 9001};
-    cmpd_struct_2 rdata2;
+    cmpd_struct_1_w wdata1 = {'A', 'B', "variable-length string"};
+    cmpd_struct_1_r rdata1;
+    cmpd_struct_2_w wdata2 = {'C', 'D', "another vlen!", 1, 2, -1, 9001};
+    cmpd_struct_2_r rdata2;
     hid_t       file;
     hid_t       cmpd_m1_tid, cmpd_f1_tid, cmpd_m2_tid, cmpd_f2_tid, str_id;
     hid_t       space_id;
@@ -2575,230 +2596,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) {
+    if((cmpd_m1_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_1_w))) < 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) {
+    if(H5Tinsert(cmpd_m1_tid,"c1",HOFFSET(struct cmpd_struct_1_w, 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) {
+    if(H5Tinsert(cmpd_m1_tid,"c2",HOFFSET(struct cmpd_struct_1_w, 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) {
+    if(H5Tinsert(cmpd_m1_tid, "vl_string", HOFFSET(cmpd_struct_1_w, 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) {
+    if((cmpd_m2_tid = H5Tcreate( H5T_COMPOUND, sizeof(struct cmpd_struct_2_w))) < 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) {
+    if(H5Tinsert(cmpd_m2_tid,"c1",HOFFSET(struct cmpd_struct_2_w, 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) {
+    if(H5Tinsert(cmpd_m2_tid,"c2",HOFFSET(struct cmpd_struct_2_w, 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) {
+    if(H5Tinsert(cmpd_m2_tid, "vl_string", HOFFSET(cmpd_struct_2_w, 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) {
+    if(H5Tinsert(cmpd_m2_tid,"l1",HOFFSET(struct cmpd_struct_2_w, 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) {
+    if(H5Tinsert(cmpd_m2_tid,"l2",HOFFSET(struct cmpd_struct_2_w, 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) {
+    if(H5Tinsert(cmpd_m2_tid,"l3",HOFFSET(struct cmpd_struct_2_w, 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) {
+    if(H5Tinsert(cmpd_m2_tid,"l4",HOFFSET(struct cmpd_struct_2_w, 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;
@@ -2820,25 +2841,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 */
 
@@ -2854,38 +2875,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;
@@ -2910,7 +2931,7 @@ test_compound_14(void)
     return 1;
 } /* end test_compound_14() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_15
  *
@@ -2953,39 +2974,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 */
 
@@ -2993,19 +3014,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 */
 
@@ -3013,21 +3034,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 */
 
@@ -3039,14 +3060,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 */
 
@@ -3069,7 +3090,7 @@ test_compound_15(void)
     return 1;
 } /* end test_compound_15() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_16
  *
@@ -3134,7 +3155,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;
     }
 
@@ -3142,7 +3163,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;
     }
 
@@ -3161,7 +3182,7 @@ error:
     return 1;
 } /* end test_compound_16() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_17
  *
@@ -3213,7 +3234,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
@@ -3223,7 +3244,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
@@ -3257,7 +3278,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
@@ -3267,7 +3288,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
@@ -3284,7 +3305,7 @@ error:
     return 1;
 } /* end test_compound_17() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compound_18
  *
@@ -3350,7 +3371,7 @@ test_compound_18(void)
         FAIL_PUTS_ERROR("created attribute with bad compound datatype")
     } /* end if */
 
-    /* Commit the datatype */ 
+    /* Commit the datatype */
     H5E_BEGIN_TRY {
         ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     } H5E_END_TRY;
@@ -3410,7 +3431,7 @@ error:
     return 1;
 } /* end test_compound_18() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_query
  *
@@ -3455,107 +3476,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 */
 
@@ -3568,48 +3589,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 */
 
@@ -3617,30 +3638,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 */
 
@@ -3656,17 +3677,17 @@ test_query(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_transient
+ * Function:    test_transient
  *
- * Purpose:	Tests transient datatypes.
+ * Purpose:    Tests transient datatypes.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, June  4, 1998
  *
  * Modifications:
@@ -3676,36 +3697,36 @@ test_query(void)
 static int
 test_transient (hid_t fapl)
 {
-    static hsize_t	ds_size[2] = {10, 20};
-    hid_t		file=-1, type=-1, space=-1, dset=-1, t2=-1;
-    char		filename[1024];
-    hid_t		ret_id;		/* Generic hid_t return value	*/
-    herr_t		status;
+    static hsize_t    ds_size[2] = {10, 20};
+    hid_t        file=-1, type=-1, space=-1, dset=-1, t2=-1;
+    char        filename[1024];
+    hid_t        ret_id;        /* Generic hid_t return value    */
+    herr_t        status;
 
     TESTING("transient datatypes");
 
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
     if ((file=H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
-	goto error;
+    goto error;
     }
     if ((space = H5Screate_simple (2, ds_size, ds_size)) < 0) goto error;
 
     /* Predefined types cannot be modified or closed */
     H5E_BEGIN_TRY {
-	status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256);
+    status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256);
     } H5E_END_TRY;
     if (status>=0) {
-	H5_FAILED();
-	HDputs ("    Predefined types should not be modifiable!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Predefined types should not be modifiable!");
+    goto error;
     }
     H5E_BEGIN_TRY {
-	status = H5Tclose (H5T_NATIVE_INT);
+    status = H5Tclose (H5T_NATIVE_INT);
     } H5E_END_TRY;
     if (status>=0) {
-	H5_FAILED();
-	HDputs ("    Predefined types should not be closable!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Predefined types should not be closable!");
+    goto error;
     }
 
     /* Copying a predefined type results in a modifiable copy */
@@ -3714,29 +3735,29 @@ test_transient (hid_t fapl)
 
     /* It should not be possible to create an attribute for a transient type */
     H5E_BEGIN_TRY {
-	ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT);
+    ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT);
     } H5E_END_TRY;
     if (ret_id>=0) {
-	H5_FAILED();
-	HDputs ("    Attributes should not be allowed for transient types!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Attributes should not be allowed for transient types!");
+    goto error;
     }
 
     /* Create a dataset from a transient datatype */
     if(H5Tclose(type) < 0) goto error;
     if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) goto error;
     if((dset = H5Dcreate2(file, "dset1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+    goto error;
 
     /* The type returned from a dataset should not be modifiable */
     if((t2 = H5Dget_type(dset)) < 0) goto error;
     H5E_BEGIN_TRY {
-	status = H5Tset_precision(t2, (size_t)256);
+    status = H5Tset_precision(t2, (size_t)256);
     } H5E_END_TRY;
     if(status >= 0) {
-	H5_FAILED();
-	HDputs ("    Dataset datatypes should not be modifiable!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Dataset datatypes should not be modifiable!");
+    goto error;
     }
     if(H5Tclose(t2) < 0) goto error;
 
@@ -3748,12 +3769,12 @@ test_transient (hid_t fapl)
     if((dset = H5Dopen2(file, "dset1", H5P_DEFAULT)) < 0) goto error;
     if((t2 = H5Dget_type(dset)) < 0) goto error;
     H5E_BEGIN_TRY {
-	status = H5Tset_precision(t2, (size_t)256);
+    status = H5Tset_precision(t2, (size_t)256);
     } H5E_END_TRY;
     if(status >= 0) {
-	H5_FAILED();
-	HDputs ("    Dataset datatypes should not be modifiable!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Dataset datatypes should not be modifiable!");
+    goto error;
     }
     if(H5Tclose(t2) < 0) goto error;
 
@@ -3776,26 +3797,26 @@ test_transient (hid_t fapl)
 
  error:
     H5E_BEGIN_TRY {
-	H5Tclose (t2);
-	H5Tclose (type);
-	H5Sclose (space);
-	H5Dclose (dset);
-	H5Fclose (file);
+    H5Tclose (t2);
+    H5Tclose (type);
+    H5Sclose (space);
+    H5Dclose (dset);
+    H5Fclose (file);
     } H5E_END_TRY;
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_named
+ * Function:    test_named
  *
- * Purpose:	Tests named datatypes.
+ * Purpose:    Tests named datatypes.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, June  1, 1998
  *
  * Modifications:
@@ -3805,29 +3826,29 @@ test_transient (hid_t fapl)
 static int
 test_named (hid_t fapl)
 {
-    hid_t		file=-1, type=-1, space=-1, dset=-1, t2=-1, t3=-1, attr1=-1;
-    herr_t		status;
-    static hsize_t	ds_size[2] = {10, 20};
-    size_t		i,j;
-    unsigned 		attr_data[10][20];
-    char		filename[1024];
+    hid_t        file=-1, type=-1, space=-1, dset=-1, t2=-1, t3=-1, attr1=-1;
+    herr_t        status;
+    static hsize_t    ds_size[2] = {10, 20};
+    size_t        i,j;
+    unsigned         attr_data[10][20];
+    char        filename[1024];
 
     TESTING("named datatypes");
 
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
     if ((file=H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
-	goto error;
+    goto error;
     }
     if ((space = H5Screate_simple (2, ds_size, ds_size)) < 0) goto error;
 
     /* Predefined types cannot be committed */
     H5E_BEGIN_TRY {
-	status = H5Tcommit2(file, "test_named_1 (should not exist)", H5T_NATIVE_INT, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Tcommit2(file, "test_named_1 (should not exist)", H5T_NATIVE_INT, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     } H5E_END_TRY;
     if(status >= 0) {
-	H5_FAILED();
-	HDputs ("    Predefined types should not be committable!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Predefined types should not be committable!");
+    goto error;
     }
 
     /* Copy a predefined datatype and commit the copy */
@@ -3835,34 +3856,34 @@ test_named (hid_t fapl)
     if(H5Tcommit2(file, "native-int", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) goto error;
     if((status = H5Tcommitted(type)) < 0) goto error;
     if(0 == status) {
-	H5_FAILED();
-	HDputs ("    H5Tcommitted() returned false!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    H5Tcommitted() returned false!");
+    goto error;
     }
 
     /* We should not be able to modify a type after it has been committed. */
     H5E_BEGIN_TRY {
-	status = H5Tset_precision (type, (size_t)256);
+    status = H5Tset_precision (type, (size_t)256);
     } H5E_END_TRY;
     if (status>=0) {
-	H5_FAILED();
-	HDputs ("    Committed type is not constant!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Committed type is not constant!");
+    goto error;
     }
 
     /* We should not be able to re-commit a committed type */
     H5E_BEGIN_TRY {
-	status = H5Tcommit2(file, "test_named_2 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Tcommit2(file, "test_named_2 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     } H5E_END_TRY;
     if(status >= 0) {
-	H5_FAILED();
-	HDputs ("    Committed types should not be recommitted!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Committed types should not be recommitted!");
+    goto error;
     }
 
     /* It should be possible to define an attribute for the named type */
     if((attr1 = H5Acreate2(type, "attr1", H5T_NATIVE_UCHAR, space,
-			  H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
+            H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
     for(i = 0; i < (size_t)ds_size[0]; i++)
         for(j = 0; j < (size_t)ds_size[1]; j++)
             attr_data[i][j] = (unsigned)(i * ds_size[1] + j);
@@ -3876,9 +3897,9 @@ test_named (hid_t fapl)
     if((t2 = H5Tcopy(type)) < 0) goto error;
     if((status = H5Tcommitted(t2)) < 0) goto error;
     if(status) {
-	H5_FAILED();
-	HDputs ("    Copying a named type should result in a transient type!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Copying a named type should result in a transient type!");
+    goto error;
     }
     if(H5Tset_precision(t2, (size_t)256) < 0) goto error;
     if(H5Tclose(t2) < 0) goto error;
@@ -3891,22 +3912,22 @@ test_named (hid_t fapl)
         FAIL_STACK_ERROR
     if((status = H5Tcommitted(type)) < 0) goto error;
     if(!status) {
-	H5_FAILED();
-	HDputs ("    Opened named types should be named types!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Opened named types should be named types!");
+    goto error;
     }
 
     /* Create a dataset that uses the named type */
     if((dset = H5Dcreate2(file, "dset1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+    goto error;
 
     /* Get the dataset's datatype and make sure it's a named type */
     if((t2 = H5Dget_type(dset)) < 0) goto error;
     if((status = H5Tcommitted(t2)) < 0) goto error;
     if(!status) {
-	H5_FAILED();
-	HDputs ("    Dataset type should be a named type!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Dataset type should be a named type!");
+    goto error;
     }
 
     /* Close the dataset, then close its type, then reopen the dataset */
@@ -3918,9 +3939,9 @@ test_named (hid_t fapl)
     if((t2 = H5Dget_type(dset)) < 0) goto error;
     if((status = H5Tcommitted(t2)) < 0) goto error;
     if(!status) {
-	H5_FAILED();
-	HDputs ("    Dataset type should be a named type!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Dataset type should be a named type!");
+    goto error;
     }
 
     /*
@@ -3937,9 +3958,9 @@ test_named (hid_t fapl)
     if((t2 = H5Dget_type(dset)) < 0) goto error;
     if((status = H5Tcommitted(t2)) < 0) goto error;
     if(!status) {
-	H5_FAILED();
-	HDputs ("    Dataset type should be a named type!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Dataset type should be a named type!");
+    goto error;
     }
     if(H5Tclose(t2) < 0) goto error;
 
@@ -3958,17 +3979,17 @@ test_named (hid_t fapl)
     if((t2 = H5Tcopy(type)) < 0) goto error;
     if((status = H5Tcommitted(t2)) < 0) goto error;
     if(status) {
-	H5_FAILED();
-	HDputs ("    Copied type should not be a named type!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Copied type should not be a named type!");
+    goto error;
     }
     if((dset = H5Dcreate2(file, "dset3", t2, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
     if((t3 = H5Dget_type(dset)) < 0) goto error;
     if((status = H5Tcommitted(t3)) < 0) goto error;
     if(status) {
-	H5_FAILED();
-	HDputs ("    Datatype from dataset using copied type should not be a named type!");
-	goto error;
+    H5_FAILED();
+    HDputs ("    Datatype from dataset using copied type should not be a named type!");
+    goto error;
     }
     if(H5Tclose(t3) < 0) goto error;
     if(H5Dclose(dset) < 0) goto error;
@@ -4013,26 +4034,26 @@ test_named (hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(t3);
-	H5Tclose(t2);
-	H5Tclose(type);
-	H5Sclose(space);
-	H5Dclose(dset);
-	H5Fclose(file);
+    H5Tclose(t3);
+    H5Tclose(t2);
+    H5Tclose(type);
+    H5Sclose(space);
+    H5Dclose(dset);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	mkstr
+ * Function:    mkstr
  *
- * Purpose:	Create a new string datatype
+ * Purpose:    Create a new string datatype
  *
- * Return:	Success:	New type
- *		Failure:	-1
+ * Return:    Success:    New type
+ *        Failure:    -1
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, August 10, 1998
  *
  *-------------------------------------------------------------------------
@@ -4040,7 +4061,7 @@ error:
 static hid_t
 mkstr(size_t len, H5T_str_t strpad)
 {
-    hid_t	t;
+    hid_t    t;
 
     if((t = H5Tcopy(H5T_C_S1)) < 0)
         return -1;
@@ -4052,16 +4073,16 @@ mkstr(size_t len, H5T_str_t strpad)
     return t;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_str_create
+ * Function:    test_str_create
  *
- * Purpose:	Test string type creation using H5Tcreate
+ * Purpose:    Test string type creation using H5Tcreate
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              19 May 2011
  *
  *-------------------------------------------------------------------------
@@ -4102,10 +4123,10 @@ test_str_create(void)
     if(!H5Tequal(vlen_str1, vlen_str2)) goto error;
 
     if((is_vl_str = H5Tis_variable_str(vlen_str1)) < 0) goto error;
-    if(!is_vl_str) goto error; 
+    if(!is_vl_str) goto error;
 
     if((is_vl_str = H5Tis_variable_str(vlen_str2)) < 0) goto error;
-    if(!is_vl_str) goto error; 
+    if(!is_vl_str) goto error;
 
     if(H5Tclose(vlen_str1) < 0) goto error;
     if(H5Tclose(vlen_str2) < 0) goto error;
@@ -4118,16 +4139,16 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_conv_str_1
+ * Function:    test_conv_str_1
  *
- * Purpose:	Test string conversions
+ * Purpose:    Test string conversions
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, August 10, 1998
  *
  *-------------------------------------------------------------------------
@@ -4135,8 +4156,8 @@ error:
 static int
 test_conv_str_1(void)
 {
-    char	*buf = NULL;
-    hid_t	src_type = -1;
+    char    *buf = NULL;
+    hid_t    src_type = -1;
     hid_t   dst_type = -1;
 
     TESTING("string conversions");
@@ -4151,15 +4172,15 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcd\0abcd\0abcdefghi\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Truncated C-string test failed");
-	goto error;
+    H5_FAILED();
+    HDputs("    Truncated C-string test failed");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcd\0\0\0\0\0\0abcd\0\0\0\0\0\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Extended C-string test failed");
-	goto error;
+    H5_FAILED();
+    HDputs("    Extended C-string test failed");
+    goto error;
     }
     HDfree(buf);
     buf = NULL;
@@ -4175,15 +4196,15 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Truncated C buffer test failed");
-	goto error;
+    H5_FAILED();
+    HDputs("    Truncated C buffer test failed");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Extended C buffer test failed");
-	goto error;
+    H5_FAILED();
+    HDputs("    Extended C buffer test failed");
+    goto error;
     }
     HDfree(buf);
     buf = NULL;
@@ -4199,15 +4220,15 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Truncated Fortran-string test failed");
-	goto error;
+    H5_FAILED();
+    HDputs("    Truncated Fortran-string test failed");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcde     abcde     ", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Extended Fortran-string test failed");
-	goto error;
+    H5_FAILED();
+    HDputs("    Extended Fortran-string test failed");
+    goto error;
     }
     HDfree(buf);
     buf = NULL;
@@ -4226,25 +4247,25 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Non-terminated string test 1");
-	goto error;
+    H5_FAILED();
+    HDputs("    Non-terminated string test 1");
+    goto error;
     }
     H5Tclose(dst_type);
     if((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) goto error;
     HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcd\0abcd\0abcdefghij", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Non-terminated string test 2");
-	goto error;
+    H5_FAILED();
+    HDputs("    Non-terminated string test 2");
+    goto error;
     }
     HDmemcpy(buf, "abcdeabcdexxxxxxxxxx", (size_t)20);
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Non-terminated string test 2");
-	goto error;
+    H5_FAILED();
+    HDputs("    Non-terminated string test 2");
+    goto error;
     }
     HDfree(buf);
     buf = NULL;
@@ -4260,30 +4281,30 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdefghi abcdefghi ", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    C string to Fortran test 1");
-	goto error;
+    H5_FAILED();
+    HDputs("    C string to Fortran test 1");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdefghi\0abcdefghi\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Fortran to C string test 1");
-	goto error;
+    H5_FAILED();
+    HDputs("    Fortran to C string test 1");
+    goto error;
     }
     if (H5Tclose(dst_type) < 0) goto error;
     if((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error;
     HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    C string to Fortran test 2");
-	goto error;
+    H5_FAILED();
+    HDputs("    C string to Fortran test 2");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Fortran to C string test 2");
-	goto error;
+    H5_FAILED();
+    HDputs("    Fortran to C string test 2");
+    goto error;
     }
     if (H5Tclose(src_type) < 0) goto error;
     if (H5Tclose(dst_type) < 0) goto error;
@@ -4292,15 +4313,15 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcd      abcd      ", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    C string to Fortran test 3");
-	goto error;
+    H5_FAILED();
+    HDputs("    C string to Fortran test 3");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcd\0abcd\0abcd      ", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Fortran to C string test 3");
-	goto error;
+    H5_FAILED();
+    HDputs("    Fortran to C string test 3");
+    goto error;
     }
     HDfree(buf);
     buf = NULL;
@@ -4316,30 +4337,30 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    C buffer to Fortran test 1");
-	goto error;
+    H5_FAILED();
+    HDputs("    C buffer to Fortran test 1");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Fortran to C buffer test 1");
-	goto error;
+    H5_FAILED();
+    HDputs("    Fortran to C buffer test 1");
+    goto error;
     }
     if (H5Tclose(dst_type) < 0) goto error;
     if((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error;
     HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    C buffer to Fortran test 2");
-	goto error;
+    H5_FAILED();
+    HDputs("    C buffer to Fortran test 2");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Fortran to C buffer test 2");
-	goto error;
+    H5_FAILED();
+    HDputs("    Fortran to C buffer test 2");
+    goto error;
     }
     if (H5Tclose(src_type) < 0) goto error;
     if (H5Tclose(dst_type) < 0) goto error;
@@ -4348,15 +4369,15 @@ test_conv_str_1(void)
     HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20);
     if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcd      abcd      ", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    C buffer to Fortran test 3");
-	goto error;
+    H5_FAILED();
+    HDputs("    C buffer to Fortran test 3");
+    goto error;
     }
     if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error;
     if (HDmemcmp(buf, "abcd\0abcd\0abcd      ", (size_t)20)) {
-	H5_FAILED();
-	HDputs("    Fortran to C buffer test 3");
-	goto error;
+    H5_FAILED();
+    HDputs("    Fortran to C buffer test 3");
+    goto error;
     }
     if(H5Tclose(src_type) < 0) goto error;
     if(H5Tclose(dst_type) < 0) goto error;
@@ -4372,7 +4393,7 @@ test_conv_str_1(void)
 
 error:
     H5E_BEGIN_TRY {
-        H5Tclose(src_type); 
+        H5Tclose(src_type);
         H5Tclose(dst_type);
     } H5E_END_TRY;
 
@@ -4387,16 +4408,16 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_conv_str_2
+ * Function:    test_conv_str_2
  *
- * Purpose:	Tests C-to-Fortran and Fortran-to-C string conversion speed.
+ * Purpose:    Tests C-to-Fortran and Fortran-to-C string conversion speed.
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, August 10, 1998
  *
  *-------------------------------------------------------------------------
@@ -4404,12 +4425,12 @@ error:
 static int
 test_conv_str_2(void)
 {
-    char		*buf = NULL, s[80];
-    hid_t		c_type = -1;
-    hid_t       	f_type = -1;
-    const size_t	nelmts = NTESTELEM;
-    size_t		i, j, nchars;
-    int			ret_value = 1;
+    char        *buf = NULL, s[80];
+    hid_t        c_type = -1;
+    hid_t           f_type = -1;
+    const size_t    nelmts = NTESTELEM;
+    size_t        i, j, nchars;
+    int            ret_value = 1;
 
     /*
      * Initialize types and buffer.
@@ -4418,16 +4439,16 @@ test_conv_str_2(void)
     if((f_type = mkstr((size_t)8, H5T_STR_SPACEPAD)) < 0) goto error;
     if(NULL == (buf = (char*)HDcalloc(nelmts, (size_t)8))) goto error;
     for(i = 0; i < nelmts; i++) {
-	nchars = (size_t)(HDrand() % 8);
-	for(j = 0; j < nchars; j++)
-	    buf[i * 8 + j] = (char)('a' + HDrand() % 26);
-	while(j < nchars)
+    nchars = (size_t)(HDrand() % 8);
+    for(j = 0; j < nchars; j++)
+        buf[i * 8 + j] = (char)('a' + HDrand() % 26);
+    while(j < nchars)
             buf[i * 8 + j++] = '\0';
     } /* 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;
@@ -4454,17 +4475,17 @@ error:
     return ret_value;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_conv_str_3
+ * Function:    test_conv_str_3
  *
- * Purpose:	Tests some functions that are or aren't supposed to work
+ * Purpose:    Tests some functions that are or aren't supposed to work
  *              for string type.
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Tuesday, April 4, 2006
  *
  *-------------------------------------------------------------------------
@@ -4472,12 +4493,12 @@ error:
 static int
 test_conv_str_3(void)
 {
-    char		*buf=NULL;
-    hid_t		type = -1;
-    hid_t       	super = -1;
-    const size_t	nelmts = NTESTELEM;
-    size_t		i, j, nchars;
-    int			ret_value = 1;
+    char        *buf=NULL;
+    hid_t        type = -1;
+    hid_t           super = -1;
+    const size_t    nelmts = NTESTELEM;
+    size_t        i, j, nchars;
+    int            ret_value = 1;
     size_t              size;
     H5T_pad_t           inpad;
     H5T_sign_t          sign;
@@ -4493,10 +4514,10 @@ test_conv_str_3(void)
     if(NULL == (buf = (char*)HDcalloc(nelmts, (size_t)8)))
         FAIL_PUTS_ERROR("Allocation failed.");
     for(i = 0; i < nelmts; i++) {
-	nchars = (size_t)(HDrand() % 8);
-	for(j = 0; j < nchars; j++)
-	    buf[i * 8 + j] = (char)('a' + HDrand() % 26);
-	while(j < nchars)
+    nchars = (size_t)(HDrand() % 8);
+    for(j = 0; j < nchars; j++)
+        buf[i * 8 + j] = (char)('a' + HDrand() % 26);
+    while(j < nchars)
             buf[i * 8 + j++] = '\0';
     } /* end for */
 
@@ -4559,7 +4580,7 @@ error:
         H5Tclose(super);
     } H5E_END_TRY;
 
-    if(buf) 
+    if(buf)
         HDfree(buf);
     if(tag)
         H5free_memory(tag); /* Technically allocated by API call */
@@ -4572,17 +4593,17 @@ error:
     return ret_value;  /* Number of errors */
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_conv_enum_1
+ * Function:    test_conv_enum_1
  *
- * Purpose:	Test conversion speed for enum datatypes
+ * Purpose:    Test conversion speed for enum datatypes
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Tuesday, January  5, 1999
  *
  * Modifications:
@@ -4593,11 +4614,11 @@ static int
 test_conv_enum_1(void)
 {
     const size_t nelmts=NTESTELEM;
-    int		i, val, *buf=NULL;
-    hid_t	t1 = -1;
-    hid_t	t2 = -1;
-    char	s[80];
-    int		ret_value = 1;
+    int        i, val, *buf=NULL;
+    hid_t    t1 = -1;
+    hid_t    t2 = -1;
+    char    s[80];
+    int        ret_value = 1;
     size_t      u;
 
     /* Build the datatypes */
@@ -4605,9 +4626,9 @@ test_conv_enum_1(void)
     if((t2 = H5Tenum_create(H5T_NATIVE_INT)) < 0) goto error;
     s[1] = '\0';
     for(i = 0; i < 26; i++) {
-	s[0] = (char)('A' + i);
-	H5Tenum_insert(t1, s, &i);
-	H5Tenum_insert(t2, s, (val = i * 1000 + i, &val));
+    s[0] = (char)('A' + i);
+    H5Tenum_insert(t1, s, &i);
+    H5Tenum_insert(t2, s, (val = i * 1000 + i, &val));
     } /* end for */
 
     /* Initialize the buffer */
@@ -4617,14 +4638,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();
@@ -4648,7 +4669,7 @@ error:
     return ret_value;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_conv_enum_2
  *
@@ -4674,7 +4695,7 @@ test_conv_enum_2(void)
                              "PURPLE",
                              "ORANGE",
                              "WHITE" };
-   
+
     TESTING("non-native enumeration type conversion");
 
     /* Source enum type */
@@ -4710,7 +4731,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);
             }
         }
@@ -4724,7 +4745,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;
     }
@@ -4733,17 +4754,17 @@ test_conv_enum_2(void)
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_conv_bitfield
+ * Function:    test_conv_bitfield
  *
- * Purpose:	Test bitfield conversions.
+ * Purpose:    Test bitfield conversions.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, May 20, 1999
  *
  * Modifications:
@@ -4753,8 +4774,8 @@ test_conv_enum_2(void)
 static int
 test_conv_bitfield(void)
 {
-    unsigned char	buf[4];
-    hid_t		st=-1, dt=-1;
+    unsigned char    buf[4];
+    hid_t        st=-1, dt=-1;
 
     TESTING("bitfield conversions");
 
@@ -4769,10 +4790,10 @@ test_conv_bitfield(void)
     buf[2] = buf[3] = 0x55; /*irrelevant*/
     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",
-	       buf[3], buf[2], buf[1], buf[0]);
-	goto error;
+    H5_FAILED();
+    printf("    s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n",
+        buf[3], buf[2], buf[1], buf[0]);
+    goto error;
     }
 
     /*
@@ -4788,10 +4809,10 @@ test_conv_bitfield(void)
     buf[0] = 0xA8; buf[1] = 0x2A; buf[2] = buf[3] = 0;
     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",
-	       buf[3], buf[2], buf[1], buf[0]);
-	goto error;
+    H5_FAILED();
+    printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n",
+        buf[3], buf[2], buf[1], buf[0]);
+    goto error;
     }
 
     /*
@@ -4802,10 +4823,10 @@ test_conv_bitfield(void)
     buf[0] = 0xA8; buf[1] = 0x2A; buf[2] = buf[3] = 0;
     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",
-	       buf[3], buf[2], buf[1], buf[0]);
-	goto error;
+    H5_FAILED();
+    printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n",
+        buf[3], buf[2], buf[1], buf[0]);
+    goto error;
     }
 
     H5Tclose(st);
@@ -4830,18 +4851,18 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_bitfield_funcs
+ * Function:    test_bitfield_funcs
  *
- * Purpose:	Test some datatype functions that are and aren't supposed
+ * Purpose:    Test some datatype functions that are and aren't supposed
  *              work for bitfield type.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Wednesday, April 5, 2006
  *
  * Modifications:
@@ -4851,7 +4872,7 @@ error:
 static int
 test_bitfield_funcs(void)
 {
-    hid_t		type=-1, ntype=-1, super=-1;
+    hid_t        type=-1, ntype=-1, super=-1;
     size_t              size;
     char*               tag=0;
     H5T_pad_t           inpad;
@@ -4884,7 +4905,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 */
 
@@ -4893,7 +4914,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 */
 
@@ -4902,7 +4923,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 */
 
@@ -4911,7 +4932,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 */
 
@@ -4920,7 +4941,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 */
 
@@ -4929,7 +4950,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 */
 
@@ -4938,7 +4959,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 */
 
@@ -4959,17 +4980,17 @@ error:
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	convert_opaque
+ * Function:    convert_opaque
  *
- * Purpose:	A fake opaque conversion functions
+ * Purpose:    A fake opaque conversion functions
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, June  4, 1999
  *
  * Modifications:
@@ -4978,25 +4999,25 @@ error:
  */
 static herr_t
 convert_opaque(hid_t H5_ATTR_UNUSED st, hid_t H5_ATTR_UNUSED dt, H5T_cdata_t *cdata,
-	       size_t H5_ATTR_UNUSED nelmts, size_t H5_ATTR_UNUSED buf_stride,
+        size_t H5_ATTR_UNUSED nelmts, size_t H5_ATTR_UNUSED buf_stride,
                size_t H5_ATTR_UNUSED bkg_stride, void H5_ATTR_UNUSED *_buf,
-	       void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dset_xfer_plid)
+        void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dset_xfer_plid)
 {
     if (H5T_CONV_CONV==cdata->command) num_opaque_conversions_g++;
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_opaque
+ * Function:    test_opaque
  *
- * Purpose:	Driver function to test opaque datatypes
+ * Purpose:    Driver function to test opaque datatypes
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              June 2, 2004
  *
  * Modifications:
@@ -5029,17 +5050,17 @@ test_opaque(void)
     return num_errors;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	opaque_check
+ * Function:    opaque_check
  *
- * Purpose:	Test opaque datatypes
+ * Purpose:    Test opaque datatypes
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, May 20, 1999
  *
  *-------------------------------------------------------------------------
@@ -5048,10 +5069,10 @@ static int
 opaque_check(int tag_it)
 {
 #define OPAQUE_NELMTS 1000
-    hid_t	st=-1, dt=-1;
-    herr_t	status;
-    char	buf[1]; /*not really used*/
-    int		saved;
+    hid_t    st=-1, dt=-1;
+    herr_t    status;
+    char    buf[1]; /*not really used*/
+    int        saved;
 
     saved = num_opaque_conversions_g = 0;
 
@@ -5067,29 +5088,29 @@ opaque_check(int tag_it)
 
     /* Make sure that we can't convert between the types yet */
     H5E_BEGIN_TRY {
-	status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT);
+    status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT);
     } H5E_END_TRY;
     if (status>=0) {
-	H5_FAILED();
-	printf("    opaque conversion should have failed but succeeded\n");
-	goto error;
+    H5_FAILED();
+    printf("    opaque conversion should have failed but succeeded\n");
+    goto error;
     }
 
     /* Register a conversion function */
     if (H5Tregister(H5T_PERS_HARD, "o_test", st, dt, convert_opaque) < 0)
-	goto error;
+    goto error;
 
     /* Try the conversion again, this time it should work */
     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");
-	goto error;
+    H5_FAILED();
+    printf("    unexpected number of opaque conversions\n");
+    goto error;
     }
 
     /* Unregister conversion function */
     if (H5Tunregister(H5T_PERS_HARD, "o_test", st, dt, convert_opaque) < 0)
-	goto error;
+    goto error;
 
     H5Tclose(st);
     H5Tclose(dt);
@@ -5102,16 +5123,16 @@ opaque_check(int tag_it)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	opaque_long
+ * Function:    opaque_long
  *
- * Purpose:	Test named (committed) opaque datatypes w/very long tags
+ * Purpose:    Test named (committed) opaque datatypes w/very long tags
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, June 14, 2005
  *
  *-------------------------------------------------------------------------
@@ -5119,8 +5140,8 @@ opaque_check(int tag_it)
 static int
 opaque_long(void)
 {
-    char 	*long_tag = NULL;
-    hid_t	dt = -1;
+    char     *long_tag = NULL;
+    hid_t    dt = -1;
     herr_t      ret;
 
     /* Build opaque type */
@@ -5133,7 +5154,7 @@ opaque_long(void)
 
     /* Set opaque type's tag */
     H5E_BEGIN_TRY {
-	ret = H5Tset_tag(dt, long_tag);
+    ret = H5Tset_tag(dt, long_tag);
     } H5E_END_TRY;
     if(ret != FAIL) TEST_ERROR
 
@@ -5154,18 +5175,18 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	opaque_funcs
+ * Function:    opaque_funcs
  *
- * Purpose:	Test some type functions that are and aren't supposed to
+ * Purpose:    Test some type functions that are and aren't supposed to
  *              work with opaque type.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Wednesday, April 5, 2006
  *
  * Modifications:
@@ -5175,7 +5196,7 @@ error:
 static int
 opaque_funcs(void)
 {
-    hid_t	type = -1, super=-1;
+    hid_t    type = -1, super=-1;
     size_t      size;
     H5T_pad_t   inpad;
     H5T_cset_t  cset;
@@ -5193,7 +5214,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 */
 
@@ -5201,7 +5222,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 */
 
@@ -5209,7 +5230,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 */
 
@@ -5217,7 +5238,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 */
 
@@ -5225,7 +5246,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 */
 
@@ -5233,7 +5254,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 */
 
@@ -5241,7 +5262,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 */
 
@@ -5249,7 +5270,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 */
 
@@ -5257,7 +5278,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 */
 
@@ -5270,7 +5291,7 @@ opaque_funcs(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_encode
  *
@@ -5311,7 +5332,7 @@ test_encode(void)
     size_t      enum_buf_size = 0;
     size_t      vlstr_buf_size = 0;
     unsigned char       *cmpd_buf=NULL, *enum_buf=NULL, *vlstr_buf=NULL;
-    hid_t	ret_id;
+    hid_t    ret_id;
     herr_t      ret;
 
     TESTING("functions of encoding and decoding datatypes");
@@ -5328,71 +5349,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 */
 
@@ -5403,7 +5424,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 */
 
@@ -5412,17 +5433,17 @@ test_encode(void)
 
     /* Try decoding bogus buffer */
     H5E_BEGIN_TRY {
-	ret_id = H5Tdecode(cmpd_buf);
+    ret_id = H5Tdecode(cmpd_buf);
     } 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 */
 
@@ -5433,19 +5454,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 */
 
@@ -5453,7 +5474,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 */
 
@@ -5462,33 +5483,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 */
 
@@ -5496,7 +5517,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 */
 
@@ -5505,26 +5526,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 */
 
@@ -5535,17 +5556,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);
@@ -5554,17 +5575,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);
@@ -5573,17 +5594,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);
@@ -5604,7 +5625,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 */
 
@@ -5613,7 +5634,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 */
 
@@ -5624,26 +5645,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 */
 
@@ -5652,40 +5673,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 */
 
@@ -5694,14 +5715,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);
@@ -5709,12 +5730,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 */
 
@@ -5724,69 +5745,69 @@ test_encode(void)
      */
 
     /* Make sure the reference counts for the decoded datatypes are one. */
-    if(H5Iget_ref(decoded_tid1) != 1) { 
+    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) { 
+    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) { 
+    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 */
 
-    /* Make sure the reference counts for the decoded datatypes can be 
+    /* Make sure the reference counts for the decoded datatypes can be
      * decremented and the datatypes are closed. */
-    if(H5Idec_ref(decoded_tid1) != 0) { 
+    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) { 
+    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) { 
+    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 */
 
     /* Make sure the decoded datatypes are already closed. */
     H5E_BEGIN_TRY {
-	ret = H5Tclose(decoded_tid1);
+    ret = H5Tclose(decoded_tid1);
     } 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;
     }
 
     H5E_BEGIN_TRY {
-	ret = H5Tclose(decoded_tid2);
+    ret = H5Tclose(decoded_tid2);
     } 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;
     }
 
     H5E_BEGIN_TRY {
-	ret = H5Tclose(decoded_tid3);
+    ret = H5Tclose(decoded_tid3);
     } 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;
     }
 
@@ -5797,23 +5818,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 */
 
@@ -5836,7 +5857,7 @@ test_encode(void)
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_latest
  *
@@ -5863,7 +5884,7 @@ test_latest(void)
     hid_t       file = (-1);            /* File ID */
     hid_t       tid1 = (-1), tid2 = (-1); /* Datatype ID */
     hid_t       fapl = (-1);            /* File access property list */
-    H5O_info_t	oi;                     /* Stat buffer for committed datatype */
+    H5O_info_t    oi;                     /* Stat buffer for committed datatype */
     hsize_t     old_dtype_oh_size;      /* Size of object header with "old" format */
     hsize_t     new_dtype_oh_size;      /* Size of object header with "new" format */
     char        filename[1024];         /* Buffer for filename */
@@ -6054,7 +6075,7 @@ conv_except(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5
     return(H5T_CONV_UNHANDLED);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_int_float_except
  *
@@ -6197,7 +6218,7 @@ error:
 #endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
 } /* end test_int_float_except() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_set_order
  *
@@ -6358,11 +6379,11 @@ error:
     return 1;
 } /* end test_set_order() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_set_order_compound
  *
- * Purpose:     Tests H5Tset_order/H5Tget_order for complicated compound 
+ * Purpose:     Tests H5Tset_order/H5Tget_order for complicated compound
  *              type.
  *
  * Return:      Success:        0
@@ -6394,13 +6415,13 @@ test_set_order_compound(hid_t fapl)
     hid_t       cmpd = -1, memb_cmpd = -1, memb_array1 = -1, memb_array2 = -1, cmpd_array = -1;
     hid_t       vl_id = -1;
     hsize_t     dims[2] = {3, 4};   /* Array dimenstions */
-    char	filename[1024];
+    char    filename[1024];
     herr_t      ret;                /* Generic return value */
 
     TESTING("H5Tset/get_order for compound type");
 
     if((memb_cmpd = H5Tcreate(H5T_COMPOUND, sizeof(atomic_cmpd))) < 0) FAIL_STACK_ERROR
-    if(H5Tinsert(memb_cmpd, "i", HOFFSET(atomic_cmpd, i), H5T_NATIVE_INT) < 0) FAIL_STACK_ERROR 
+    if(H5Tinsert(memb_cmpd, "i", HOFFSET(atomic_cmpd, i), H5T_NATIVE_INT) < 0) FAIL_STACK_ERROR
     if(H5Tinsert(memb_cmpd, "c", HOFFSET(atomic_cmpd, c), H5T_NATIVE_CHAR) < 0) FAIL_STACK_ERROR
     if(H5Tinsert(memb_cmpd, "s", HOFFSET(atomic_cmpd, s), H5T_NATIVE_SHORT) < 0) FAIL_STACK_ERROR
     if(H5Tinsert(memb_cmpd, "f", HOFFSET(atomic_cmpd, f), H5T_NATIVE_FLOAT) < 0) FAIL_STACK_ERROR
@@ -6420,19 +6441,19 @@ test_set_order_compound(hid_t fapl)
 
     /* Create a compound type using the types above. */
     if((cmpd = H5Tcreate(H5T_COMPOUND, sizeof(complex_cmpd))) < 0) FAIL_STACK_ERROR
-    if(H5Tinsert(cmpd, "a", HOFFSET(complex_cmpd, a), memb_cmpd) < 0) FAIL_STACK_ERROR 
-    if(H5Tinsert(cmpd, "vl_type", HOFFSET(complex_cmpd, vl), vl_id) < 0) FAIL_STACK_ERROR 
-    if(H5Tinsert(cmpd, "b", HOFFSET(complex_cmpd, b), memb_array1) < 0) FAIL_STACK_ERROR 
-    if(H5Tinsert(cmpd, "d", HOFFSET(complex_cmpd, d), memb_array2) < 0) FAIL_STACK_ERROR 
+    if(H5Tinsert(cmpd, "a", HOFFSET(complex_cmpd, a), memb_cmpd) < 0) FAIL_STACK_ERROR
+    if(H5Tinsert(cmpd, "vl_type", HOFFSET(complex_cmpd, vl), vl_id) < 0) FAIL_STACK_ERROR
+    if(H5Tinsert(cmpd, "b", HOFFSET(complex_cmpd, b), memb_array1) < 0) FAIL_STACK_ERROR
+    if(H5Tinsert(cmpd, "d", HOFFSET(complex_cmpd, d), memb_array2) < 0) FAIL_STACK_ERROR
 
     /* The order should be mixed now. */
-    if(H5Tget_order(cmpd) != H5T_ORDER_MIXED) FAIL_STACK_ERROR 
+    if(H5Tget_order(cmpd) != H5T_ORDER_MIXED) FAIL_STACK_ERROR
 
     /* Create an array of the compound type above */
     cmpd_array = H5Tarray_create2(cmpd, 2, dims);
 
     /* The order of the array type should be the same as the compound type */
-    if(H5Tget_order(cmpd_array) != H5T_ORDER_MIXED) FAIL_STACK_ERROR 
+    if(H5Tget_order(cmpd_array) != H5T_ORDER_MIXED) FAIL_STACK_ERROR
 
     /* Verify that the order can't be 'none'. */
     H5E_BEGIN_TRY
@@ -6450,13 +6471,13 @@ test_set_order_compound(hid_t fapl)
     if(H5Tset_order(cmpd, H5T_ORDER_BE) < 0) FAIL_STACK_ERROR
 
     /* Verify that the order of the compound type is big-endian */
-    if(H5Tget_order(cmpd) != H5T_ORDER_BE) FAIL_STACK_ERROR 
+    if(H5Tget_order(cmpd) != H5T_ORDER_BE) FAIL_STACK_ERROR
 
     /* Change the order of the array type to little-endian*/
     if(H5Tset_order(cmpd_array, H5T_ORDER_LE) < 0) FAIL_STACK_ERROR
 
     /* Verify that the order of the array type is little-endian */
-    if(H5Tget_order(cmpd_array) != H5T_ORDER_LE) FAIL_STACK_ERROR 
+    if(H5Tget_order(cmpd_array) != H5T_ORDER_LE) FAIL_STACK_ERROR
 
     /* Create file */
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
@@ -6491,23 +6512,23 @@ error:
         H5Tclose(vl_id);
         H5Tclose(cmpd);
         H5Tclose(cmpd_array);
-	H5Fclose(file);
+    H5Fclose(file);
     H5E_END_TRY;
     return 1;
 } /* end test_set_order_compound() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_named_indirect_reopen
+ * Function:    test_named_indirect_reopen
  *
- * Purpose:	Tests that open named datatypes can be reopened indirectly
+ * Purpose:    Tests that open named datatypes can be reopened indirectly
  *              through H5Dget_type without causing problems.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Neil Fortner
+ * Programmer:    Neil Fortner
  *              Thursday, June 4, 2009
  *
  * Modifications:
@@ -6517,13 +6538,13 @@ error:
 static int
 test_named_indirect_reopen(hid_t fapl)
 {
-    hid_t		file=-1, type=-1, reopened_type=-1, strtype=-1, dset=-1, space=-1;
-    static hsize_t	dims[1] = {3};
+    hid_t        file=-1, type=-1, reopened_type=-1, strtype=-1, dset=-1, space=-1;
+    static hsize_t    dims[1] = {3};
     size_t              dt_size;
     int                 enum_value;
     const char          *tag = "opaque_tag";
     char                *tag_ret = NULL;
-    char		filename[1024];
+    char        filename[1024];
 
     TESTING("indirectly reopening committed datatypes");
 
@@ -6687,12 +6708,12 @@ test_named_indirect_reopen(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(type);
-	H5Tclose(strtype);
-	H5Tclose(reopened_type);
-	H5Sclose(space);
-	H5Dclose(dset);
-	H5Fclose(file);
+    H5Tclose(type);
+    H5Tclose(strtype);
+    H5Tclose(reopened_type);
+    H5Sclose(space);
+    H5Dclose(dset);
+    H5Fclose(file);
     } H5E_END_TRY;
     if(tag_ret)
         H5free_memory(tag_ret);
@@ -6803,17 +6824,17 @@ static void create_del_obj_named_test_file(const char *filename, hid_t fapl,
     HDassert(status >= 0);
 } /* end create_del_obj_named_test_file() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_delete_obj_named
+ * Function:    test_delete_obj_named
  *
- * Purpose:	Tests that delete objects that use named datatypes through
+ * Purpose:    Tests that delete objects that use named datatypes through
  *              different file IDs
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, July 18, 2011
  *
  *-------------------------------------------------------------------------
@@ -6891,27 +6912,27 @@ test_delete_obj_named(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(attr);
-	H5Dclose(dset);
-	H5Pclose(fapl2);
-	H5Fclose(filea1);
-	H5Fclose(filea2);
-	H5Fclose(fileb);
+    H5Tclose(attr);
+    H5Dclose(dset);
+    H5Pclose(fapl2);
+    H5Fclose(filea1);
+    H5Fclose(filea2);
+    H5Fclose(fileb);
     } H5E_END_TRY;
     return 1;
 } /* end test_delete_obj_named() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_delete_obj_named_fileid
+ * Function:    test_delete_obj_named_fileid
  *
- * Purpose:	Tests that objects that use named datatypes through
+ * Purpose:    Tests that objects that use named datatypes through
  *              different file IDs get the correct file IDs
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, July 28, 2011
  *
  *-------------------------------------------------------------------------
@@ -7054,29 +7075,29 @@ test_delete_obj_named_fileid(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Aclose(attr);
-	H5Tclose(type);
-	H5Dclose(dset);
-	H5Pclose(fapl2);
-	H5Fclose(filea1);
-	H5Fclose(filea2);
-	H5Fclose(fileb);
-	H5Fclose(attr_fid);
-	H5Fclose(type_fid);
+    H5Aclose(attr);
+    H5Tclose(type);
+    H5Dclose(dset);
+    H5Pclose(fapl2);
+    H5Fclose(filea1);
+    H5Fclose(filea2);
+    H5Fclose(fileb);
+    H5Fclose(attr_fid);
+    H5Fclose(type_fid);
     } H5E_END_TRY;
     return 1;
 } /* end test_delete_obj_named_fileid() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_deprec
+ * Function:    test_deprec
  *
- * Purpose:	Tests deprecated API routines for datatypes.
+ * Purpose:    Tests deprecated API routines for datatypes.
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, September 27, 2007
  *
  *-------------------------------------------------------------------------
@@ -7085,17 +7106,17 @@ error:
 static int
 test_deprec(hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    hid_t		type = -1;              /* Datatype ID */
+    hid_t        file = -1;              /* File ID */
+    hid_t        type = -1;              /* Datatype ID */
     unsigned            rank = 2;               /* Rank for array datatype */
     hsize_t             dims[2] = {3, 3};       /* Dimensions for array datatype */
     int                 perm[2] = {0, 1};       /* Dimensions permutations for array datatype */
     hsize_t             rdims[2]= {0, 0};       /* Dimensions for querying array datatype */
     int                 rperm[2] = {-2, -2};    /* Dimensions permutations for array datatype */
     hbool_t             dim_mismatch;           /* Whether any dimensions didn't match */
-    char		filename[1024];
+    char        filename[1024];
     unsigned            u;                      /* Local index variable */
-    herr_t		status;                 /* Generic routine value */
+    herr_t        status;                 /* Generic routine value */
 
     TESTING("deprected API routines for datatypes");
 
@@ -7123,7 +7144,7 @@ test_deprec(hid_t fapl)
             dim_mismatch = TRUE;
         } /* end if */
     if(dim_mismatch)
-	FAIL_PUTS_ERROR("    Dimensions didn't match!")
+    FAIL_PUTS_ERROR("    Dimensions didn't match!")
 
     /* Check the array dimension permutations */
     dim_mismatch = FALSE;
@@ -7133,7 +7154,7 @@ test_deprec(hid_t fapl)
             dim_mismatch = TRUE;
         } /* end if */
     if(dim_mismatch)
-	FAIL_PUTS_ERROR("    Dimension permutations modified!")
+    FAIL_PUTS_ERROR("    Dimension permutations modified!")
 
     /* Close the datatype */
     if(H5Tclose(type) < 0)
@@ -7146,31 +7167,31 @@ test_deprec(hid_t fapl)
 
     /* Predefined types cannot be committed */
     H5E_BEGIN_TRY {
-	status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT);
+    status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT);
     } H5E_END_TRY;
     if(status >= 0)
-	FAIL_PUTS_ERROR("    Predefined types should not be committable!")
+    FAIL_PUTS_ERROR("    Predefined types should not be committable!")
 
     /* Copy a predefined datatype and commit the copy */
     if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR
     if(H5Tcommit1(file, "native-int", type) < 0) FAIL_STACK_ERROR
     if((status = H5Tcommitted(type)) < 0) FAIL_STACK_ERROR
     if(0 == status)
-	FAIL_PUTS_ERROR("    H5Tcommitted() returned false!")
+    FAIL_PUTS_ERROR("    H5Tcommitted() returned false!")
 
     /* We should not be able to modify a type after it has been committed. */
     H5E_BEGIN_TRY {
-	status = H5Tset_precision(type, (size_t)256);
+    status = H5Tset_precision(type, (size_t)256);
     } H5E_END_TRY;
     if(status >= 0)
-	FAIL_PUTS_ERROR("    Committed type is not constant!")
+    FAIL_PUTS_ERROR("    Committed type is not constant!")
 
     /* We should not be able to re-commit a committed type */
     H5E_BEGIN_TRY {
-	status = H5Tcommit1(file, "test_named_2 (should not exist)", type);
+    status = H5Tcommit1(file, "test_named_2 (should not exist)", type);
     } H5E_END_TRY;
     if(status >= 0)
-	FAIL_PUTS_ERROR("    Committed types should not be recommitted!")
+    FAIL_PUTS_ERROR("    Committed types should not be recommitted!")
 
     /*
      * Close the committed type and reopen it.  It should return a named type.
@@ -7179,7 +7200,7 @@ test_deprec(hid_t fapl)
     if((type = H5Topen1(file, "native-int")) < 0) FAIL_STACK_ERROR
     if((status = H5Tcommitted(type)) < 0) FAIL_STACK_ERROR
     if(!status)
-	FAIL_PUTS_ERROR("    Opened named types should be named types!")
+    FAIL_PUTS_ERROR("    Opened named types should be named types!")
 
     /* Close */
     if(H5Tclose(type) < 0) FAIL_STACK_ERROR
@@ -7209,24 +7230,24 @@ test_deprec(hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(type);
-	H5Fclose(file);
+    H5Tclose(type);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* end test_deprec() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_utf_ascii_conv
+ * Function:    test_utf_ascii_conv
  *
- * Purpose:	Make sure the library doesn't conversion strings between
+ * Purpose:    Make sure the library doesn't conversion strings between
  *              ASCII and UTF8.
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              10 November 2011
  *-------------------------------------------------------------------------
  */
@@ -7244,12 +7265,12 @@ test_utf_ascii_conv(void)
     char *ascii_r = NULL;
     const char *ascii_w = "bar!";
     char *utf8_r = NULL;
-    char		filename[1024];
+    char        filename[1024];
     char ascii2[4], utf8_2[4];
     herr_t status;
 
     TESTING("string conversion between ASCII and UTF");
- 
+
     /************************************************
      * Test VL string conversion from UTF8 to ASCII
      ************************************************/
@@ -7416,13 +7437,13 @@ test_utf_ascii_conv(void)
 
 error:
     H5E_BEGIN_TRY {
-	H5Tclose(utf8_vtid);
-	H5Tclose(ascii_vtid);
-	H5Tclose(utf8_tid);
-	H5Tclose(ascii_tid);
-	H5Dclose(did);
-	H5Sclose(sid);
-	H5Fclose(fid);
+    H5Tclose(utf8_vtid);
+    H5Tclose(ascii_vtid);
+    H5Tclose(utf8_tid);
+    H5Tclose(ascii_tid);
+    H5Dclose(did);
+    H5Sclose(sid);
+    H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 }
@@ -7562,7 +7583,7 @@ error:
     return ret;
 } /* end of verify_version */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_versionbounds
  *
@@ -7582,8 +7603,8 @@ error:
  *      It then loops through all valid combination of the library version
  *      bounds to verify each datatype's version.
  *
- * Return:      Success:	0
- *              Failure:	number of errors
+ * Return:      Success:    0
+ *              Failure:    number of errors
  *
  *-------------------------------------------------------------------------
  */
@@ -7772,26 +7793,26 @@ test_versionbounds(void)
 
     /* Close dataspace and property lists */
     if (H5Sclose(space) < 0) TEST_ERROR
-	if (H5Pclose(fcpl) < 0) TEST_ERROR
-	if (H5Pclose(fapl) < 0) TEST_ERROR
+    if (H5Pclose(fcpl) < 0) TEST_ERROR
+    if (H5Pclose(fapl) < 0) TEST_ERROR
 
     PASSED();
     return 0;
 
 error:
     H5E_BEGIN_TRY {
-	    H5Dclose(dset);
-	    H5Sclose(space);
-	    H5Tclose(dset_dtype);
-	    H5Pclose(dcpl);
-	    H5Pclose(fcpl);
-	    H5Pclose(fapl);
-	    H5Fclose(file);
+        H5Dclose(dset);
+        H5Sclose(space);
+        H5Tclose(dset_dtype);
+        H5Pclose(dcpl);
+        H5Pclose(fcpl);
+        H5Pclose(fapl);
+        H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 } /* end test_versionbounds() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -7811,8 +7832,8 @@ error:
 int
 main(void)
 {
-    long	nerrors = 0;
-    hid_t	fapl = -1;
+    long    nerrors = 0;
+    hid_t    fapl = -1;
 
     /* Set the random # seed */
     HDsrandom((unsigned)HDtime(NULL));
@@ -7821,7 +7842,7 @@ main(void)
     fapl = h5_fileaccess();
 
     if(ALIGNMENT)
-	printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
+    printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
 
     /* Do the tests */
     nerrors += test_classes();
@@ -7876,12 +7897,12 @@ main(void)
     nerrors += test_versionbounds();
 
     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/earray.c b/test/earray.c
index be899b6..bace4b7 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -20,14 +20,14 @@
  * This file needs to access private datatypes from the H5EA package.
  * This file also needs to access the extensible array testing code.
  */
-#define H5EA_FRIEND		/*suppress error about including H5EApkg	  */
+#define H5EA_FRIEND        /*suppress error about including H5EApkg      */
 #define H5EA_TESTING
-#include "H5EApkg.h"		/* Extensible Arrays			*/
+#include "H5EApkg.h"        /* Extensible Arrays            */
 
 /* Other private headers that this test requires */
 #include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5Iprivate.h"        /* IDs                      */
+#include "H5VMprivate.h"        /* Vectors and arrays             */
 
 
 /* Local macros */
@@ -172,16 +172,16 @@ char filename_g[EARRAY_FILENAME_LEN];
 /* Empty file size */
 h5_stat_size_t empty_size_g;
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	init_cparam
+ * Function:    init_cparam
  *
- * Purpose:	Initialize array creation parameter structure
+ * Purpose:    Initialize array creation parameter structure
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 21, 2008
  *
  *-------------------------------------------------------------------------
@@ -204,18 +204,18 @@ init_cparam(H5EA_create_t *cparam)
     return(0);
 } /* init_cparam() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	init_tparam
+ * Function:    init_tparam
  *
- * Purpose:	Initialize array testing parameter structure
+ * Purpose:    Initialize array testing parameter structure
  *
- * Note:	This initialization is the same as that in H5EA_hdr_init()
+ * Note:    This initialization is the same as that in H5EA_hdr_init()
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, September 25, 2008
  *
  *-------------------------------------------------------------------------
@@ -254,16 +254,16 @@ init_tparam(earray_test_param_t *tparam, const H5EA_create_t *cparam)
     return(0);
 } /* init_tparam() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	finish_tparam
+ * Function:    finish_tparam
  *
- * Purpose:	Close down array testing parameter structure
+ * Purpose:    Close down array testing parameter structure
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, September 25, 2008
  *
  *-------------------------------------------------------------------------
@@ -278,16 +278,16 @@ finish_tparam(earray_test_param_t *tparam)
     return(0);
 } /* finish_tparam() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_file
+ * Function:    create_file
  *
- * Purpose:	Create file and retrieve pointer to internal file object
+ * Purpose:    Create file and retrieve pointer to internal file object
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
@@ -314,16 +314,16 @@ error:
     return(-1);
 } /* create_file() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_stats
+ * Function:    check_stats
  *
- * Purpose:	Verify stats for an extensible array
+ * Purpose:    Verify stats for an extensible array
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 21, 2008
  *
  *-------------------------------------------------------------------------
@@ -392,22 +392,22 @@ error:
     return(-1);
 } /* check_stats() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	reopen_file
+ * Function:    reopen_file
  *
- * Purpose:	Perform common "re-open" operations on file & array for testing
+ * Purpose:    Perform common "re-open" operations on file & array for testing
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
  */
 static int
-reopen_file(hid_t *file, H5F_t **f, hid_t fapl, 
+reopen_file(hid_t *file, H5F_t **f, hid_t fapl,
     H5EA_t **ea, haddr_t ea_addr, const earray_test_param_t *tparam)
 {
     /* Check for closing & re-opening the array */
@@ -453,16 +453,16 @@ error:
     return(-1);
 } /* reopen_file() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	create_array
+ * Function:    create_array
  *
- * Purpose:	Create an extensible array and perform initial checks
+ * Purpose:    Create an extensible array and perform initial checks
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
@@ -500,16 +500,16 @@ error:
     return(-1);
 } /* create_array() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	verify_cparam
+ * Function:    verify_cparam
  *
- * Purpose:	Verify creation parameters are correct
+ * Purpose:    Verify creation parameters are correct
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
@@ -535,17 +535,17 @@ error:
     return FAIL;
 } /* verify_cparam() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	finish
+ * Function:    finish
  *
- * Purpose:	Close array, delete array, close file and verify that file
+ * Purpose:    Close array, delete array, close file and verify that file
  *              is empty size
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
@@ -589,16 +589,16 @@ error:
     return(-1);
 } /* finish() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_create
+ * Function:    test_create
  *
- * Purpose:	Test creating extensible array
+ * Purpose:    Test creating extensible array
  *
- * Return:	Success: 0
- *		Failure: 1
+ * Return:    Success: 0
+ *        Failure: 1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August  7, 2008
  *
  *-------------------------------------------------------------------------
@@ -606,8 +606,8 @@ error:
 static unsigned
 test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSED *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5EA_t      *ea = NULL;             /* Extensible array wrapper */
     haddr_t     ea_addr = HADDR_UNDEF;  /* Array address in file */
 
@@ -805,22 +805,22 @@ error:
     H5E_BEGIN_TRY {
         if(ea)
             H5EA_close(ea);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
 
     return 1;
 } /* end test_create() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_reopen
+ * Function:    test_reopen
  *
- * Purpose:	Create & reopen an extensible array
+ * Purpose:    Create & reopen an extensible array
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
@@ -828,8 +828,8 @@ error:
 static unsigned
 test_reopen(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5EA_t      *ea = NULL;             /* Extensible array wrapper */
     haddr_t     ea_addr = HADDR_UNDEF;  /* Array address in file */
 
@@ -875,22 +875,22 @@ error:
     H5E_BEGIN_TRY {
         if(ea)
             H5EA_close(ea);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
 
     return 1;
 } /* test_reopen() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_open_twice
+ * Function:    test_open_twice
  *
- * Purpose:	Open an extensible array twice
+ * Purpose:    Open an extensible array twice
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
@@ -898,10 +898,10 @@ error:
 static unsigned
 test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    hid_t	file2 = -1;             /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
-    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    hid_t    file2 = -1;             /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
+    H5F_t    *f2 = NULL;             /* Internal file object pointer */
     H5EA_t      *ea = NULL;             /* Extensible array wrapper */
     H5EA_t      *ea2 = NULL;            /* Extensible array wrapper */
     haddr_t     ea_addr = HADDR_UNDEF;  /* Array address in file */
@@ -981,25 +981,25 @@ error:
             H5EA_close(ea);
         if(ea2)
             H5EA_close(ea2);
-	H5Fclose(file);
-	H5Fclose(file2);
+    H5Fclose(file);
+    H5Fclose(file2);
     } H5E_END_TRY;
 
     return 1;
 } /* test_open_twice() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_open_twice_diff
+ * Function:    test_open_twice_diff
  *
- * Purpose:	Open an extensible array twice, through different "top" file
+ * Purpose:    Open an extensible array twice, through different "top" file
  *              handles, with an intermediate file open that takes the "shared"
  *              file handle from the first extensible array's file pointer.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, December 18, 2015
  *
  *-------------------------------------------------------------------------
@@ -1008,12 +1008,12 @@ static unsigned
 test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
 {
     char        filename_tmp[EARRAY_FILENAME_LEN];      /* Temporary file name */
-    hid_t	file = -1;              /* File ID */
-    hid_t	file2 = -1;             /* File ID */
-    hid_t	file0 = -1;             /* File ID */
-    hid_t	file00 = -1;            /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
-    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    hid_t    file2 = -1;             /* File ID */
+    hid_t    file0 = -1;             /* File ID */
+    hid_t    file00 = -1;            /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
+    H5F_t    *f2 = NULL;             /* Internal file object pointer */
     H5EA_t      *ea = NULL;             /* Extensible array wrapper */
     H5EA_t      *ea2 = NULL;            /* Extensible array wrapper */
     haddr_t     ea_addr = HADDR_UNDEF;  /* Array address in file */
@@ -1121,25 +1121,25 @@ error:
             H5EA_close(ea);
         if(ea2)
             H5EA_close(ea2);
-	H5Fclose(file);
-	H5Fclose(file2);
-	H5Fclose(file0);
-	H5Fclose(file00);
+    H5Fclose(file);
+    H5Fclose(file2);
+    H5Fclose(file0);
+    H5Fclose(file00);
     } H5E_END_TRY;
 
     return 1;
 } /* test_open_twice_diff() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_delete_open
+ * Function:    test_delete_open
  *
- * Purpose:	Delete opened extensible array (& open deleted array)
+ * Purpose:    Delete opened extensible array (& open deleted array)
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, August 28, 2008
  *
  *-------------------------------------------------------------------------
@@ -1147,8 +1147,8 @@ error:
 static unsigned
 test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5EA_t      *ea = NULL;             /* Extensible array wrapper */
     H5EA_t      *ea2 = NULL;            /* Extensible array wrapper */
     haddr_t     ea_addr = HADDR_UNDEF;  /* Array address in file */
@@ -1242,7 +1242,7 @@ error:
             H5EA_close(ea);
         if(ea2)
             H5EA_close(ea2);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
 
     return 1;
@@ -1254,16 +1254,16 @@ typedef struct eiter_fw_t {
     unsigned base_sblk_idx;       /* Starting index for actual superblocks */
 } eiter_fw_t;
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_fw_init
+ * Function:    eiter_fw_init
  *
- * Purpose:	Initialize element interator (forward iteration)
+ * Purpose:    Initialize element interator (forward iteration)
  *
- * Return:	Success:	Pointer to iteration status object
- *		Failure:	NULL
+ * Return:    Success:    Pointer to iteration status object
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, October  2, 2008
  *
  *-------------------------------------------------------------------------
@@ -1286,16 +1286,16 @@ eiter_fw_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_para
     return(eiter);
 } /* end eiter_fw_init() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_fw_next
+ * Function:    eiter_fw_next
  *
- * Purpose:	Get next element index (forward iteration)
+ * Purpose:    Get next element index (forward iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1315,16 +1315,16 @@ eiter_fw_next(void *_eiter)
     return(ret_val);
 } /* end eiter_fw_next() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_fw_max
+ * Function:    eiter_fw_max
  *
- * Purpose:	Get max. element index (forward iteration)
+ * Purpose:    Get max. element index (forward iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1343,14 +1343,14 @@ eiter_fw_max(const void *_eiter)
 
 
 /*-------------------------------------------------------------------------
- * Function:	eiter_fw_state
+ * Function:    eiter_fw_state
  *
- * Purpose:	Get extensible array state (forward iteration)
+ * Purpose:    Get extensible array state (forward iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1415,16 +1415,16 @@ HDfprintf(stderr, "state->nsuper_blks = %Hu\n", state->nsuper_blks);
     return(0);
 } /* end eiter_fw_state() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_fw_term
+ * Function:    eiter_fw_term
  *
- * Purpose:	Shut down element interator (forward iteration)
+ * Purpose:    Shut down element interator (forward iteration)
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, October  2, 2008
  *
  *-------------------------------------------------------------------------
@@ -1460,16 +1460,16 @@ typedef struct eiter_rv_t {
     hsize_t idx_blk_nsblks;             /* Number of superblocks directly pointed to in the index block */
 } eiter_rv_t;
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rv_init
+ * Function:    eiter_rv_init
  *
- * Purpose:	Initialize element interator (reverse iteration)
+ * Purpose:    Initialize element interator (reverse iteration)
  *
- * Return:	Success:	Pointer to iteration status object
- *		Failure:	NULL
+ * Return:    Success:    Pointer to iteration status object
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1504,16 +1504,16 @@ eiter_rv_init(const H5EA_create_t *cparam, const earray_test_param_t *tparam,
     return(eiter);
 } /* end eiter_rv_init() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rv_next
+ * Function:    eiter_rv_next
  *
- * Purpose:	Get next element index (reverse iteration)
+ * Purpose:    Get next element index (reverse iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1533,16 +1533,16 @@ eiter_rv_next(void *_eiter)
     return(ret_val);
 } /* end eiter_rv_next() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rv_max
+ * Function:    eiter_rv_max
  *
- * Purpose:	Get max. element index (reverse iteration)
+ * Purpose:    Get max. element index (reverse iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1559,16 +1559,16 @@ eiter_rv_max(const void *_eiter)
     return((hssize_t)eiter->max);
 } /* end eiter_rv_max() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rv_state
+ * Function:    eiter_rv_state
  *
- * Purpose:	Get extensible array state (reverse iteration)
+ * Purpose:    Get extensible array state (reverse iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1657,16 +1657,16 @@ HDfprintf(stderr, "eiter->idx_blk_nsblks = %Hu, state->nsuper_blks = %Hu\n", eit
     return(0);
 } /* end eiter_rv_state() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rv_term
+ * Function:    eiter_rv_term
  *
- * Purpose:	Shut down element interator (reverse iteration)
+ * Purpose:    Shut down element interator (reverse iteration)
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  4, 2008
  *
  *-------------------------------------------------------------------------
@@ -1699,16 +1699,16 @@ typedef struct eiter_rnd_t {
     hsize_t *idx;               /* Array of shuffled indices */
 } eiter_rnd_t;
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rnd_init
+ * Function:    eiter_rnd_init
  *
- * Purpose:	Initialize element interator (random iteration)
+ * Purpose:    Initialize element interator (random iteration)
  *
- * Return:	Success:	Pointer to iteration status object
- *		Failure:	NULL
+ * Return:    Success:    Pointer to iteration status object
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November  6, 2008
  *
  *-------------------------------------------------------------------------
@@ -1751,16 +1751,16 @@ eiter_rnd_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_par
     return(eiter);
 } /* end eiter_rnd_init() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rnd_next
+ * Function:    eiter_rnd_next
  *
- * Purpose:	Get next element index (random iteration)
+ * Purpose:    Get next element index (random iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November  6, 2008
  *
  *-------------------------------------------------------------------------
@@ -1785,16 +1785,16 @@ eiter_rnd_next(void *_eiter)
     return(ret_val);
 } /* end eiter_rnd_next() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rnd_max
+ * Function:    eiter_rnd_max
  *
- * Purpose:	Get max. element index (random iteration)
+ * Purpose:    Get max. element index (random iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  6, 2008
  *
  *-------------------------------------------------------------------------
@@ -1811,16 +1811,16 @@ eiter_rnd_max(const void *_eiter)
     return((hssize_t)eiter->max);
 } /* end eiter_rnd_max() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rnd_term
+ * Function:    eiter_rnd_term
  *
- * Purpose:	Shut down element interator (random iteration)
+ * Purpose:    Shut down element interator (random iteration)
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November  6, 2008
  *
  *-------------------------------------------------------------------------
@@ -1852,16 +1852,16 @@ static const earray_iter_t ea_iter_rnd = {
     eiter_rnd_term              /* Iterator term */
 };
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_rnd2_init
+ * Function:    eiter_rnd2_init
  *
- * Purpose:	Initialize element interator (random #2 iteration)
+ * Purpose:    Initialize element interator (random #2 iteration)
  *
- * Return:	Success:	Pointer to iteration status object
- *		Failure:	NULL
+ * Return:    Success:    Pointer to iteration status object
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, November 11, 2008
  *
  *-------------------------------------------------------------------------
@@ -1936,16 +1936,16 @@ typedef struct eiter_cyc_t {
     hsize_t cyc;                /* Cycle of elements to choose from */
 } eiter_cyc_t;
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_cyc_init
+ * Function:    eiter_cyc_init
  *
- * Purpose:	Initialize element interator (cyclic iteration)
+ * Purpose:    Initialize element interator (cyclic iteration)
  *
- * Return:	Success:	Pointer to iteration status object
- *		Failure:	NULL
+ * Return:    Success:    Pointer to iteration status object
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November 11, 2008
  *
  *-------------------------------------------------------------------------
@@ -1970,16 +1970,16 @@ eiter_cyc_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_par
     return(eiter);
 } /* end eiter_cyc_init() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_cyc_next
+ * Function:    eiter_cyc_next
  *
- * Purpose:	Get next element index (cyclic iteration)
+ * Purpose:    Get next element index (cyclic iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November 11, 2008
  *
  *-------------------------------------------------------------------------
@@ -2006,16 +2006,16 @@ eiter_cyc_next(void *_eiter)
     return(ret_val);
 } /* end eiter_cyc_next() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_cyc_max
+ * Function:    eiter_cyc_max
  *
- * Purpose:	Get max. element index (cyclic iteration)
+ * Purpose:    Get max. element index (cyclic iteration)
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November 11, 2008
  *
  *-------------------------------------------------------------------------
@@ -2032,16 +2032,16 @@ eiter_cyc_max(const void *_eiter)
     return((hssize_t)eiter->max);
 } /* end eiter_cyc_max() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	eiter_cyc_term
+ * Function:    eiter_cyc_term
  *
- * Purpose:	Shut down element interator (cyclic iteration)
+ * Purpose:    Shut down element interator (cyclic iteration)
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November 11, 2008
  *
  *-------------------------------------------------------------------------
@@ -2069,16 +2069,16 @@ static const earray_iter_t ea_iter_cyc = {
     eiter_cyc_term              /* Iterator term */
 };
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_set_elmts
+ * Function:    test_set_elmts
  *
- * Purpose:	Set all elements from 0 through 'nelmts' in extensible array
+ * Purpose:    Set all elements from 0 through 'nelmts' in extensible array
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, September 22, 2008
  *
  *-------------------------------------------------------------------------
@@ -2087,8 +2087,8 @@ static unsigned
 test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
     hsize_t nelmts, const char *test_str)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5EA_t      *ea = NULL;             /* Extensible array wrapper */
     void        *eiter_info;            /* Extensible array iterator info */
     earray_state_t state;               /* State of extensible array */
@@ -2241,22 +2241,22 @@ error:
     H5E_BEGIN_TRY {
         if(ea)
             H5EA_close(ea);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
 
     return 1;
 } /* test_set_elmts() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_skip_elmts
+ * Function:    test_skip_elmts
  *
- * Purpose:	Skip some elements when writing element
+ * Purpose:    Skip some elements when writing element
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November 11, 2008
  *
  *-------------------------------------------------------------------------
@@ -2265,8 +2265,8 @@ static unsigned
 test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
     hsize_t skip_elmts, const char *test_str)
 {
-    hid_t	file = -1;              /* File ID */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5EA_t      *ea = NULL;             /* Extensible array wrapper */
     earray_state_t state;               /* State of extensible array */
     uint64_t    welmt;                  /* Element to write */
@@ -2404,16 +2404,16 @@ error:
     return 1;
 } /* test_skip_elmts() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test the extensible array code
+ * Purpose:    Test the extensible array code
  *
- * Return:	Success: 0
- *		Failure: 1
+ * Return:    Success: 0
+ *        Failure: 1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, June 17, 2008
  *
  *-------------------------------------------------------------------------
@@ -2425,10 +2425,10 @@ main(void)
     earray_test_param_t tparam;         /* Testing parameters */
     earray_test_type_t curr_test;       /* Current test being worked on */
     earray_iter_type_t curr_iter;       /* Current iteration type being worked on */
-    hid_t	fapl = -1;              /* File access property list for data files */
-    unsigned	nerrors = 0;            /* Cumulative error count */
+    hid_t    fapl = -1;              /* File access property list for data files */
+    unsigned    nerrors = 0;            /* Cumulative error count */
     time_t      curr_time;              /* Current time, for seeding random number generator */
-    int		ExpressMode;            /* Test express value */
+    int        ExpressMode;            /* Test express value */
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
 
     /* Reset library */
@@ -2436,7 +2436,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");
 
     /* Set the filename to use for this test (dependent on fapl) */
     h5_fixname(FILENAME[0], fapl, filename_g, sizeof(filename_g));
@@ -2451,7 +2451,7 @@ main(void)
 
     /* Create an empty file to retrieve size */
     {
-        hid_t	file;              /* File ID */
+        hid_t    file;              /* File ID */
 
         if((file = H5Fcreate(filename_g, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             FAIL_STACK_ERROR
@@ -2559,14 +2559,14 @@ main(void)
                     nelmts = (hsize_t)((hsize_t)1 + cparam.idx_blk_elmts +
                         tparam.sblk_info[sblk].start_idx +
                         (tparam.sblk_info[sblk].dblk_nelmts * dblk));
-                    sprintf(test_str, "setting first element of array's data block #%llu", (unsigned long long)ndblks);
+                    HDsprintf(test_str, "setting first element of array's data block #%llu", (unsigned long long)ndblks);
                     nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str);
 
                     /* Test all elements in data block */
                     nelmts = (hsize_t)(cparam.idx_blk_elmts +
                         tparam.sblk_info[sblk].start_idx +
                         (tparam.sblk_info[sblk].dblk_nelmts * (dblk + 1)));
-                    sprintf(test_str, "setting all elements of array's data block #%llu", (unsigned long long)ndblks);
+                    HDsprintf(test_str, "setting all elements of array's data block #%llu", (unsigned long long)ndblks);
                     nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str);
 
                     /* Increment data block being tested */
diff --git a/test/efc.c b/test/efc.c
index 98d4948..d63ef34 100644
--- a/test/efc.c
+++ b/test/efc.c
@@ -2885,8 +2885,7 @@ error:
  *
  * Purpose:     Test the external file cache code
  *
- * Return:      Success: SUCCEED
- *              Failure: FAIL
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  * Programmer:  Neil Fortner
  *              December 16, 2010
diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c
index cee38f3..998c81c 100644
--- a/test/enc_dec_plist.c
+++ b/test/enc_dec_plist.c
@@ -22,7 +22,7 @@
 static int
 test_encode_decode(hid_t orig_pl)
 {
-    hid_t pl = (-1);	       	/* Decoded property list */
+    hid_t pl = (-1);               /* Decoded property list */
     void *temp_buf = NULL;      /* Pointer to encoding buffer */
     size_t temp_size = 0;       /* Size of encoding buffer */
 
@@ -51,33 +51,35 @@ test_encode_decode(hid_t orig_pl)
     return(0);
 
 error:
-    if(pl > 0)
-        H5Pclose(pl);
     if(temp_buf)
         HDfree(temp_buf);
 
+     H5E_BEGIN_TRY {
+        H5Pclose(pl);
+    } H5E_END_TRY;
+
     return(-1);
 } /* end test_encode_decode() */
 
 int
 main(void)
 {
-    hid_t dcpl;	       	/* dataset create prop. list */
-    hid_t dapl;	       	/* dataset access prop. list */
-    hid_t dxpl;	       	/* dataset xfer prop. list */
-    hid_t gcpl;	       	/* group create prop. list */
-    hid_t ocpypl;	/* object copy prop. list */
-    hid_t ocpl;	        /* object create prop. list */
-    hid_t lcpl;	       	/* link create prop. list */
-    hid_t lapl;	       	/* link access prop. list */
-    hid_t fapl;	       	/* file access prop. list */
-    hid_t fcpl;	       	/* file create prop. list */
-    hid_t strcpl;	/* string create prop. list */
-    hid_t acpl;	       	/* attribute create prop. list */
-
-    hsize_t chunk_size[2] = {16384, 4};	/* chunk size */ 
-    double fill = 2.7f;         /* Fill value */
-    hsize_t max_size[1];        /* data space maximum size */
+    hid_t dcpl;      /* dataset create prop. list */
+    hid_t dapl;      /* dataset access prop. list */
+    hid_t dxpl;      /* dataset xfer prop. list */
+    hid_t gcpl;      /* group create prop. list */
+    hid_t ocpypl;    /* object copy prop. list */
+    hid_t ocpl;      /* object create prop. list */
+    hid_t lcpl;      /* link create prop. list */
+    hid_t lapl;      /* link access prop. list */
+    hid_t fapl;      /* file access prop. list */
+    hid_t fcpl;      /* file create prop. list */
+    hid_t strcpl;    /* string create prop. list */
+    hid_t acpl;      /* attribute create prop. list */
+
+    hsize_t chunk_size[2] = {16384, 4};    /* chunk size */
+    double fill = 2.7f;     /* Fill value */
+    hsize_t max_size[1];    /* data space maximum size */
     size_t nslots = 521 * 2;
     size_t nbytes = 1048576 * 10;
     double w0 = 0.5f;
@@ -115,14 +117,15 @@ main(void)
         0.2f,
         (256 * 2048),
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
+
     H5AC_cache_image_config_t my_cache_image_config = {
-	H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION,
-	TRUE,
+        H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION,
+        TRUE,
         FALSE,
-	-1};
+        -1 };
 
     if(VERBOSE_MED)
-	printf("Encode/Decode DCPLs\n");
+        HDprintf("Encode/Decode DCPLs\n");
 
     /******* ENCODE/DECODE DCPLS *****/
     TESTING("Default DCPL Encoding/Decoding");
@@ -150,23 +153,23 @@ main(void)
         FAIL_STACK_ERROR
 
     max_size[0] = 100;
-    if((H5Pset_external(dcpl, "ext1.data", (off_t)0, 
+    if((H5Pset_external(dcpl, "ext1.data", (off_t)0,
                          (hsize_t)(max_size[0] * sizeof(int)/4))) < 0)
         FAIL_STACK_ERROR
-    if((H5Pset_external(dcpl, "ext2.data", (off_t)0, 
+    if((H5Pset_external(dcpl, "ext2.data", (off_t)0,
                          (hsize_t)(max_size[0] * sizeof(int)/4))) < 0)
         FAIL_STACK_ERROR
-    if((H5Pset_external(dcpl, "ext3.data", (off_t)0, 
+    if((H5Pset_external(dcpl, "ext3.data", (off_t)0,
                          (hsize_t)(max_size[0] * sizeof(int)/4))) < 0)
         FAIL_STACK_ERROR
-    if((H5Pset_external(dcpl, "ext4.data", (off_t)0, 
+    if((H5Pset_external(dcpl, "ext4.data", (off_t)0,
                          (hsize_t)(max_size[0] * sizeof(int)/4))) < 0)
         FAIL_STACK_ERROR
 
     /* Test encoding & decoding property list */
     if(test_encode_decode(dcpl) < 0)
         FAIL_PUTS_ERROR("DCPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(dcpl)) < 0)
          FAIL_STACK_ERROR
@@ -193,7 +196,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(dapl) < 0)
         FAIL_PUTS_ERROR("DAPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(dapl)) < 0)
          FAIL_STACK_ERROR
@@ -226,7 +229,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(ocpl) < 0)
         FAIL_PUTS_ERROR("OCPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(ocpl)) < 0)
         FAIL_STACK_ERROR
@@ -271,7 +274,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(dxpl) < 0)
         FAIL_PUTS_ERROR("DXPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(dxpl)) < 0)
          FAIL_STACK_ERROR
@@ -311,7 +314,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(gcpl) < 0)
         FAIL_PUTS_ERROR("GCPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(gcpl)) < 0)
          FAIL_STACK_ERROR
@@ -338,7 +341,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(lcpl) < 0)
         FAIL_PUTS_ERROR("LCPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(lcpl)) < 0)
         FAIL_STACK_ERROR
@@ -384,7 +387,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(lapl) < 0)
         FAIL_PUTS_ERROR("LAPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(lapl)) < 0)
         FAIL_STACK_ERROR
@@ -416,7 +419,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(ocpypl) < 0)
         FAIL_PUTS_ERROR("OCPYPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(ocpypl)) < 0)
          FAIL_STACK_ERROR
@@ -469,7 +472,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(fapl) < 0)
         FAIL_PUTS_ERROR("FAPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(fapl)) < 0)
         FAIL_STACK_ERROR
@@ -515,7 +518,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(fcpl) < 0)
         FAIL_PUTS_ERROR("FCPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(fcpl)) < 0)
         FAIL_STACK_ERROR
@@ -543,7 +546,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(strcpl) < 0)
         FAIL_PUTS_ERROR("STRCPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(strcpl)) < 0)
         FAIL_STACK_ERROR
@@ -571,7 +574,7 @@ main(void)
     /* Test encoding & decoding property list */
     if(test_encode_decode(acpl) < 0)
         FAIL_PUTS_ERROR("ACPL encoding/decoding failed\n")
-        
+
     /* release resource */
     if((H5Pclose(acpl)) < 0)
         FAIL_STACK_ERROR
@@ -582,7 +585,7 @@ main(void)
     return 0;
 
 error:
-    printf("***** Plist Encode/Decode tests FAILED! *****\n");
+    HDprintf("***** Plist Encode/Decode tests FAILED! *****\n");
     return 1;
 }
 
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..d2d039a 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");
+error:
+    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 ad64055..3e8b7de 100644
--- a/test/external.c
+++ b/test/external.c
@@ -146,7 +146,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 */
 
@@ -158,7 +158,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 */
 
@@ -166,7 +166,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 */
 
@@ -407,7 +407,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 */
 
@@ -417,14 +417,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/external_env.c b/test/external_env.c
index b47f3e7..18e1f25 100644
--- a/test/external_env.c
+++ b/test/external_env.c
@@ -12,16 +12,16 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Purpose:	Tests datasets stored in external raw files.
+ * Purpose:    Tests datasets stored in external raw files.
  */
 #include "external_common.h"
 
-const static char *EXT_ENV_FNAME[] = {
+static const char *EXT_ENV_FNAME[] = {
     "extern_env_dir/file_2",
     NULL
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_path_env
  *
@@ -46,23 +46,22 @@ const static char *EXT_ENV_FNAME[] = {
 static int
 test_path_env(hid_t fapl)
 {
-    hid_t	file = -1;          /* file to write to                     */
-    hid_t	dcpl = -1;          /* dataset creation properties          */
-    hid_t	space = -1;         /* data space                           */
-    hid_t	dapl = -1;          /* dataset access property list         */
-    hid_t	dset = -1;          /* dataset                              */
-    size_t	i;                  /* miscellaneous counters               */
-    char	cwdpath[1024];		/* working directory                    */
-    char	filename[1024];		/* file name                            */
-    int	    part[PART_SIZE];    /* raw data buffer (partial)            */
+    hid_t    file = -1;          /* file to write to                     */
+    hid_t    dcpl = -1;          /* dataset creation properties          */
+    hid_t    space = -1;         /* data space                           */
+    hid_t    dapl = -1;          /* dataset access property list         */
+    hid_t    dset = -1;          /* dataset                              */
+    size_t    i;                  /* miscellaneous counters               */
+    char    cwdpath[1024];        /* working directory                    */
+    char    filename[1024];        /* file name                            */
+    int        part[PART_SIZE];    /* raw data buffer (partial)            */
     int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
-    hsize_t	cur_size;           /* current data space size              */
-    char	buffer[1024];       /* buffer to read efile_prefix          */
+    hsize_t    cur_size;           /* current data space size              */
+    char    buffer[1024];       /* buffer to read efile_prefix          */
 
     TESTING("prefix in HDF5_EXTFILE_PREFIX");
 
     h5_fixname(EXT_ENV_FNAME[0], fapl, filename, sizeof(filename));
-
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
 
@@ -127,7 +126,7 @@ error:
     return 1;
 } /* end test_path_env() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -135,7 +134,7 @@ error:
  *
  * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Tuesday, March  3, 1998
  *
  *-------------------------------------------------------------------------
@@ -143,12 +142,12 @@ error:
 int
 main(void)
 {
-    hid_t	fapl_id_old = -1;   /* file access properties (old format)  */
-    hid_t	fapl_id_new = -1;   /* file access properties (new format)  */
-    hid_t	fid = -1;           /* file for test_1* functions           */
-    hid_t	gid = -1;           /* group to emit diagnostics            */
+    hid_t    fapl_id_old = -1;   /* file access properties (old format)  */
+    hid_t    fapl_id_new = -1;   /* file access properties (new format)  */
+    hid_t    fid = -1;           /* file for test_1* functions           */
+    hid_t    gid = -1;           /* group to emit diagnostics            */
     unsigned latest_format;     /* default or latest file format        */
-    int		nerrors = 0;        /* number of errors                     */
+    int        nerrors = 0;        /* number of errors                     */
 
     h5_reset();
 
@@ -213,7 +212,7 @@ error:
         H5Gclose(gid);
     } H5E_END_TRY;
     nerrors = MAX(1, nerrors);
-    printf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
+    HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
     return EXIT_FAILURE;
 } /* end main() */
 
diff --git a/test/fheap.c b/test/fheap.c
index 48261ef..3ef6206 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -30,9 +30,9 @@
 
 /* Other private headers that this test requires */
 #include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5VMprivate.h"	/* Vectors and arrays 			*/
+#include "H5MMprivate.h"        /* Memory management			*/
+#include "H5Iprivate.h"         /* IDs			  		*/
+#include "H5VMprivate.h"        /* Vectors and arrays 			*/
 
 /* Max. testfile name length */
 #define FHEAP_FILENAME_LEN      1024
@@ -15594,7 +15594,7 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_random() */
diff --git a/test/fillval.c b/test/fillval.c
index 5b95de9..0454bde 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -15,7 +15,7 @@
  * Programmer:  Robb Matzke <robb@arborea.spizella.com>
  *              Thursday, October  1, 1998
  *
- * Purpose:	Tests dataset fill values.
+ * Purpose:    Tests dataset fill values.
  */
 #include "h5test.h"
 #include "H5srcdir.h"
@@ -59,9 +59,9 @@ typedef struct {
  * for version 1.4(after 1.4.3).  To get this data file, simply compile
  * gen_old_fill.c with HDF5 library (before v1.5) and run it. */
 #define FILE_COMPATIBLE "fill_old.h5"
-#define FILE_NAME_RAW	"fillval.raw"
+#define FILE_NAME_RAW    "fillval.raw"
+
 
-
 /*-------------------------------------------------------------------------
  * Function:    create_compound_type
  *
@@ -91,7 +91,7 @@ static hid_t create_compound_type(void)
     if(H5Tinsert(ret_value, "y", HOFFSET(comp_datatype, y), H5T_NATIVE_DOUBLE) < 0)
         goto error;
     if(H5Tinsert(ret_value, "z", HOFFSET(comp_datatype, z), H5T_NATIVE_CHAR) < 0)
-	goto error;
+    goto error;
 
     return ret_value;
 
@@ -102,7 +102,7 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    create_compound_vl_type
  *
@@ -146,18 +146,18 @@ error:
     return -1;
 } /* end create_compound_vl_type() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_getset
+ * Function:    test_getset
  *
- * Purpose:	Tests the H5Pget_fill_value() and H5Pset_fill_value()
- *		functions.
+ * Purpose:    Tests the H5Pget_fill_value() and H5Pset_fill_value()
+ *        functions.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, October  1, 1998
  *
  * Modifications:
@@ -167,15 +167,15 @@ error:
 static int
 test_getset(void)
 {
-    hid_t	dcpl=-1;
-    int		fill_i;
-    hid_t	type_ss=-1, type_si=-1;
+    hid_t    dcpl=-1;
+    int        fill_i;
+    hid_t    type_ss=-1, type_si=-1;
     struct fill_si {
-	int 	v1, v2;
-    }		fill_si;
+    int     v1, v2;
+    }        fill_si;
     struct fill_ss {
-	short	v1, v2;
-    }		fill_ss, fill_ss_rd;
+    short    v1, v2;
+    }        fill_ss, fill_ss_rd;
 
     TESTING("property lists");
 
@@ -185,18 +185,18 @@ test_getset(void)
      */
     if((dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
     if((type_ss=H5Tcreate(H5T_COMPOUND, sizeof fill_ss)) < 0 ||
-	H5Tinsert(type_ss, "v1", HOFFSET(struct fill_ss, v1),
-		  H5T_NATIVE_SHORT) < 0 ||
-	H5Tinsert(type_ss, "v2", HOFFSET(struct fill_ss, v2),
-		  H5T_NATIVE_SHORT) < 0) {
-	goto error;
+    H5Tinsert(type_ss, "v1", HOFFSET(struct fill_ss, v1),
+        H5T_NATIVE_SHORT) < 0 ||
+    H5Tinsert(type_ss, "v2", HOFFSET(struct fill_ss, v2),
+        H5T_NATIVE_SHORT) < 0) {
+    goto error;
     }
     if((type_si=H5Tcreate(H5T_COMPOUND, sizeof fill_si)) < 0 ||
-	H5Tinsert(type_si, "v1", HOFFSET(struct fill_si, v1),
-		  H5T_NATIVE_INT) < 0 ||
-	H5Tinsert(type_si, "v2", HOFFSET(struct fill_si, v2),
-		  H5T_NATIVE_INT) < 0) {
-	goto error;
+    H5Tinsert(type_si, "v1", HOFFSET(struct fill_si, v1),
+        H5T_NATIVE_INT) < 0 ||
+    H5Tinsert(type_si, "v2", HOFFSET(struct fill_si, v2),
+        H5T_NATIVE_INT) < 0) {
+    goto error;
     }
 
     /*
@@ -204,12 +204,12 @@ test_getset(void)
      * no fill value should result in a failure.
      */
     H5E_BEGIN_TRY {
-	H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i);
+    H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i);
     } H5E_END_TRY;
     if(fill_i != 0) {
-	H5_FAILED();
-	puts("    H5Pget_fill_value() should return default 0");
-	goto error;
+    H5_FAILED();
+    puts("    H5Pget_fill_value() should return default 0");
+    goto error;
     }
 
     /*
@@ -224,10 +224,10 @@ test_getset(void)
      */
     if(H5Pget_fill_value(dcpl, type_ss, &fill_ss_rd) < 0) goto error;
     if(fill_ss.v1!=fill_ss_rd.v1 || fill_ss.v2!=fill_ss_rd.v2) {
-	H5_FAILED();
-	puts("    Failed to get fill value using same data type that was ");
-	puts("    used to set the fill value.");
-	goto error;
+    H5_FAILED();
+    puts("    Failed to get fill value using same data type that was ");
+    puts("    used to set the fill value.");
+    goto error;
     }
 
     /*
@@ -235,10 +235,10 @@ test_getset(void)
      */
     if(H5Pget_fill_value(dcpl, type_si, &fill_si) < 0) goto error;
     if(fill_ss.v1!=fill_si.v1 || fill_ss.v2!=fill_si.v2) {
-	H5_FAILED();
-	puts("    Failed to get fill value using a data type other than what");
-	puts("    was used to set the fill value.");
-	goto error;
+    H5_FAILED();
+    puts("    Failed to get fill value using a data type other than what");
+    puts("    was used to set the fill value.");
+    goto error;
     }
 
     /*
@@ -247,9 +247,9 @@ test_getset(void)
     if(H5Pset_fill_value(dcpl, type_si, &fill_si) < 0) goto error;
     if(H5Pget_fill_value(dcpl, type_ss, &fill_ss) < 0) goto error;
     if(fill_si.v1!=fill_ss.v1 || fill_si.v2!=fill_ss.v2) {
-	H5_FAILED();
-	puts("    Resetting the fill value was unsuccessful.");
-	goto error;
+    H5_FAILED();
+    puts("    Resetting the fill value was unsuccessful.");
+    goto error;
     }
 
     /* Success */
@@ -261,24 +261,24 @@ test_getset(void)
 
  error:
     H5E_BEGIN_TRY {
-	H5Pclose(dcpl);
-	H5Tclose(type_si);
-	H5Tclose(type_ss);
+    H5Pclose(dcpl);
+    H5Tclose(type_si);
+    H5Tclose(type_ss);
     } H5E_END_TRY;
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_getset_vl
+ * Function:    test_getset_vl
  *
- * Purpose:	Tests the H5Pget_fill_value() and H5Pset_fill_value()
- *		functions, using variable-length datatype.
+ * Purpose:    Tests the H5Pget_fill_value() and H5Pset_fill_value()
+ *        functions, using variable-length datatype.
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, May 31, 2007
  *
  *-------------------------------------------------------------------------
@@ -362,47 +362,47 @@ test_getset_vl(hid_t fapl)
     return 1;
 } /* end test_getset_vl() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_create
+ * Function:    test_create
  *
- * Purpose:	Tests creating datasets that have fill values.
+ * Purpose:    Tests creating datasets that have fill values.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, October  1, 1998
  *
  * Modifications:
- *		Many new cases have been added to this test since
- *		the fill value design has been modified.
+ *        Many new cases have been added to this test since
+ *        the fill value design has been modified.
  *
  *-------------------------------------------------------------------------
  */
 static int
 test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
 {
-    hid_t	file=-1, space=-1, dcpl=-1, comp_type_id=-1;
-    hid_t	dset1=-1, dset2=-1, dset3=-1, dset4=-1, dset5=-1,
-		dset6=-1, /* dset7=-1, */ dset8=-1, dset9=-1;
+    hid_t    file=-1, space=-1, dcpl=-1, comp_type_id=-1;
+    hid_t    dset1=-1, dset2=-1, dset3=-1, dset4=-1, dset5=-1,
+        dset6=-1, /* dset7=-1, */ dset8=-1, dset9=-1;
     hsize_t     cur_size[5] = {2, 8, 8, 4, 2};
-    hsize_t	ch_size[5] = {1, 1, 1, 4, 1};
-    short	rd_s, fill_s = 0x1234;
-    long	rd_l, fill_l = 0x4321;
-    char	filename[1024];
-    H5D_space_status_t	allocation;
+    hsize_t    ch_size[5] = {1, 1, 1, 4, 1};
+    short    rd_s, fill_s = 0x1234;
+    long    rd_l, fill_l = 0x4321;
+    char    filename[1024];
+    H5D_space_status_t    allocation;
     H5D_alloc_time_t    alloc_time;
-    H5D_fill_time_t	fill_time;
+    H5D_fill_time_t    fill_time;
     comp_datatype       rd_c, fill_ctype;
 
     if(H5D_CHUNKED==layout) {
-	TESTING("chunked dataset creation");
+    TESTING("chunked dataset creation");
     } else if(H5D_COMPACT==layout) {
         TESTING("compact dataset creation");
     } else {
-	TESTING("contiguous dataset creation");
+    TESTING("contiguous dataset creation");
     }
 
     /*
@@ -410,11 +410,11 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
      */
     h5_fixname(base_name, fapl, filename, sizeof filename);
     if((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+    goto error;
     if((space=H5Screate_simple(5, cur_size, cur_size)) < 0) goto error;
     if((dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
     if(H5D_CHUNKED==layout) {
-	if(H5Pset_chunk(dcpl, 5, ch_size) < 0) goto error;
+    if(H5Pset_chunk(dcpl, 5, ch_size) < 0) goto error;
     } else if(H5D_COMPACT==layout) {
         if(H5Pset_layout(dcpl, H5D_COMPACT) < 0) goto error;
     }
@@ -444,21 +444,21 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(H5Pset_fill_value(dcpl, H5T_NATIVE_SHORT, &fill_s) < 0) goto error;
 #endif
         if((dset1=H5Dcreate2(file, "dset1", H5T_NATIVE_LONG, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	   goto error;
+    goto error;
 
         /* 3. Large to small fill conversion */
 #ifndef NO_FILLING
         if(H5Pset_fill_value(dcpl, H5T_NATIVE_LONG, &fill_l) < 0) goto error;
 #endif
         if((dset2=H5Dcreate2(file, "dset2", H5T_NATIVE_SHORT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	   goto error;
+    goto error;
 
         /* 4. No conversion */
 #ifndef NO_FILLING
         if(H5Pset_fill_value(dcpl, H5T_NATIVE_LONG, &fill_l) < 0) goto error;
 #endif
         if((dset3=H5Dcreate2(file, "dset3", H5T_NATIVE_LONG, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	   goto error;
+    goto error;
 
         /* 5. late space allocation and never write fill value */
         if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error;
@@ -504,7 +504,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     /* 3. Write fill value at space allocation time */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error;
     if((dset6 = H5Dcreate2(file, "dset6", H5T_NATIVE_LONG, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	goto error;
+    goto error;
 
     /* 4. fill value is undefined while fill write time is H5D_FILL_TIME_ALLOC.
      * Supposed to fail. */
@@ -531,7 +531,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
 
     /* Open the file and get the dataset fill value from each dataset */
     if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-	goto error;
+    goto error;
 
     /* I. Check cases for late space allocation except compact dataset */
     if(H5D_COMPACT != layout) {
@@ -541,10 +541,10 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
 #ifndef NO_FILLING
         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);
-	   goto error;
+    H5_FAILED();
+    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
         if(H5Dclose(dset1) < 0) goto error;
@@ -556,10 +556,10 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
 #ifndef NO_FILLING
         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);
-	   goto error;
+    H5_FAILED();
+    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
         if(H5Dclose(dset2) < 0) goto error;
@@ -571,10 +571,10 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
 #ifndef NO_FILLING
         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);
-	   goto error;
+    H5_FAILED();
+    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
         if(H5Pget_alloc_time(dcpl, &alloc_time) < 0) goto error;
@@ -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,21 +598,21 @@ 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;
         if(H5Pget_alloc_time(dcpl, &alloc_time) < 0) goto error;
         if(H5Pget_fill_time(dcpl, &fill_time) < 0) goto error;
         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);
+    H5_FAILED();
+    puts("    Got non-H5D_ALLOC_TIME_LATE space allocation 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);
+    H5_FAILED();
+    puts("    Got non-H5D_FILL_TIME_NEVER fill value write 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,8 +697,8 @@ 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",
-		(double)rd_c.a, rd_c.y, rd_c.x, rd_c.z);
+        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;
     if(H5Pclose(dcpl) < 0) goto error;
@@ -710,56 +710,56 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
 
 error:
     H5E_BEGIN_TRY {
-	H5Pclose(dcpl);
-	H5Sclose(space);
+    H5Pclose(dcpl);
+    H5Sclose(space);
         if(H5D_COMPACT != layout) {
-	   H5Dclose(dset1);
-	   H5Dclose(dset2);
-	   H5Dclose(dset3);
+    H5Dclose(dset1);
+    H5Dclose(dset2);
+    H5Dclose(dset3);
            H5Dclose(dset4);
            H5Dclose(dset9);
         }
         H5Dclose(dset5);
         H5Dclose(dset6);
-	H5Dclose(dset8);
-	H5Fclose(file);
+    H5Dclose(dset8);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_rdwr_cases
+ * Function:    test_rdwr_cases
  *
- * Purpose:	Tests fill values read and write for datasets.
+ * Purpose:    Tests fill values read and write for datasets.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, October  1, 1998
  *
  * Modifications:
- * 		This function is called by test_rdwr to write and read
- *		dataset for different cases.
+ *         This function is called by test_rdwr to write and read
+ *        dataset for different cases.
  *
  *-------------------------------------------------------------------------
  */
 static int
 test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
-		H5D_fill_time_t fill_time, H5D_layout_t layout,
-		H5T_class_t datatype, hid_t ctype_id)
+        H5D_fill_time_t fill_time, H5D_layout_t layout,
+        H5T_class_t datatype, hid_t ctype_id)
 {
-    hid_t	fspace=-1, mspace=-1, dset1=-1, dset2=-1;
-    hsize_t	cur_size[5] = {2, 8, 8, 4, 2};
-    hsize_t	one[5] = {1, 1, 1, 1, 1};
-    hsize_t	hs_size[5], hs_stride[5];
-    hsize_t	hs_offset[5], nelmts;
-    int		fillval=(-1), val_rd, should_be;
-    int		i, j, *buf=NULL, odd;
+    hid_t    fspace=-1, mspace=-1, dset1=-1, dset2=-1;
+    hsize_t    cur_size[5] = {2, 8, 8, 4, 2};
+    hsize_t    one[5] = {1, 1, 1, 1, 1};
+    hsize_t    hs_size[5], hs_stride[5];
+    hsize_t    hs_offset[5], nelmts;
+    int        fillval=(-1), val_rd, should_be;
+    int        i, j, *buf=NULL, odd;
     unsigned    u;
     comp_datatype       rd_c, fill_c, should_be_c;
-    comp_datatype	*buf_c=NULL;
+    comp_datatype    *buf_c=NULL;
     H5D_space_status_t  allocation;
 
     if(datatype == H5T_INTEGER) {
@@ -788,27 +788,27 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
     if((mspace = H5Screate_simple(5, one, NULL)) < 0)
         goto error;
     for (i=0; i<1000; i++) {
-	for (j=0; j<5; j++)
-	    hs_offset[j] = (hsize_t)HDrand() % cur_size[j];
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL,
-				one, NULL) < 0) goto error;
+    for (j=0; j<5; j++)
+        hs_offset[j] = (hsize_t)HDrand() % cur_size[j];
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL,
+                one, NULL) < 0) goto error;
 
-   	/* case for atomic datatype */
-	if(datatype==H5T_INTEGER) {
+    /* case for atomic datatype */
+    if(datatype==H5T_INTEGER) {
             if(H5Dread(dset1, H5T_NATIVE_INT, mspace, fspace, H5P_DEFAULT,
-		&val_rd) < 0) goto error;
-	    if(fill_time!=H5D_FILL_TIME_NEVER && val_rd!=fillval) {
-	        H5_FAILED();
+        &val_rd) < 0) goto error;
+        if(fill_time!=H5D_FILL_TIME_NEVER && val_rd!=fillval) {
+            H5_FAILED();
                 HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
-	        HDfprintf(stdout,"    Elmt={%Hu,%Hu,%Hu,%Hu,%Hu}, read: %u, "
-		       "Fill value: %u\n",
-		       hs_offset[0], hs_offset[1],
-		       hs_offset[2], hs_offset[3],
-		       hs_offset[4], val_rd, fillval);
-	        goto error;
-	    }
-	/* case for compound datatype */
-	}
+            HDfprintf(stdout,"    Elmt={%Hu,%Hu,%Hu,%Hu,%Hu}, read: %u, "
+            "Fill value: %u\n",
+            hs_offset[0], hs_offset[1],
+            hs_offset[2], hs_offset[3],
+            hs_offset[4], val_rd, fillval);
+            goto error;
+        }
+    /* case for compound datatype */
+    }
     else if(datatype==H5T_COMPOUND) {
             if(H5Dread(dset2, ctype_id, mspace, fspace, H5P_DEFAULT,
                 &rd_c) < 0) goto error;
@@ -822,7 +822,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                        hs_offset[0], hs_offset[1],
                        hs_offset[2], hs_offset[3],
                        hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z,
-			(double)fill_c.a, fill_c.x, fill_c.y, fill_c.z);
+            (double)fill_c.a, fill_c.x, fill_c.y, fill_c.z);
                 goto error;
             }
         }
@@ -871,8 +871,8 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
     else if(datatype == H5T_COMPOUND) {
         /*check for overflow*/
         HDassert((nelmts * sizeof(comp_datatype)) ==
-	    (hsize_t)((size_t)(nelmts * sizeof(comp_datatype))));
-	buf_c = (comp_datatype *)HDmalloc((size_t)nelmts * sizeof(comp_datatype));
+        (hsize_t)((size_t)(nelmts * sizeof(comp_datatype))));
+    buf_c = (comp_datatype *)HDmalloc((size_t)nelmts * sizeof(comp_datatype));
 
         if(H5Dread(dset2, ctype_id, mspace, fspace, H5P_DEFAULT, buf_c) < 0)
             goto error;
@@ -910,24 +910,24 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
     else if(datatype == H5T_COMPOUND) {
         HDmemset(buf_c, 0, ((size_t)nelmts * sizeof(comp_datatype)));
         for(u = 0; u < nelmts; u++) {
-	    buf_c[u].a = 1111.11F;
- 	    buf_c[u].x = 2222;
-	    buf_c[u].y = 3333.3333F;
-	    buf_c[u].z = 'd';
-	}
+        buf_c[u].a = 1111.11F;
+        buf_c[u].x = 2222;
+        buf_c[u].y = 3333.3333F;
+        buf_c[u].z = 'd';
+    }
         if(H5Dwrite(dset2, ctype_id, mspace, fspace, H5P_DEFAULT, buf_c) < 0)
             goto error;
     }
 
     /* Check if space is allocated */
     if(datatype==H5T_INTEGER && H5Dget_space_status(dset1, &allocation) < 0)
-	goto error;
+    goto error;
     if(datatype==H5T_COMPOUND && H5Dget_space_status(dset2, &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;
     }
     HDfree(buf);
@@ -938,86 +938,86 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
     if((mspace = H5Screate_simple(5, one, NULL)) < 0)
         goto error;
     for(i = 0; i < 1000; i++) {
-	for(j = 0, odd = 0; j < 5; j++) {
-	    hs_offset[j] = (hsize_t)HDrand() % cur_size[j];
-	    odd += (int)(hs_offset[j]%2);
-	} /* end for */
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0)
+    for(j = 0, odd = 0; j < 5; j++) {
+        hs_offset[j] = (hsize_t)HDrand() % cur_size[j];
+        odd += (int)(hs_offset[j]%2);
+    } /* end for */
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0)
             goto error;
 
-	/* case for atomic datatype */
+    /* case for atomic datatype */
         if(datatype==H5T_INTEGER) {
-	    if(H5Dread(dset1, H5T_NATIVE_INT, mspace, fspace, H5P_DEFAULT, &val_rd) < 0)
+        if(H5Dread(dset1, H5T_NATIVE_INT, mspace, fspace, H5P_DEFAULT, &val_rd) < 0)
                 goto error;
             if(fill_time == H5D_FILL_TIME_ALLOC) {
                 should_be = odd ? fillval : 9999;
                 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],
                            (long)hs_offset[4], val_rd, should_be);
                     goto error;
                 }
-	    }
-	    else if(fill_time == H5D_FILL_TIME_NEVER && !odd) {
-	        should_be = 9999;
-	        if(val_rd!=should_be) {
-	            H5_FAILED();
+        }
+        else if(fill_time == H5D_FILL_TIME_NEVER && !odd) {
+            should_be = 9999;
+            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, "
-		           "should be: %u\n",
-		           (long)hs_offset[0], (long)hs_offset[1],
-		           (long)hs_offset[2], (long)hs_offset[3],
-		           (long)hs_offset[4], val_rd, should_be);
-	            goto error;
-	        }
-	    } else if(fill_time == H5D_FILL_TIME_NEVER && odd) {
- 	        /*Trash data. Don't compare*/
-	    }
-	} /* end for datatype==H5T_INTEGER */
-	/* case for compound datatype */
-	else if(datatype==H5T_COMPOUND) {
+                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],
+                (long)hs_offset[4], val_rd, should_be);
+                goto error;
+            }
+        } else if(fill_time == H5D_FILL_TIME_NEVER && odd) {
+            /*Trash data. Don't compare*/
+        }
+    } /* end for datatype==H5T_INTEGER */
+    /* case for compound datatype */
+    else if(datatype==H5T_COMPOUND) {
             if(H5Dread(dset2, ctype_id, mspace, fspace, H5P_DEFAULT, &rd_c) < 0)
                 goto error;
             if(fill_time == H5D_FILL_TIME_ALLOC) {
-		if(odd) {
-		    should_be_c.a=fill_c.a;
-		    should_be_c.x=fill_c.x;
-		    should_be_c.y=fill_c.y;
-		    should_be_c.z=fill_c.z;
-		} else {
-		    should_be_c.a=buf_c[0].a;
-		    should_be_c.x=buf_c[0].x;
-		    should_be_c.y=buf_c[0].y;
-		    should_be_c.z=buf_c[0].z;
-		}
-		if(!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x ||
-		    !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z)  {
+        if(odd) {
+            should_be_c.a=fill_c.a;
+            should_be_c.x=fill_c.x;
+            should_be_c.y=fill_c.y;
+            should_be_c.z=fill_c.z;
+        } else {
+            should_be_c.a=buf_c[0].a;
+            should_be_c.x=buf_c[0].x;
+            should_be_c.y=buf_c[0].y;
+            should_be_c.z=buf_c[0].z;
+        }
+        if(!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x ||
+            !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],
                            (long)hs_offset[4],
-			   (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a,
-		           should_be_c.x,should_be_c.y,should_be_c.z);
+            (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a,
+                should_be_c.x,should_be_c.y,should_be_c.z);
                     goto error;
- 		}
-	    } /* end for fill_time == H5D_FILL_TIME_ALLOC */
-	    else if(fill_time == H5D_FILL_TIME_NEVER && !odd) {
+        }
+        } /* end for fill_time == H5D_FILL_TIME_ALLOC */
+        else if(fill_time == H5D_FILL_TIME_NEVER && !odd) {
                 should_be_c.a=buf_c[0].a;
                 should_be_c.x=buf_c[0].x;
                 should_be_c.y=buf_c[0].y;
                 should_be_c.z=buf_c[0].z;
-		if(!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x ||
-		    !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z)  {
+        if(!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x ||
+            !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],
@@ -1026,11 +1026,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                            should_be_c.x,should_be_c.y,should_be_c.z);
                     goto error;
                 }
-	    } /* end for fill_time == H5D_FILL_TIME_NEVER */
+        } /* end for fill_time == H5D_FILL_TIME_NEVER */
             else if(fill_time == H5D_FILL_TIME_NEVER && odd) {
                 /*Trash data. Don't compare*/
             }
-	} /* end for datatype==H5T_COMPOUND */
+    } /* end for datatype==H5T_COMPOUND */
     }
     if(datatype == H5T_COMPOUND) {
         HDfree(buf_c);
@@ -1045,16 +1045,16 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 
  error:
     H5E_BEGIN_TRY {
-	if(datatype==H5T_INTEGER) H5Dclose(dset1);
-	if(datatype==H5T_COMPOUND) H5Dclose(dset2);
-	H5Sclose(fspace);
-	H5Sclose(mspace);
+    if(datatype==H5T_INTEGER) H5Dclose(dset1);
+    if(datatype==H5T_COMPOUND) H5Dclose(dset2);
+    H5Sclose(fspace);
+    H5Sclose(mspace);
     } H5E_END_TRY;
 
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_rdwr
  *
@@ -1068,8 +1068,8 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
  *              Thursday, October  1, 1998
  *
  * Modifications:
- *		Many new cases have been added to this test since the
- *		fill value design is modified.
+ *        Many new cases have been added to this test since the
+ *        fill value design is modified.
  *
  *-------------------------------------------------------------------------
  */
@@ -1077,9 +1077,9 @@ static int
 test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout)
 {
     char        filename[1024];
-    hid_t 	file=-1, dcpl=-1, ctype_id=-1;
+    hid_t     file=-1, dcpl=-1, ctype_id=-1;
     hsize_t     ch_size[5] = {2, 8, 8, 4, 2};
-    int		nerrors=0;
+    int        nerrors=0;
     int         fillval = 0x4c70f1cd;
     comp_datatype       fill_ctype={0,0,0,0};
 
@@ -1154,7 +1154,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout)
         fill_ctype.y = 4444.4444F;
         if(H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0) goto error;
         nerrors += test_rdwr_cases(file, dcpl, "dset11", &fill_ctype, H5D_FILL_TIME_ALLOC,
-				layout, H5T_COMPOUND, ctype_id);
+                layout, H5T_COMPOUND, ctype_id);
 
         if(H5Pclose(dcpl) < 0) goto error;
         if((dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
@@ -1211,7 +1211,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout)
 
 
     if(nerrors)
-	goto error;
+    goto error;
     if(H5Pclose(dcpl) < 0) goto error;
     if(H5Tclose(ctype_id) < 0) goto error;
     if(H5Fclose(file) < 0) goto error;
@@ -1221,22 +1221,22 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout)
  error:
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
-	H5Tclose(ctype_id);
+    H5Tclose(ctype_id);
         H5Fclose(file);
     } H5E_END_TRY;
     return nerrors;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend_init_integer
+ * Function:    test_extend_init_integer
  *
- * Purpose:	Initializes integer values
+ * Purpose:    Initializes integer values
  *
- * Return:	Success:	0
- *		Failure:	< 0
+ * Return:    Success:    0
+ *        Failure:    < 0
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July  3, 2007
  *
  *-------------------------------------------------------------------------
@@ -1255,16 +1255,16 @@ test_extend_init_integer(void *_buf, size_t nelmts, const void *_val)
     return 0;
 } /* end test_extend_init_integer() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend_verify_integer
+ * Function:    test_extend_verify_integer
  *
- * Purpose:	Verifies integer values
+ * Purpose:    Verifies integer values
  *
- * Return:	Success:	0
- *		Failure:	< 0
+ * Return:    Success:    0
+ *        Failure:    < 0
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July  3, 2007
  *
  *-------------------------------------------------------------------------
@@ -1293,16 +1293,16 @@ error:
     return -1;
 } /* end test_extend_verify_integer() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend_release_integer
+ * Function:    test_extend_release_integer
  *
- * Purpose:	Release element of integer value
+ * Purpose:    Release element of integer value
  *
- * Return:	Success:	0
- *		Failure:	< 0
+ * Return:    Success:    0
+ *        Failure:    < 0
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July  3, 2007
  *
  *-------------------------------------------------------------------------
@@ -1313,16 +1313,16 @@ test_extend_release_integer(void H5_ATTR_UNUSED *_elmt)
     return 0;
 } /* end test_extend_release_integer() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend_init_cmpd_vl
+ * Function:    test_extend_init_cmpd_vl
  *
- * Purpose:	Initializes compound+vl values
+ * Purpose:    Initializes compound+vl values
  *
- * Return:	Success:	0
- *		Failure:	< 0
+ * Return:    Success:    0
+ *        Failure:    < 0
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July  3, 2007
  *
  *-------------------------------------------------------------------------
@@ -1348,16 +1348,16 @@ test_extend_init_cmpd_vl(void *_buf, size_t nelmts, const void *_val)
     return 0;
 } /* end test_extend_init_cmpd_vl() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend_verify_cmpd_vl
+ * Function:    test_extend_verify_cmpd_vl
  *
- * Purpose:	Verifies compound+vl values
+ * Purpose:    Verifies compound+vl values
  *
- * Return:	Success:	0
- *		Failure:	< 0
+ * Return:    Success:    0
+ *        Failure:    < 0
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July  3, 2007
  *
  *-------------------------------------------------------------------------
@@ -1389,16 +1389,16 @@ error:
     return -1;
 } /* end test_extend_verify_cmpd_vl() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend_release_cmpd_vl
+ * Function:    test_extend_release_cmpd_vl
  *
- * Purpose:	Release element of compound+vl value
+ * Purpose:    Release element of compound+vl value
  *
- * Return:	Success:	0
- *		Failure:	< 0
+ * Return:    Success:    0
+ *        Failure:    < 0
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July  3, 2007
  *
  *-------------------------------------------------------------------------
@@ -1415,16 +1415,16 @@ test_extend_release_cmpd_vl(void *_elmt)
     return 0;
 } /* end test_extend_release_integer() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend_cases
+ * Function:    test_extend_cases
  *
- * Purpose:	Called to test fill values with various different values
+ * Purpose:    Called to test fill values with various different values
  *
- * Return:	Success:	0
- *		Failure:	number of errors
+ * Return:    Success:    0
+ *        Failure:    number of errors
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July  3, 2007
  *
  *-------------------------------------------------------------------------
@@ -1433,13 +1433,13 @@ static int
 test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     hsize_t *ch_size, hsize_t *start_size, hsize_t *max_size, hid_t dtype, void *fillval)
 {
-    hid_t	fspace = -1, mspace = -1;       /* File & memory dataspaces */
-    hid_t	dset = -1;                      /* Dataset ID */
+    hid_t    fspace = -1, mspace = -1;       /* File & memory dataspaces */
+    hid_t    dset = -1;                      /* Dataset ID */
     hid_t       dcpl = -1;                      /* Dataset creation property list */
-    hsize_t	extend_size[5];                 /* Dimensions to extend to */
-    hsize_t	one[5] = {1, 1, 1, 1, 1};       /* Dimensions of single element dataspace */
-    hsize_t	hs_size[5], hs_stride[5], hs_offset[5];
-    size_t	nelmts;
+    hsize_t    extend_size[5];                 /* Dimensions to extend to */
+    hsize_t    one[5] = {1, 1, 1, 1, 1};       /* Dimensions of single element dataspace */
+    hsize_t    hs_size[5], hs_stride[5], hs_offset[5];
+    size_t    nelmts;
     H5T_class_t dtype_class;            /* Class of datatype */
     int         (*init_rtn)(void *, size_t, const void *);
     int         (*verify_rtn)(unsigned, const hsize_t *, const void *, const void *);
@@ -1447,12 +1447,12 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     size_t      val_size;               /* Size of element */
     void        *val_rd, *odd_val;
     const void  *init_val, *should_be, *even_val;
-    int		val_rd_i, init_val_i = 9999;
+    int        val_rd_i, init_val_i = 9999;
     comp_vl_datatype init_val_c = {87, "baz", "mumble", 129};
     comp_vl_datatype val_rd_c;
-    void	*buf = NULL;
-    unsigned	odd;                    /* Whether an odd or even coord. was read */
-    unsigned	i, j;                   /* Local index variables */
+    void    *buf = NULL;
+    unsigned    odd;                    /* Whether an odd or even coord. was read */
+    unsigned    i, j;                   /* Local index variables */
 
     /* Make copy of dataset creation property list */
     if((dcpl = H5Pcopy(_dcpl)) < 0) TEST_ERROR
@@ -1503,14 +1503,14 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     if((mspace = H5Screate_simple(5, one, NULL)) < 0) TEST_ERROR
     for(i = 0; i < 1000; i++) {
         /* Set offset for random element */
-	for(j = 0; j < 5; j++)
-	    hs_offset[j] = (hsize_t)HDrand() % start_size[j];
+    for(j = 0; j < 5; j++)
+        hs_offset[j] = (hsize_t)HDrand() % start_size[j];
 
         /* Select the random element */
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
 
         /* Read the random element */
-	if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
+    if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
 
         /* Verify the element read in */
         if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, fillval) < 0) TEST_ERROR
@@ -1526,10 +1526,10 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
 
     /* Initialize dataspace & hyperslab info */
     for(i = 0, nelmts = 1; i < 5; i++) {
-	hs_size[i] = (start_size[i] + 1) / 2;
-	hs_offset[i] = 0;
-	hs_stride[i] = 2;
-	nelmts *= hs_size[i];
+    hs_size[i] = (start_size[i] + 1) / 2;
+    hs_offset[i] = 0;
+    hs_stride[i] = 2;
+    nelmts *= hs_size[i];
     } /* end for */
 
     /* Check for overflow */
@@ -1556,19 +1556,19 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     if((mspace = H5Screate_simple(5, one, NULL)) < 0) TEST_ERROR
     for(i = 0; i < 1000; i++) {
         /* Set offset for random element */
-	for(j = 0, odd = 0; j < 5; j++) {
-	    hs_offset[j] = (hsize_t)HDrand() % start_size[j];
-	    odd += (unsigned)(hs_offset[j] % 2);
-	} /* end for */
+    for(j = 0, odd = 0; j < 5; j++) {
+        hs_offset[j] = (hsize_t)HDrand() % start_size[j];
+        odd += (unsigned)(hs_offset[j] % 2);
+    } /* end for */
 
         /* Select the random element */
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
 
         /* Read the random element */
-	if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
+    if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
 
         /* Verify the element read in */
-	should_be = odd ? odd_val : even_val;
+    should_be = odd ? odd_val : even_val;
         if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, should_be) < 0) TEST_ERROR
 
         /* Release any VL components */
@@ -1594,22 +1594,22 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     if((mspace = H5Screate_simple(5, one, NULL)) < 0) TEST_ERROR
     for(i = 0; i < 1000; i++) {
         /* Set offset for random element */
-	for(j = 0, odd = 0; j < 5; j++) {
-	    hs_offset[j] = (hsize_t)HDrand() % extend_size[j];
-	    if(hs_offset[j] >= start_size[j])
-		odd = 1;
-	    else
-  		odd += (unsigned)(hs_offset[j] % 2);
-	} /* end for */
+    for(j = 0, odd = 0; j < 5; j++) {
+        hs_offset[j] = (hsize_t)HDrand() % extend_size[j];
+        if(hs_offset[j] >= start_size[j])
+        odd = 1;
+        else
+        odd += (unsigned)(hs_offset[j] % 2);
+    } /* end for */
 
         /* Select the random element */
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
 
         /* Read the random element */
-	if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
+    if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
 
         /* Verify the element read in */
-	should_be = odd ? odd_val : even_val;
+    should_be = odd ? odd_val : even_val;
         if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, should_be) < 0) TEST_ERROR
 
         /* Release any VL components */
@@ -1633,22 +1633,22 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     if((mspace = H5Screate_simple(5, one, NULL)) < 0) TEST_ERROR
     for(i = 0; i < 1000; i++) {
         /* Set offset for random element */
-	for(j = 0, odd = 0; j < 5; j++) {
-	    hs_offset[j] = (hsize_t)HDrand() % max_size[j];
-	    if(hs_offset[j] >= start_size[j])
-		odd = 1;
-	    else
-  		odd += (unsigned)(hs_offset[j] % 2);
-	} /* end for */
+    for(j = 0, odd = 0; j < 5; j++) {
+        hs_offset[j] = (hsize_t)HDrand() % max_size[j];
+        if(hs_offset[j] >= start_size[j])
+        odd = 1;
+        else
+        odd += (unsigned)(hs_offset[j] % 2);
+    } /* end for */
 
         /* Select the random element */
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
 
         /* Read the random element */
-	if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
+    if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
 
         /* Verify the element read in */
-	should_be = odd ? odd_val : even_val;
+    should_be = odd ? odd_val : even_val;
         if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, should_be) < 0) TEST_ERROR
 
         /* Release any VL components */
@@ -1674,22 +1674,22 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     if((mspace = H5Screate_simple(5, one, NULL)) < 0) TEST_ERROR
     for(i = 0; i < 1000; i++) {
         /* Set offset for random element */
-	for(j = 0, odd = 0; j < 5; j++) {
-	    hs_offset[j] = (hsize_t)HDrand() % extend_size[j];
-	    if(hs_offset[j] >= start_size[j])
-		odd = 1;
-	    else
-  		odd += (unsigned)(hs_offset[j] % 2);
-	} /* end for */
+    for(j = 0, odd = 0; j < 5; j++) {
+        hs_offset[j] = (hsize_t)HDrand() % extend_size[j];
+        if(hs_offset[j] >= start_size[j])
+        odd = 1;
+        else
+        odd += (unsigned)(hs_offset[j] % 2);
+    } /* end for */
 
         /* Select the random element */
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
 
         /* Read the random element */
-	if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
+    if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
 
         /* Verify the element read in */
-	should_be = odd ? odd_val : even_val;
+    should_be = odd ? odd_val : even_val;
         if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, should_be) < 0) TEST_ERROR
 
         /* Release any VL components */
@@ -1767,22 +1767,22 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     /* Read some data and make sure it's the right value */
     for(i = 0; i < 1000; i++) {
         /* Set offset for random element */
-	for(j = 0, odd = 0; j < 5; j++) {
-	    hs_offset[j] = (hsize_t)HDrand() % extend_size[j];
-	    if(hs_offset[j] >= start_size[j])
-		odd = 1;
-	    else
-  		odd += (unsigned)(hs_offset[j] % 2);
-	} /* end for */
+    for(j = 0, odd = 0; j < 5; j++) {
+        hs_offset[j] = (hsize_t)HDrand() % extend_size[j];
+        if(hs_offset[j] >= start_size[j])
+        odd = 1;
+        else
+        odd += (unsigned)(hs_offset[j] % 2);
+    } /* end for */
 
         /* Select the random element */
-	if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
+    if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, one, NULL) < 0) TEST_ERROR
 
         /* Read the random element */
-	if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
+    if(H5Dread(dset, dtype, mspace, fspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR
 
         /* Verify the element read in */
-	should_be = odd ? odd_val : even_val;
+    should_be = odd ? odd_val : even_val;
         if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, should_be) < 0) TEST_ERROR
 
         /* Release any VL components */
@@ -1811,26 +1811,26 @@ error:
     if(buf)
         HDfree(buf);
     H5E_BEGIN_TRY {
-	H5Pclose(dcpl);
-	H5Dclose(dset);
-	H5Sclose(fspace);
-	H5Sclose(mspace);
+    H5Pclose(dcpl);
+    H5Dclose(dset);
+    H5Sclose(fspace);
+    H5Sclose(mspace);
     } H5E_END_TRY;
 
     return -1;
 } /* end test_extend_cases() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_extend
+ * Function:    test_extend
  *
- * Purpose:	Test that filling works okay when a dataset is extended.
+ * Purpose:    Test that filling works okay when a dataset is extended.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, October  5, 1998
  *
  * Modifications:
@@ -1840,30 +1840,30 @@ error:
 static int
 test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
 {
-    hid_t	file = -1;              /* File ID */
-    hid_t	dcpl = -1;              /* Dataset creation property list ID */
-    hid_t	cmpd_vl_tid = -1;       /* Compound+vl datatype ID */
-    hsize_t	start_size[5] = {8, 8, 8, 4, 2};
-    hsize_t	max_size[5] = {32, 32, 32, 16, 8};
-    hsize_t	ch_size[5] = {1, 8, 8, 4, 2};
+    hid_t    file = -1;              /* File ID */
+    hid_t    dcpl = -1;              /* Dataset creation property list ID */
+    hid_t    cmpd_vl_tid = -1;       /* Compound+vl datatype ID */
+    hsize_t    start_size[5] = {8, 8, 8, 4, 2};
+    hsize_t    max_size[5] = {32, 32, 32, 16, 8};
+    hsize_t    ch_size[5] = {1, 8, 8, 4, 2};
 #ifdef NO_FILLING
-    int		fillval_i = 0;
+    int        fillval_i = 0;
 #else
-    int		fillval_i = 0x4c70f1cd;
+    int        fillval_i = 0x4c70f1cd;
 #endif
     comp_vl_datatype fillval_c = {32, "foo", "bar", 64};         /* Fill value for compound+vl datatype tests */
-    char	filename[1024];
+    char    filename[1024];
 
     /* Print testing message */
     if(H5D_CHUNKED == layout)
-	TESTING("chunked dataset extend")
+    TESTING("chunked dataset extend")
     else
-	TESTING("contiguous dataset extend")
+    TESTING("contiguous dataset extend")
 
     /* Create dataset creation property list */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
     if(H5D_CHUNKED == layout)
-	if(H5Pset_chunk(dcpl, 5, ch_size) < 0) TEST_ERROR
+    if(H5Pset_chunk(dcpl, 5, ch_size) < 0) TEST_ERROR
 
 #if 1
     /*
@@ -1877,13 +1877,13 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
      * below.
      */
     if(H5D_CONTIGUOUS==layout) {
-	max_size[0] = (max_size[0] * max_size[1] * max_size[2] *
-		       max_size[3] * max_size[4]) /
-		      (start_size[1] * start_size[2] * start_size[3] * start_size[4]);
-	max_size[1] = start_size[1];
-	max_size[2] = start_size[2];
-	max_size[3] = start_size[3];
-	max_size[4] = start_size[4];
+    max_size[0] = (max_size[0] * max_size[1] * max_size[2] *
+            max_size[3] * max_size[4]) /
+            (start_size[1] * start_size[2] * start_size[3] * start_size[4]);
+    max_size[1] = start_size[1];
+    max_size[2] = start_size[2];
+    max_size[3] = start_size[3];
+    max_size[4] = start_size[4];
     }
 #endif
 
@@ -1896,13 +1896,13 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
      */
     if(H5D_CONTIGUOUS==layout) {
         int fd;
-        hsize_t	nelmts;
+        hsize_t    nelmts;
 
-	nelmts = max_size[0]*max_size[1]*max_size[2]*max_size[3]*max_size[4];
-	if((fd = HDopen(FILE_NAME_RAW, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0 ||
-	    HDclose(fd) < 0) goto error;
-	if(H5Pset_external(dcpl, FILE_NAME_RAW, (off_t)0, (hsize_t)nelmts*sizeof(int)) < 0)
-	    goto error;
+    nelmts = max_size[0]*max_size[1]*max_size[2]*max_size[3]*max_size[4];
+    if((fd = HDopen(FILE_NAME_RAW, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0 ||
+        HDclose(fd) < 0) goto error;
+    if(H5Pset_external(dcpl, FILE_NAME_RAW, (off_t)0, (hsize_t)nelmts*sizeof(int)) < 0)
+        goto error;
     }
 #endif
 
@@ -1914,9 +1914,9 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
      * errors described above or `unable to select fill value region'.
      */
     if(H5D_CONTIGUOUS==layout) {
-	SKIPPED();
-	puts("    Not implemented yet -- needs H5S_SELECT_DIFF operator");
-	goto skip;
+    SKIPPED();
+    puts("    Not implemented yet -- needs H5S_SELECT_DIFF operator");
+    goto skip;
     }
 #endif
 
@@ -1947,20 +1947,20 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
 error:
     H5E_BEGIN_TRY {
         H5Tclose(cmpd_vl_tid);
-	H5Pclose(dcpl);
-	H5Fclose(file);
+    H5Pclose(dcpl);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 1;
 
 skip:
     H5E_BEGIN_TRY {
-	H5Pclose(dcpl);
-	H5Fclose(file);
+    H5Pclose(dcpl);
+    H5Fclose(file);
     } H5E_END_TRY;
     return 0;
 } /* end test_extend() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_compatible
  *
@@ -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;
@@ -2096,20 +2096,20 @@ error:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_partalloc_cases
+ * Function:    test_partalloc_cases
  *
- * Purpose:	Tests fill values read and write for datasets.
+ * Purpose:    Tests fill values read and write for datasets.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Joel Plutchak
+ * Programmer:    Joel Plutchak
  *              April 15, 2013
  *
  * Modifications:
- * 		This function is called by test_rdwr to write and read
- *		dataset for different cases of chunked datasets with 
+ *         This function is called by test_rdwr to write and read
+ *        dataset for different cases of chunked datasets with
  *              unallocated chunks.
  *
  *-------------------------------------------------------------------------
@@ -2118,12 +2118,12 @@ error:
 static int
 test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t fill_time)
 {
-    hid_t	fspace=-1, dset1=-1, rspace = -1;
-    herr_t	ret;
-    hsize_t	ds_size[2] = {4, 4};
-    hsize_t	max_size[2] = {H5S_UNLIMITED,4};
+    hid_t    fspace=-1, dset1=-1, rspace = -1;
+    herr_t    ret;
+    hsize_t    ds_size[2] = {4, 4};
+    hsize_t    max_size[2] = {H5S_UNLIMITED,4};
     hsize_t     chunk_size[2] = {1, 4};
-    int		fillval=(-1);
+    int        fillval=(-1);
     int     w_values[] = {42};            /* New value to be written */
     int     f_values[4] = {88,88,88,88};  /* pre-seed read buffer with known values */
     int     r_values[4] = {88,88,88,88};  /* pre-seed read buffer with known values */
@@ -2141,17 +2141,17 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
     /*
      * Select a point in the file dataspace.
      */
-    coord[0][0]=0; coord[0][1]=0; 
+    coord[0][0]=0; coord[0][1]=0;
     if (H5Sselect_elements( fspace, H5S_SELECT_SET, (size_t)1, (const hsize_t *)coord))
         goto error;
-    
+
     /*
      * Write single data point to the dataset.
      */
     if ((ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, fspace, H5P_DEFAULT, w_values))< 0) {
         goto error;
     }
-    
+
     /* Read a line/chunk and make sure values are right */
     rspace = H5Screate_simple(2, chunk_size, NULL);
 
@@ -2163,7 +2163,7 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
     if ((ret = H5Sselect_hyperslab(fspace, H5S_SELECT_SET, start, NULL, count, NULL)) < 0)
         goto error;
     if ((ret = H5Sselect_all(rspace)) < 0)
-	goto error;
+    goto error;
     if(H5Dread(dset1, H5T_NATIVE_INT, rspace, fspace, H5P_DEFAULT, &r_values) < 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,
@@ -2218,15 +2218,15 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
 
  error:
     H5E_BEGIN_TRY {
-	H5Dclose(dset1);
-	H5Sclose(fspace);
-	H5Sclose(rspace);
+    H5Dclose(dset1);
+    H5Sclose(fspace);
+    H5Sclose(rspace);
     } H5E_END_TRY;
 
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_partalloc
  *
@@ -2246,9 +2246,9 @@ static int
 test_partalloc(hid_t fapl, const char *base_name)
 {
     char        filename[1024];
-    hid_t 	file=-1, dcpl=-1;
+    hid_t     file=-1, dcpl=-1;
     hsize_t     ch_size[2] = {1, 4};
-    int		nerrors=0;
+    int        nerrors=0;
 
     TESTING("chunked dataset partially allocated I/O");
 
@@ -2262,86 +2262,86 @@ 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 );
 
     if(nerrors)
-	goto error;
+    goto error;
     if(H5Pclose(dcpl) < 0) goto error;
     if(H5Fclose(file) < 0) goto error;
     PASSED();
@@ -2355,17 +2355,17 @@ test_partalloc(hid_t fapl, const char *base_name)
     return nerrors;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Tests fill values
+ * Purpose:    Tests fill values
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, October  1, 1998
  *
  *-------------------------------------------------------------------------
@@ -2373,9 +2373,9 @@ test_partalloc(hid_t fapl, const char *base_name)
 int
 main(int argc, char *argv[])
 {
-    int	nerrors=0, argno, test_contig=1, test_chunk=1, test_compact=1;
-    hid_t	fapl = (-1), fapl2 = (-1);    /* File access property lists */
-    unsigned 	new_format;     	/* Whether to use the new format or not */
+    int    nerrors=0, argno, test_contig=1, test_chunk=1, test_compact=1;
+    hid_t    fapl = (-1), fapl2 = (-1);    /* File access property lists */
+    unsigned     new_format;         /* Whether to use the new format or not */
 
     if(argc >= 2) {
         test_contig = test_chunk = test_compact = 0;
diff --git a/test/filter_fail.c b/test/filter_fail.c
index 76b3106..2acce01 100644
--- a/test/filter_fail.c
+++ b/test/filter_fail.c
@@ -270,15 +270,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
         }
     }
@@ -310,15 +310,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
         }
     }
@@ -402,7 +402,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/h5test.c b/test/h5test.c
index ac9b8f7..7ef7cd1 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -25,7 +25,7 @@
 #include "H5srcdir.h"
 
 /* Necessary for h5_verify_cached_stabs() */
-#define H5G_FRIEND		/*suppress error about including H5Gpkg	  */
+#define H5G_FRIEND        /*suppress error about including H5Gpkg      */
 #define H5G_TESTING
 #include "H5Gpkg.h"
 
@@ -42,7 +42,7 @@
  *      use for HDF5 file access.  The first word in the
  *      value is the name of the driver and subsequent data
  *      is interpreted according to the driver.  See
- *      h5_fileaccess() for details.
+ *      h5_get_vfd_fapl() for details.
  *
  * HDF5_PREFIX:    A string to add to the beginning of all serial test
  *      file names.  This can be used to run tests in a
@@ -114,7 +114,6 @@ static herr_t h5_errors(hid_t estack, void *client_data);
 static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix, 
                               char *fullname, size_t size, hbool_t nest_printf);
 
-
 /*-------------------------------------------------------------------------
  * Function:  h5_errors
  *
@@ -139,7 +138,7 @@ h5_errors(hid_t estack, void H5_ATTR_UNUSED *client_data)
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_clean_files
  *
@@ -159,47 +158,8 @@ h5_clean_files(const char *base_name[], hid_t fapl)
     int i;
 
     for(i = 0; base_name[i]; i++) {
-        char filename[1024];
-        char temp[2048];
-        hid_t driver;
-
-        if(NULL == h5_fixname(base_name[i], fapl, filename, sizeof(filename)))
-            continue;
-
-        driver = H5Pget_driver(fapl);
-
-        if(driver == H5FD_FAMILY) {
-            int j;
-
-            for(j = 0; /*void*/; j++) {
-                HDsnprintf(temp, sizeof temp, filename, j);
-
-                if(HDaccess(temp, F_OK) < 0)
-                    break;
-
-                HDremove(temp);
-            } /* end for */
-        } else if(driver == H5FD_CORE) {
-            hbool_t backing;        /* Whether the core file has backing store */
-
-            H5Pget_fapl_core(fapl, NULL, &backing);
-
-            /* If the file was stored to disk with bacing store, remove it */
-            if(backing)
-                HDremove(filename);
-        } else if (driver == H5FD_MULTI) {
-            H5FD_mem_t mt;
-
-            HDassert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
-
-            for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
-                HDsnprintf(temp, sizeof temp, "%s-%c.h5", filename, multi_letters[mt]);
-                HDremove(temp); /*don't care if it fails*/
-            } /* end for */
-        } else {
-            HDremove(filename);
-        }
-    } /* end for */
+        h5_delete_test_file(base_name[i], fapl);
+    }
 
     /* Close the FAPL used to access the file */
     H5Pclose(fapl);
@@ -207,7 +167,7 @@ h5_clean_files(const char *base_name[], hid_t fapl)
     return;
 } /* end h5_clean_files() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_delete_test_file
  *
@@ -284,7 +244,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
  *
@@ -317,7 +277,7 @@ h5_delete_all_test_files(const char *base_name[], hid_t fapl)
     return;
 } /* end h5_delete_all_test_files() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_cleanup
  *
@@ -350,7 +310,7 @@ h5_cleanup(const char *base_name[], hid_t fapl)
     return retval;
 } /* end h5_cleanup() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_test_shutdown
  *
@@ -379,7 +339,7 @@ h5_test_shutdown(void)
     return;
 } /* end h5_test_shutdown() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_restore_err
  *
@@ -401,7 +361,7 @@ h5_restore_err(void)
     err_func = NULL;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_reset
  *
@@ -443,7 +403,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);
@@ -456,7 +416,7 @@ h5_reset(void)
 #endif /* OLD_WAY */
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_test_init
  *
@@ -489,7 +449,7 @@ h5_test_init(void)
     return;
 } /* end h5_test_init() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname
  *
@@ -518,7 +478,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
     return (h5_fixname_real(base_name, fapl, ".h5", fullname, size, FALSE));
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname_no_suffix
  *
@@ -538,7 +498,7 @@ h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t s
     return (h5_fixname_real(base_name, fapl, NULL, fullname, size, FALSE));
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname_printf
  *
@@ -564,7 +524,7 @@ 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, TRUE));
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_fixname_real
  *
@@ -592,6 +552,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
                 char *fullname, size_t size, hbool_t nest_printf)
 {
     const char     *prefix = NULL;
+    const char     *env = NULL;    /* HDF5_DRIVER environment variable     */
     char           *ptr, last = '\0';
     const char     *suffix = _suffix;
     size_t          i, j;
@@ -609,10 +570,30 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
             return NULL;
 
         if(suffix) {
-            if(H5FD_FAMILY == driver)
+            if(H5FD_FAMILY == driver) {
                 suffix = nest_printf ? "%%05d.h5" : "%05d.h5";
-            else if (H5FD_MULTI == driver)
-                suffix = NULL;
+            }
+            else if (H5FD_MULTI == driver) {
+
+                /* Get the environment variable, if it exists, in case
+                 * we are using the split driver since both of those
+                 * use the multi VFD under the hood.
+                 */
+                env = HDgetenv("HDF5_DRIVER");
+#ifdef HDF5_DRIVER
+                /* Use the environment variable, then the compile-time constant */
+                if(!env)
+                    env = HDF5_DRIVER;
+#endif
+                if(env && !HDstrcmp(env, "split")) {
+                    /* split VFD */
+                    suffix = NULL;
+                }
+                else {
+                    /* multi VFD */
+                    suffix = NULL;
+                }
+            }
         }
     }
 
@@ -659,7 +640,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"
@@ -775,7 +756,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix,
     return fullname;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_rmprefix
  *
@@ -806,13 +787,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
@@ -825,135 +806,67 @@ h5_rmprefix(const char *filename)
 hid_t
 h5_fileaccess(void)
 {
-    const char  *val = NULL;
-    const char  *name;
-    char        s[1024];
-    hid_t       fapl = H5I_INVALID_HID;
+    hid_t       fapl_id = H5I_INVALID_HID;
 
-    /* First use the environment variable, then the constant */
-    val = HDgetenv("HDF5_DRIVER");
-#ifdef HDF5_DRIVER
-    if(!val)
-        val = HDF5_DRIVER;
-#endif
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        goto error;
 
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        return -1;
-    if(!val || !*val)
-        return fapl; /* use default */
-
-    HDstrncpy(s, val, sizeof s);
-    s[sizeof(s)-1] = '\0';
-    if(NULL == (name = HDstrtok(s, " \t\n\r")))
-        return fapl;
-
-    if(!HDstrcmp(name, "sec2")) {
-        /* Unix read() and write() system calls */
-        if (H5Pset_fapl_sec2(fapl) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "stdio")) {
-        /* Standard C fread() and fwrite() system calls */
-        if (H5Pset_fapl_stdio(fapl) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "core")) {
-        /* In-memory driver settings (backing store on, 1 MB increment) */
-        if(H5Pset_fapl_core(fapl, (size_t)1, TRUE) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "core_paged")) {
-        /* In-memory driver with write tracking and paging on */
-        if(H5Pset_fapl_core(fapl, (size_t)1, TRUE) < 0)
-            return -1;
-        if(H5Pset_core_write_tracking(fapl, TRUE, (size_t)4096) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "split")) {
-        /* Split meta data and raw data each using default driver */
-        if(H5Pset_fapl_split(fapl,
-            "-m.h5", H5P_DEFAULT,
-            "-r.h5", H5P_DEFAULT) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "multi")) {
-        /* Multi-file driver, general case of the split driver */
-        H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
-        hid_t memb_fapl[H5FD_MEM_NTYPES];
-        const char *memb_name[H5FD_MEM_NTYPES];
-        char *sv[H5FD_MEM_NTYPES];
-        haddr_t memb_addr[H5FD_MEM_NTYPES];
-        H5FD_mem_t  mt;
+    /* Attempt to set up a file driver first */
+    if(h5_get_vfd_fapl(fapl_id) < 0)
+        goto error;
 
-        HDmemset(memb_map, 0, sizeof memb_map);
-        HDmemset(memb_fapl, 0, sizeof memb_fapl);
-        HDmemset(memb_name, 0, sizeof memb_name);
-        HDmemset(memb_addr, 0, sizeof memb_addr);
+    return fapl_id;
 
-        HDassert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
-        for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, mt)) {
-            memb_fapl[mt] = H5P_DEFAULT;
-            if(NULL == (sv[mt] = (char *)HDmalloc(H5TEST_MULTI_FILENAME_LEN)))
-                return -1;
-            HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
-            memb_name[mt] = sv[mt];
-            memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
-        } /* end for */
+error:
+    if(fapl_id != H5I_INVALID_HID)
+        H5Pclose(fapl_id);
+    return H5I_INVALID_HID;
+} /* end h5_fileaccess() */
 
-        if(H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0)
-            return -1;
 
-        for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, mt))
-            HDfree(sv[mt]);
-    }
-    else if(!HDstrcmp(name, "family")) {
-        hsize_t fam_size = 100*1024*1024; /*100 MB*/
+/*-------------------------------------------------------------------------
+ * Function:    h5_fileaccess_flags
+ *
+ * Purpose:     Returns a file access template which is the default template
+ *              but with a file driver, VOL connector, or libver bound set
+ *              according to a constant or environment variable
+ *
+ * Return:      Success:    A file access property list
+ *              Failure:    H5I_INVALID_HID
+ *
+ * Programmer:  Robb Matzke
+ *              Thursday, November 19, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+hid_t
+h5_fileaccess_flags(unsigned flags)
+{
+    hid_t       fapl_id = H5I_INVALID_HID;
 
-        /* Family of files, each 1MB and using the default driver */
-        if((val = HDstrtok(NULL, " \t\n\r")))
-            fam_size = (hsize_t)(HDstrtod(val, NULL) * 1024*1024);
-        if(H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT)<0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "log")) {
-        unsigned log_flags = H5FD_LOG_LOC_IO | H5FD_LOG_ALLOC;
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        goto error;
 
-        /* Log file access */
-        if((val = HDstrtok(NULL, " \t\n\r")))
-            log_flags = (unsigned)HDstrtol(val, NULL, 0);
-        if(H5Pset_fapl_log(fapl, NULL, log_flags, (size_t)0) < 0)
-            return -1;
-    }
-    else if(!HDstrcmp(name, "direct")) {
-#ifdef H5_HAVE_DIRECT
-        /* Linux direct read() and write() system calls.  Set memory boundary, file block size,
-         * and copy buffer size to the default values. */
-        if(H5Pset_fapl_direct(fapl, 1024, 4096, 8 * 4096) < 0)
-            return -1;
-#endif
-    }
-    else if(!HDstrcmp(name, "latest")) {
-        /* use the latest format */
-        if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-            return -1;
-    }
-    else {
-        /* Unknown driver */
-        return -1;
-    }
+    /* Attempt to set up a file driver first */
+    if((flags & H5_FILEACCESS_VFD) && h5_get_vfd_fapl(fapl_id) < 0)
+        goto error;
+
+    return fapl_id;
+
+error:
+    if(fapl_id != H5I_INVALID_HID)
+        H5Pclose(fapl_id);
+    return H5I_INVALID_HID;
+} /* end h5_fileaccess_flags() */
 
-    return fapl;
-}
 
-
 /*-------------------------------------------------------------------------
  * Function:    h5_get_vfd_fapl
  *
- * Purpose:     Returns a file access property list which is the default
- *              fapl but with a file driver set according to the constant or
- *              environment variable HDF5_DRIVER.
+ * Purpose:     Sets the file driver for a FAPL according to the value specified
+ *              in the constant or environment variable "HDF5_DRIVER".
  *
- * Return:      Success:    A file access property list ID
+ * Return:      Success:    0
  *              Failure:    -1
  *
  * Programmer:  Dana Robinson
@@ -961,60 +874,59 @@ h5_fileaccess(void)
  *
  *-------------------------------------------------------------------------
  */
-hid_t
-h5_get_vfd_fapl(void)
+herr_t
+h5_get_vfd_fapl(hid_t fapl)
 {
     const char  *env = NULL;    /* HDF5_DRIVER environment variable     */
     const char  *tok = NULL;    /* strtok pointer                       */
+    char        *lasts = NULL;  /* Context pointer for strtok_r() call */
     char        buf[1024];      /* buffer for tokenizing HDF5_DRIVER    */
-    hid_t       fapl = -1;      /* fapl to be returned                  */
 
     /* Get the environment variable, if it exists */
     env = HDgetenv("HDF5_DRIVER");
-
-    /* Create a default fapl */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        return -1;
+#ifdef HDF5_DRIVER
+    /* Use the environment variable, then the compile-time constant */
+    if(!env)
+        env = HDF5_DRIVER;
+#endif
 
     /* If the environment variable was not set, just return
-     * the default fapl.
+     * without modifying the FAPL.
      */
     if(!env || !*env)
-        return fapl;
+        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));
-    HDmemset(buf, 0, sizeof(buf));
-    if(NULL == (tok = HDstrtok(buf, " \t\n\r")))
-        return fapl;
+    buf[sizeof(buf) - 1] = '\0';
+    if(NULL == (tok = HDstrtok_r(buf, " \t\n\r", &lasts)))
+        goto done;
 
     if(!HDstrcmp(tok, "sec2")) {
         /* POSIX (section 2) read() and write() system calls */
         if(H5Pset_fapl_sec2(fapl) < 0)
-            return -1;
+            goto error;
     } else if(!HDstrcmp(tok, "stdio")) {
         /* Standard C fread() and fwrite() system calls */
         if(H5Pset_fapl_stdio(fapl) < 0)
-            return -1;
+            goto error;
     } else if(!HDstrcmp(tok, "core")) {
         /* In-memory driver settings (backing store on, 1 MB increment) */
-        if(H5Pset_fapl_core(fapl, (size_t)1, TRUE) < 0)
-            return -1;
+        if(H5Pset_fapl_core(fapl, (size_t)H5_MB, TRUE) < 0)
+            goto error;
     } else if(!HDstrcmp(tok, "core_paged")) {
         /* In-memory driver with write tracking and paging on */
-        if(H5Pset_fapl_core(fapl, (size_t)1, TRUE) < 0)
-            return -1;
+        if(H5Pset_fapl_core(fapl, (size_t)H5_MB, TRUE) < 0)
+            goto error;
         if(H5Pset_core_write_tracking(fapl, TRUE, (size_t)4096) < 0)
-            return -1;
+            goto error;
      } else if(!HDstrcmp(tok, "split")) {
         /* Split meta data and raw data each using default driver */
-        if(H5Pset_fapl_split(fapl,
-            "-m.h5", H5P_DEFAULT,
-            "-r.h5", H5P_DEFAULT) < 0)
-            return -1;
+        if(H5Pset_fapl_split(fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
+            goto error;
     } else if(!HDstrcmp(tok, "multi")) {
         /* Multi-file driver, general case of the split driver */
         H5FD_mem_t  memb_map[H5FD_MEM_NTYPES];
@@ -1040,43 +952,47 @@ h5_get_vfd_fapl(void)
         } /* end for */
 
         if(H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0)
-            return -1;
+            goto error;
 
         for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, mt))
             HDfree(sv[mt]);
     } else if(!HDstrcmp(tok, "family")) {
         /* Family of files, each 1MB and using the default driver */
-        hsize_t fam_size = 100*1024*1024; /*100 MB*/
+        hsize_t fam_size = 100 * 1024 * 1024;   /* 100 MB */
 
         /* Was a family size specified in the environment variable? */
-        if((tok = HDstrtok(NULL, " \t\n\r")))
-            fam_size = (hsize_t)(HDstrtod(tok, NULL) * 1024*1024);
+        if((tok = HDstrtok_r(NULL, " \t\n\r", &lasts)))
+            fam_size = (hsize_t)(HDstrtod(tok, NULL) * 1024 * 1024);
         if(H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT) < 0)
-            return -1;
+            goto error;
     } else if(!HDstrcmp(tok, "log")) {
         /* Log file access */
         unsigned log_flags = H5FD_LOG_LOC_IO | H5FD_LOG_ALLOC;
 
         /* Were special log file flags specified in the environment variable? */
-        if((tok = HDstrtok(NULL, " \t\n\r")))
+        if((tok = HDstrtok_r(NULL, " \t\n\r", &lasts)))
             log_flags = (unsigned)HDstrtol(tok, NULL, 0);
 
         if(H5Pset_fapl_log(fapl, NULL, log_flags, (size_t)0) < 0)
-            return -1;
+            goto error;
 #ifdef H5_HAVE_DIRECT
     } else if(!HDstrcmp(tok, "direct")) {
         /* Linux direct read() and write() system calls.  Set memory boundary,
          * file block size, and copy buffer size to the default values.
          */
-        if(H5Pset_fapl_direct(fapl, 1024, 4096, 8*4096)<0)
-            return -1;
+        if(H5Pset_fapl_direct(fapl, 1024, 4096, 8 * 4096) < 0)
+            goto error;
 #endif
     } else {
         /* Unknown driver */
-        return -1;
+        goto error;
     } /* end if */
 
-    return fapl;
+done:
+    return 0;
+
+error:
+    return -1;
 } /* end h5_get_vfd_fapl() */
 
 
@@ -1100,7 +1016,7 @@ h5_no_hwconv(void)
     H5Tunregister(H5T_PERS_HARD, NULL, (hid_t)-1, (hid_t)-1, NULL);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:  h5_show_hostname
  *
@@ -1134,15 +1050,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
 
@@ -1168,18 +1084,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
@@ -1278,7 +1194,7 @@ h5_set_info_object(void)
     return ret_value;
 }
 
-
+
 /*
  * Function:    h5_dump_info_object
  * Purpose:     Display content of an MPI Info object
@@ -1294,25 +1210,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
  *
@@ -1449,14 +1365,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
  *
@@ -1633,7 +1549,7 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name)
     while((nread = HDread(fd_old, buf, (size_t)READ_BUF_SIZE)) > 0)
         if(HDwrite(fd_new, buf, (size_t)nread) < 0)
             goto error;
- 
+
     /* Close files */
     if(HDclose(fd_old) < 0)
         goto error;
@@ -1655,7 +1571,7 @@ error:
     return -1;
 } /* end h5_make_local_copy() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_verify_cached_stabs_cb
  *
@@ -1678,7 +1594,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
  *
@@ -1741,16 +1657,16 @@ error:
 
 /*-------------------------------------------------------------------------
  * 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 
+ *              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 
+ *              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
@@ -1760,7 +1676,7 @@ error:
  *
  * Programmer:  Mike McGreevy
  *              August 18, 2010
- * 
+ *
  *-------------------------------------------------------------------------
  */
 void
@@ -1779,7 +1695,7 @@ h5_send_message(const char *send, const char *arg1, const char *arg2)
     else if(arg1 != NULL) {
         HDassert(arg2 == NULL);
         HDfprintf(signalfile, "%s\n", arg1);
-    } /* end if */ 
+    } /* end if */
     else {
         HDassert(arg1 == NULL);
         HDassert(arg2 == NULL);
@@ -1792,38 +1708,38 @@ h5_send_message(const char *send, const char *arg1, const char *arg2)
 
 /*-------------------------------------------------------------------------
  * 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 
+ *              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 
+ *              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), 
+ *              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) 
+h5_wait_message(const char *waitfor)
 {
     FILE *returnfile;
     time_t t0,t1;
 
-    /* Start timer. If this function runs for too long (i.e., 
+    /* Start timer. If this function runs for too long (i.e.,
         expected signal is never received), it will
         return failure */
     HDtime(&t0);
@@ -1911,10 +1827,10 @@ static const H5FD_class_t H5FD_dummy_g = {
     NULL,                       /* truncate     */
     NULL,                       /* lock         */
     NULL,                       /* unlock       */
-    H5FD_FLMAP_DICHOTOMY	/* fl_map       */
+    H5FD_FLMAP_DICHOTOMY    /* fl_map       */
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    h5_get_dummy_vfd_class()
  *
@@ -1961,7 +1877,7 @@ error:
  * Purpose:     Get the string that corresponds to the libvery version bound.
  *
  * Return:      The string
- * 
+ *
  *-------------------------------------------------------------------------
  */
 char *
diff --git a/test/h5test.h b/test/h5test.h
index 1b057a6..23991ad 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.
@@ -121,6 +121,9 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 #define ALARM_ON  TestAlarmOn()
 #define ALARM_OFF  HDalarm(0)
 
+/* Flags for h5_fileaccess_flags() */
+#define H5_FILEACCESS_VFD       0x01
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -132,6 +135,7 @@ H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, s
 H5TEST_DLL char *h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size);
 H5TEST_DLL char *h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size);
 H5TEST_DLL hid_t h5_fileaccess(void);
+H5TEST_DLL hid_t h5_fileaccess_flags(unsigned flags);
 H5TEST_DLL void h5_no_hwconv(void);
 H5TEST_DLL const char *h5_rmprefix(const char *filename);
 H5TEST_DLL void h5_reset(void);
@@ -144,12 +148,8 @@ 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 VFD-dependent functions that violate
- * the single responsibility principle. Unlike their predecessors,
- * these new functions do not have hidden side effects.
- */
-/* h5_fileaccess() replacement */
-H5TEST_DLL hid_t h5_get_vfd_fapl(void);
+/* Functions that will replace components of a FAPL */
+H5TEST_DLL herr_t h5_get_vfd_fapl(hid_t fapl_id);
 
 /* h5_clean_files() replacements */
 H5TEST_DLL void h5_delete_test_file(const char *base_name, hid_t fapl);
diff --git a/test/hyperslab.c b/test/hyperslab.c
index feb96bd..9e17a2f 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,28 +982,28 @@ 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]) {
                 H5_FAILED()
                 if(!HDisatty(1)) {
                     AT();
-                    printf("   %s\n   Half is:\n", s);
+                    HDprintf("   %s\n   Half is:\n", s);
                     print_array(half, nx, ny, (size_t)1);
-                    printf("\n     Twice is:\n");
+                    HDprintf("\n     Twice is:\n");
                     print_array(twice, 2 * nx, 2 * ny, (size_t)1);
                 } /* end if */
                 goto error;
@@ -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 1d57a2a..7489b7e 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,10 +294,10 @@ 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);
-    goto error;
+        HDfprintf(stderr,"    Cannot create %u-d object `%s'\n", ndims, name);
+        goto error;
     }
 
     /* Get dataset's dataspace */
@@ -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]);
+    HD fprintf(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,10 +512,10 @@ 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);
-    goto error;
+        HDprintf("    Cannot create %u-d object `%s'\n", ndims, name);
+        goto error;
     }
 
     /* Get dataset's dataspace */
@@ -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 d309fb0..4b40740 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -15,7 +15,7 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Tuesday, November 24, 1998
  *
- * Purpose:	Test local heaps used by symbol tables (groups).
+ * Purpose:    Test local heaps used by symbol tables (groups).
  */
 #include "h5test.h"
 #include "H5srcdir.h"
@@ -33,7 +33,7 @@ const char *FILENAME[] = {
 
 #define NOBJS   40
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -99,7 +99,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)
@@ -139,7 +139,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/mf.c b/test/mf.c
index 1bd8307..4f256bc 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -13,23 +13,23 @@
 
 /*
  *  Tests for file memory management consist of 3 parts:
- *	test_mf_eoa_*()	  tests for file meomory that interact with file allocation
- *	test_mf_fs_*() 	  tests for file memory that interact with the free-space manager
- *	test_mf_aggr_*()  tests for file memory that interact with the aggregators
- *	test_mf_align_*() tests for file memory with alignment setting
- *	test_filespace_*() tests for file space management
- * 	test_page_*() tests for file space paging
+ *    test_mf_eoa_*()      tests for file meomory that interact with file allocation
+ *    test_mf_fs_*()       tests for file memory that interact with the free-space manager
+ *    test_mf_aggr_*()  tests for file memory that interact with the aggregators
+ *    test_mf_align_*() tests for file memory with alignment setting
+ *    test_filespace_*() tests for file space management
+ *     test_page_*() tests for file space paging
  */
 
 #include "h5test.h"
 
-#define H5MF_FRIEND		/*suppress error about including H5MFpkg	  */
+#define H5MF_FRIEND        /*suppress error about including H5MFpkg      */
 #include "H5MFpkg.h"
 
-#define H5FS_FRIEND		/*suppress error about including H5FSpkg	  */
+#define H5FS_FRIEND        /*suppress error about including H5FSpkg      */
 #include "H5FSpkg.h"
 
-#define H5F_FRIEND		/*suppress error about including H5Fpkg	  */
+#define H5F_FRIEND        /*suppress error about including H5Fpkg      */
 #define H5F_TESTING
 #include "H5Fpkg.h"
 
@@ -137,7 +137,7 @@ static unsigned test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t
 static unsigned test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl);
 static unsigned test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl);
 static unsigned test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format);
-static unsigned test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format); 
+static unsigned test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format);
 static unsigned test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format);
 static unsigned test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format);
 static unsigned test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format);
@@ -211,15 +211,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");
@@ -320,8 +320,8 @@ test_mf_eoa(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support continuous address space");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support continuous address space");
     } /* end else */
 
     return(0);
@@ -329,7 +329,7 @@ test_mf_eoa(const char *env_h5_drvr, hid_t fapl)
 error:
     H5E_BEGIN_TRY {
         H5Pclose(fapl_new);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_eoa() */
@@ -339,32 +339,32 @@ error:
  * To verify that an allocated block from file allocation is shrunk.
  *
  * Set up:
- * 	Turn off using meta/small data aggregator
- * 	There is nothing in free-space manager
- *
- *	Test 1: Allocate a block of 30 from file allocation
- * 		H5MF_try_shrink() the block by 30 : succeed
- *	Test 2: Allocate a block of 30 from file allocation
- * 		H5MF_try_shrink() the block by 20 : fail
- *	Test 3: Allocate a block of 30 from file allocation
- * 		H5MF_try_shrink() the block by 40 : fail
- *	Test 4: Allocate a block of 30 from file allocation
- * 		H5MF_try_shrink() the block by 20 from the end: succeed
+ *     Turn off using meta/small data aggregator
+ *     There is nothing in free-space manager
+ *
+ *    Test 1: Allocate a block of 30 from file allocation
+ *         H5MF_try_shrink() the block by 30 : succeed
+ *    Test 2: Allocate a block of 30 from file allocation
+ *         H5MF_try_shrink() the block by 20 : fail
+ *    Test 3: Allocate a block of 30 from file allocation
+ *         H5MF_try_shrink() the block by 40 : fail
+ *    Test 4: Allocate a block of 30 from file allocation
+ *         H5MF_try_shrink() the block by 20 from the end: succeed
  *
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_eoa_shrink(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 = 0, new_file_size; /* file size */
-    H5FD_mem_t 		type;
-    haddr_t		addr = 0;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0;
+    H5FD_mem_t         type;
+    haddr_t        addr = 0;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_try_shrink() of file allocation: test 1");
@@ -462,8 +462,8 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("H5MF_try_shrink() of file allocation: test 2");
@@ -510,8 +510,8 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
 
@@ -554,8 +554,8 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("H5MF_try_shrink() of file allocation: test 4");
@@ -602,8 +602,8 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
@@ -611,7 +611,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl)
 error:
     H5E_BEGIN_TRY {
         H5Pclose(fapl_new);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_eoa_shrink() */
@@ -621,29 +621,29 @@ error:
  * To verify that an allocated block from file allocation is extended.
  *
  * Set up:
- * 	Turn off using meta/small data aggregator
- * 	There is nothing in free-space manager
+ *     Turn off using meta/small data aggregator
+ *     There is nothing in free-space manager
  *
  * Test 1: Allocate a block of 30
- *	H5MF_try_extend() the block of size 30 by 50: succeed
+ *    H5MF_try_extend() the block of size 30 by 50: succeed
  *
  * Test 2: Allocate a block of 30
- * 	H5MF_try_extend() the block of size 20 by 50: fail
+ *     H5MF_try_extend() the block of size 20 by 50: fail
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_eoa_extend(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 */
-    h5_stat_size_t      file_size, new_file_size;  	/* File size */
+    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		addr;
+    haddr_t        addr;
     htri_t      was_extended;
-    haddr_t 	ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
-    hsize_t 	ma_size=0, new_ma_size=0;
+    haddr_t     ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
+    hsize_t     ma_size=0, new_ma_size=0;
     hbool_t     contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_try_extend() of file allocation: test 1");
@@ -740,8 +740,8 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("H5MF_try_extend() of file allocation: test 2");
@@ -803,8 +803,8 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
@@ -812,7 +812,7 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl)
 error:
     H5E_BEGIN_TRY {
         H5Pclose(fapl_new);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_eoa_extend() */
@@ -822,7 +822,7 @@ error:
  * To verify that temporary blocks are allocated correctly
  *
  * Set up:
- * 	There is nothing in free-space manager
+ *     There is nothing in free-space manager
  *
  * Tests:
  *      Allocate a reasonable-sized temporary block
@@ -854,13 +854,13 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
 
     /* Can't run this test with multi-file VFDs */
     if(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family")) {
-        char		filename[FILENAME_LEN]; /* Filename to use */
-        H5F_t		*f = NULL;              /* Internal file object pointer */
+        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 */
         haddr_t         maxaddr;                /* File's max. address */
-        haddr_t		tmp_addr;               /* Temporary space file address */
-        haddr_t		norm_addr;              /* Normal space file address */
-        haddr_t		check_addr;             /* File address for checking for errors */
+        haddr_t        tmp_addr;               /* Temporary space file address */
+        haddr_t        norm_addr;              /* Normal space file address */
+        haddr_t        check_addr;             /* File address for checking for errors */
         unsigned char   buf = 0;                /* Buffer to read/write with */
         herr_t          status;                 /* Generic status value */
 
@@ -1001,15 +1001,15 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support continuous address space");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support continuous address space");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_tmp() */
@@ -1019,16 +1019,16 @@ error:
  * To verify that the free-space manager is created or opened
  *
  * Set up:
- * 	Turn off using meta/small data aggregator
+ *     Turn off using meta/small data aggregator
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_fs_start(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 */
     H5FS_stat_t         state;
 
@@ -1087,7 +1087,7 @@ test_mf_fs_start(hid_t fapl)
 
     /* Verify the file is the correct size */
     if(new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     if(H5Pclose(fapl_new) < 0)
         FAIL_STACK_ERROR
@@ -1099,7 +1099,7 @@ test_mf_fs_start(hid_t fapl)
 error:
     H5E_BEGIN_TRY {
         H5Pclose(fapl_new);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_fs_start() */
@@ -1110,36 +1110,36 @@ error:
  * To verify that a block is allocated/freed from/to the free-space manager
  *
  * Set up:
- * 	Turn off using meta/small data aggregator
+ *     Turn off using meta/small data aggregator
  *
  * Test 1:
- *	Add section A to free-space manager (addr=70, size=30)
- *	Allocate a block of size=30
- *	The returned space's address should be same as section A's address
- *	Deallocate the block which will be returned to the free-space manager
+ *    Add section A to free-space manager (addr=70, size=30)
+ *    Allocate a block of size=30
+ *    The returned space's address should be same as section A's address
+ *    Deallocate the block which will be returned to the free-space manager
  * Test 2:
- *	Add section A to free-space manager (addr=70, size=30)
- *	Allocate a block of size=20
- *	The returned space's address should be same as section A's address
- *	There should still be space of 10 left in the free-space manager
- *	Deallocate the block which will be returned to free-space manager
+ *    Add section A to free-space manager (addr=70, size=30)
+ *    Allocate a block of size=20
+ *    The returned space's address should be same as section A's address
+ *    There should still be space of 10 left in the free-space manager
+ *    Deallocate the block which will be returned to free-space manager
  * Test 3:
- *	Add section A to free-space manager (addr=70, size=30)
- *	Allocate a block of size=40
- *	The free-space manager is unable to fulfill the request
- *	The block is allocated from file allocation
- *	Deallocate the block which will be returned to free-space manager
- *	(the space is shrunk and freed since it is at end of file)
+ *    Add section A to free-space manager (addr=70, size=30)
+ *    Allocate a block of size=40
+ *    The free-space manager is unable to fulfill the request
+ *    The block is allocated from file allocation
+ *    Deallocate the block which will be returned to free-space manager
+ *    (the space is shrunk and freed since it is at end of file)
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_fs_alloc_free(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 */
-    h5_stat_size_t      file_size, new_file_size; 	/* file size */
+    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 */
     H5MF_free_section_t *sect_node = NULL;
     haddr_t     addr;
     haddr_t     tmp;
@@ -1205,7 +1205,7 @@ test_mf_fs_alloc_free(hid_t fapl)
 
     /* Verify that the allocated block is section A in free-space */
     if(addr != TBLOCK_ADDR70)
-	TEST_ERROR
+        TEST_ERROR
 
     state.tot_space -= TBLOCK_SIZE30;
     state.tot_sect_count -= 1;
@@ -1239,7 +1239,7 @@ test_mf_fs_alloc_free(hid_t fapl)
 
     /* Verify the file is the correct size */
     if (new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     PASSED()
 
@@ -1282,7 +1282,7 @@ test_mf_fs_alloc_free(hid_t fapl)
 
     /* Verify that the allocated block is section A in free-space manager */
     if(addr != TBLOCK_ADDR70)
-	TEST_ERROR
+        TEST_ERROR
 
     /* should still have 1 section of size 10 left in free-space manager */
     state.tot_space -= (TBLOCK_SIZE20);
@@ -1314,7 +1314,7 @@ test_mf_fs_alloc_free(hid_t fapl)
 
     /* Verify the file is the correct size */
     if (new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     PASSED()
 
@@ -1399,7 +1399,7 @@ test_mf_fs_alloc_free(hid_t fapl)
 
     /* Verify the file is the correct size */
     if(new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     if(H5Pclose(fapl_new) < 0)
         FAIL_STACK_ERROR
@@ -1411,7 +1411,7 @@ test_mf_fs_alloc_free(hid_t fapl)
 error:
     H5E_BEGIN_TRY {
         H5Pclose(fapl_new);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_fs_alloc_free() */
@@ -1422,47 +1422,47 @@ error:
  * To verify that a block allocated from the free-space manager can be extended
  *
  * Set up:
- * 	Turn off using meta/small data aggregator
+ *     Turn off using meta/small data aggregator
  *
  * Test 1:
- *	Add section A to free-space manager: addr=70, size=30
- *	Allocate a block of size 30 from free-space manager
- *	Add section B to free-space manager: addr=100, size=50
- *	Try to extend the allocated block by requested-size=50
- *	Succeed: section A adjoins section B (70+30=100 which is section B's address) and
- *		 requested-size (50) is equal to the size of section B
+ *    Add section A to free-space manager: addr=70, size=30
+ *    Allocate a block of size 30 from free-space manager
+ *    Add section B to free-space manager: addr=100, size=50
+ *    Try to extend the allocated block by requested-size=50
+ *    Succeed: section A adjoins section B (70+30=100 which is section B's address) and
+ *         requested-size (50) is equal to the size of section B
  * Test 2:
- *	Add section A to free-space manager: addr=70, size=30
- *	Allocate a block of size 30 from free-space manager
- *	Add section B to free-space manager: addr=100, size=50
- *	Try to extend the allocated block by requested-size=60
- *	Fail: section A adjoins section B (70+30=100 which is section B's address) but
- *	      requested-size (60) > size of section B (50)
+ *    Add section A to free-space manager: addr=70, size=30
+ *    Allocate a block of size 30 from free-space manager
+ *    Add section B to free-space manager: addr=100, size=50
+ *    Try to extend the allocated block by requested-size=60
+ *    Fail: section A adjoins section B (70+30=100 which is section B's address) but
+ *          requested-size (60) > size of section B (50)
  *
  * Test 3:
- *	Add section A to free-space manager: addr=70, size=30
- *	Allocate a block of size 30 from free-space manager
- *	Add section B to free-space manager: addr=100, size=50
- *	Try to extend the allocated block by requested-size=40
- *	Succeed: section A adjoins section B (70+30=100 which is section B's address) and
- *		 requested-size (40) < size of section B (50), therefore,
- *		 a section of 10 is left in the free-space manager
+ *    Add section A to free-space manager: addr=70, size=30
+ *    Allocate a block of size 30 from free-space manager
+ *    Add section B to free-space manager: addr=100, size=50
+ *    Try to extend the allocated block by requested-size=40
+ *    Succeed: section A adjoins section B (70+30=100 which is section B's address) and
+ *         requested-size (40) < size of section B (50), therefore,
+ *         a section of 10 is left in the free-space manager
  * Test 4:
- *	Add section A to free-space manager: addr=70, size=20
- *	Allocate a block of size 20 from free-space manager
- *	Add section B to free-space manager: addr=100, size=50
- * 	Try to extend the allocated block by 50 from the free-space_manager:
- *	Fail: section A does not adjoin section B (70+20 != address of section B) even though
- *	      the requested-size (50) equal to size of section B (50)
+ *    Add section A to free-space manager: addr=70, size=20
+ *    Allocate a block of size 20 from free-space manager
+ *    Add section B to free-space manager: addr=100, size=50
+ *     Try to extend the allocated block by 50 from the free-space_manager:
+ *    Fail: section A does not adjoin section B (70+20 != address of section B) even though
+ *          the requested-size (50) equal to size of section B (50)
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_fs_extend(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 */
     H5MF_free_section_t *sect_node1 = NULL, *sect_node2=NULL;
     haddr_t     addr;
@@ -1558,7 +1558,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* should succeed */
     if(was_extended <= 0)
-	TEST_ERROR
+        TEST_ERROR
 
     /* Section B is removed from free-space manager */
     state.tot_space -= TBLOCK_SIZE50;
@@ -1585,7 +1585,7 @@ test_mf_fs_extend(hid_t fapl)
 
     if(tmp != TBLOCK_ADDR70)
         TEST_ERROR
-    
+
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
@@ -1595,7 +1595,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* Verify the file is the correct size */
     if (new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     PASSED()
 
@@ -1666,7 +1666,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* Should not be able to extend the allocated block */
     if(was_extended)
-	TEST_ERROR
+        TEST_ERROR
 
     /* free-space info should remain the same */
     if(check_stats(f, f->shared->fs_man[H5FD_MEM_SUPER], &state))
@@ -1697,7 +1697,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* Verify the file is the correct size */
     if (new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     PASSED()
 
@@ -1768,7 +1768,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* Should succeed in extending the allocated block */
     if(was_extended <=0)
-	TEST_ERROR
+        TEST_ERROR
 
     /* Should have 1 section of size=10 left in free-space manager */
     state.tot_space -= (TBLOCK_SIZE40);
@@ -1787,7 +1787,7 @@ test_mf_fs_extend(hid_t fapl)
     /* Remove the merged sections A & B from free-space */
     if(H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(TBLOCK_SIZE30+TBLOCK_SIZE50), f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != TRUE)
         TEST_ERROR
- 
+
     if(tmp != addr) TEST_ERROR
 
     if(H5Fclose(file) < 0)
@@ -1799,7 +1799,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* Verify the file is the correct size */
     if (new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     PASSED()
 
@@ -1870,7 +1870,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* Should not succeed in extending the allocated block */
     if(was_extended)
-	TEST_ERROR
+        TEST_ERROR
 
     /* Free-space info should be the same */
     if(check_stats(f, f->shared->fs_man[H5FD_MEM_SUPER], &state))
@@ -1905,7 +1905,7 @@ test_mf_fs_extend(hid_t fapl)
 
     /* Verify the file is the correct size */
     if(new_file_size != file_size)
-	TEST_ERROR
+        TEST_ERROR
 
     if(H5Pclose(fapl_new) < 0)
         FAIL_STACK_ERROR
@@ -1917,7 +1917,7 @@ test_mf_fs_extend(hid_t fapl)
 error:
     H5E_BEGIN_TRY {
         H5Pclose(fapl_new);
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_fs_extend() */
@@ -1926,26 +1926,26 @@ error:
  *-------------------------------------------------------------------------
  * To verify that an aggregator is absorbed into a section.
  *
- *	Test 1: To aborb the aggregator onto the beginning of the section
- *		Allocate block A from meta_aggr
- *		Create a free-space section node with an address that adjoins
- *			the end of meta_aggr and a size to make the aggregator
- *			get absorbed into the section.
- *		The adding of the section to free-space will call H5MF_aggr_absorb(),
- *			which will absorb meta_aggr to the section:
- *			  section size + remaining size of aggregator is > aggr->alloc_size,
- *			  section is allowed to absorb an aggregator (allow_sect_absorb is true)
- *
- *	Test 2: To absorb the aggregator onto the end of the section
- *		Allocate block A from meta_aggr
- *		Allocate block B from sdata_aggr
- *		Create a free-space section node with an address that adjoins
- *			the beginning of meta_aggr and a size to make the
- *			aggregator get absorbed into the section.
- *		The adding of the section to free-space will call H5MF_aggr_absorb(),
- *			which will absorb meta_aggr to the section:
- *			  section size + remaining size of aggregator is > aggr->alloc_size,
- *			  section is allowed to absorb an aggregator (allow_sect_absorb is true)
+ *    Test 1: To aborb the aggregator onto the beginning of the section
+ *        Allocate block A from meta_aggr
+ *        Create a free-space section node with an address that adjoins
+ *            the end of meta_aggr and a size to make the aggregator
+ *            get absorbed into the section.
+ *        The adding of the section to free-space will call H5MF_aggr_absorb(),
+ *            which will absorb meta_aggr to the section:
+ *              section size + remaining size of aggregator is > aggr->alloc_size,
+ *              section is allowed to absorb an aggregator (allow_sect_absorb is true)
+ *
+ *    Test 2: To absorb the aggregator onto the end of the section
+ *        Allocate block A from meta_aggr
+ *        Allocate block B from sdata_aggr
+ *        Create a free-space section node with an address that adjoins
+ *            the beginning of meta_aggr and a size to make the
+ *            aggregator get absorbed into the section.
+ *        The adding of the section to free-space will call H5MF_aggr_absorb(),
+ *            which will absorb meta_aggr to the section:
+ *              section size + remaining size of aggregator is > aggr->alloc_size,
+ *              section is allowed to absorb an aggregator (allow_sect_absorb is true)
  *-------------------------------------------------------------------------
  */
 static unsigned
@@ -1959,7 +1959,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
     haddr_t     ma_addr=HADDR_UNDEF;
     hsize_t     ma_size=0;
     H5MF_free_section_t *sect_node=NULL;
-    hbool_t    contig_addr_vfd;         /* Whether VFD used has a contigous address space */ 
+    hbool_t    contig_addr_vfd;         /* Whether VFD used has a contigous address space */
 
     TESTING("A free-space section absorbs an aggregator: test 1");
 
@@ -2025,8 +2025,8 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("A free-space section absorbs an aggregator: test 2");
@@ -2068,7 +2068,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
         if(H5MF__find_sect(f, H5FD_MEM_SUPER, (hsize_t)(ma_size+TBLOCK_SIZE30), f->shared->fs_man[H5FD_MEM_SUPER], &tmp) != TRUE)
             TEST_ERROR
 
-        if((tmp + TBLOCK_SIZE30) != ma_addr) 
+        if((tmp + TBLOCK_SIZE30) != ma_addr)
             TEST_ERROR
 
         /* restore info to meta_aggr */
@@ -2086,15 +2086,15 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_fs_absorb() */
@@ -2103,32 +2103,32 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks are allocated from the aggregator
  *
- *	Allocate first block (30) from meta_aggr: (nothing in the aggregator)
- *		request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		The first block of 30 is allocated from meta_aggr
- *		There is space of 2018 left in meta_aggr
- *
- *	Allocate second block (50) from meta_aggr:
- *		request-size is <= what is left in meta_aggr
- *	Result:
- *		The second block of 50 is allocated from meta_aggr
- *		There is space of 1968 left in meta_aggr
+ *    Allocate first block (30) from meta_aggr: (nothing in the aggregator)
+ *        request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        The first block of 30 is allocated from meta_aggr
+ *        There is space of 2018 left in meta_aggr
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        request-size is <= what is left in meta_aggr
+ *    Result:
+ *        The second block of 50 is allocated from meta_aggr
+ *        There is space of 1968 left in meta_aggr
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     hid_t       fcpl;                   /* File creation property list */
     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;
-    hsize_t 		ma_size=0;
+    H5FD_mem_t         type;
+    haddr_t        addr1, addr2;
+    haddr_t         ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_alloc() of meta/sdata aggregator:test 1");
@@ -2228,15 +2228,15 @@ test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
         H5Pclose(fcpl);
     } H5E_END_TRY;
     return(1);
@@ -2246,38 +2246,38 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks are allocated from the aggregator
  *
- *	Allocate first block (30) from meta_aggr: (nothing in the aggregator)
- *		request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is obtained via file allocation
- *		There is space of 2018 left in meta_aggr
- *
- *	Allocate second block (50) from meta_aggr:
- *		request-size is <= what is left in meta_aggr
- *	Result:
- *		The second block of 50 is allocated from what is left in meta_aggr
- *		There is space of 1968 left in meta_aggr
- *
- *	Allocate third block (2058) from meta_aggr:
- *		request-size is > what is left in meta_aggr and is >= meta_aggr->alloc_size
- *		meta_aggr is at EOA
- *	Result:
- *		A block of request-size is extended via file allocation and is merged with meta_aggr
- *		The block of 2058 is allocated out of meta_aggr
- *		There is space of 1968 left in meta_aggr
+ *    Allocate first block (30) from meta_aggr: (nothing in the aggregator)
+ *        request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is obtained via file allocation
+ *        There is space of 2018 left in meta_aggr
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        request-size is <= what is left in meta_aggr
+ *    Result:
+ *        The second block of 50 is allocated from what is left in meta_aggr
+ *        There is space of 1968 left in meta_aggr
+ *
+ *    Allocate third block (2058) from meta_aggr:
+ *        request-size is > what is left in meta_aggr and is >= meta_aggr->alloc_size
+ *        meta_aggr is at EOA
+ *    Result:
+ *        A block of request-size is extended via file allocation and is merged with meta_aggr
+ *        The block of 2058 is allocated out of meta_aggr
+ *        There is space of 1968 left in meta_aggr
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    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, addr3;
-    haddr_t 		ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0;
+    H5FD_mem_t         type;
+    haddr_t        addr1, addr2, addr3;
+    haddr_t         ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_alloc() of meta/sdata aggregator:test 2");
@@ -2370,15 +2370,15 @@ test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_alloc2() */
@@ -2387,53 +2387,53 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks are allocated from the aggregator
  *
- *	Allocate first block (30) from meta_aggr : (nothing in the aggregator)
- *		request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocated from there
- *		There is space of 2018 left in meta_aggr
- *
- *	Allocate second block (50) from meta_aggr:
- *		request-size is <= what is left in meta_aggr
- *	Result:
- *		The second block of 50 is allocated from what is left in meta_aggr
- *		There is space of 1968 left in meta_aggr
- *
- *	Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
- *		request-size is > what is left in other_aggr and is < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocated from there
- *		There is space of 2018 left in sdata_aggr
- *
- *	Allocate the third block (2058) from meta_aggr:
- *		request-size is > what is left in meta_aggr and >= meta_aggr->alloc_size
- *		sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
- *	Result: A block of request-size is obtained via file allocation
- *		The new block's address is returned
- *		Nothing is changed in meta_aggr and sdata_aggr
- *
- *	Allocate fourth block (50) from meta_aggr:
- *		request-size is <= what is left in meta_aggr and < meta_aggr->alloc_size
- *	Result:
- *		The fourth block of 50 is allocated from what is left in meta_aggr
- *		There is space of 1968 left in meta_aggr
+ *    Allocate first block (30) from meta_aggr : (nothing in the aggregator)
+ *        request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocated from there
+ *        There is space of 2018 left in meta_aggr
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        request-size is <= what is left in meta_aggr
+ *    Result:
+ *        The second block of 50 is allocated from what is left in meta_aggr
+ *        There is space of 1968 left in meta_aggr
+ *
+ *    Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
+ *        request-size is > what is left in other_aggr and is < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocated from there
+ *        There is space of 2018 left in sdata_aggr
+ *
+ *    Allocate the third block (2058) from meta_aggr:
+ *        request-size is > what is left in meta_aggr and >= meta_aggr->alloc_size
+ *        sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
+ *    Result: A block of request-size is obtained via file allocation
+ *        The new block's address is returned
+ *        Nothing is changed in meta_aggr and sdata_aggr
+ *
+ *    Allocate fourth block (50) from meta_aggr:
+ *        request-size is <= what is left in meta_aggr and < meta_aggr->alloc_size
+ *    Result:
+ *        The fourth block of 50 is allocated from what is left in meta_aggr
+ *        There is space of 1968 left in meta_aggr
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    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, stype;
-    haddr_t		addr1, addr2, addr3, addr4, saddr1;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0;
-    haddr_t 		sdata_addr=HADDR_UNDEF;
-    hsize_t 		sdata_size=0;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, addr3, addr4, saddr1;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0;
+    haddr_t         sdata_addr=HADDR_UNDEF;
+    hsize_t         sdata_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_alloc() of meta/sdata aggregator: test 3");
@@ -2530,15 +2530,15 @@ test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_alloc3() */
@@ -2548,31 +2548,31 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks are allocated from the aggregator
  *
- *	Allocate first block (30) from meta_aggr: (nothing in the aggregator)
- *		request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is obtained via file allocation
- *		There is space of 2018 left in meta_aggr
- *		The first block of 30 is allocated from there
- *
- *	Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
- *		request-size is > what is left in sdata_aggr and < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocated from there
- *
- *	Allocate the second block (2018) from sdata_aggr:
- *		request-size is <= what is left in sdata_aggr and < sdata_aggr->alloc_size
- *		request-size is < sdata_aggr->alloc_size
- *	Result:
- *		The block is allocated from what is left in sdata_aggr (all used up)
- *
- *	Allocate third block (50) from sdata_aggr :
- *		request-size is > what is left in sdata_aggr and < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is extended via file allocation
- *		The third block of 50 is allocated from there
- *		There is space of 1998 left in the sdata_aggr
+ *    Allocate first block (30) from meta_aggr: (nothing in the aggregator)
+ *        request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is obtained via file allocation
+ *        There is space of 2018 left in meta_aggr
+ *        The first block of 30 is allocated from there
+ *
+ *    Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
+ *        request-size is > what is left in sdata_aggr and < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocated from there
+ *
+ *    Allocate the second block (2018) from sdata_aggr:
+ *        request-size is <= what is left in sdata_aggr and < sdata_aggr->alloc_size
+ *        request-size is < sdata_aggr->alloc_size
+ *    Result:
+ *        The block is allocated from what is left in sdata_aggr (all used up)
+ *
+ *    Allocate third block (50) from sdata_aggr :
+ *        request-size is > what is left in sdata_aggr and < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is extended via file allocation
+ *        The third block of 50 is allocated from there
+ *        There is space of 1998 left in the sdata_aggr
  *
  *	Allocate second block (2058) from meta_aggr:
  *		request-size is > what is left in meta_aggr and >= meta_aggr->alloc_size
@@ -2589,14 +2589,14 @@ error:
 static unsigned
 test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    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, stype;
-    haddr_t		addr1, addr2, saddr1, saddr2, saddr3;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0, sdata_size=0;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, saddr1, saddr2, saddr3;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0, sdata_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_alloc() of meta/sdata aggregator:test 4");
@@ -2697,15 +2697,15 @@ test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_alloc4() */
@@ -2714,37 +2714,37 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks are allocated from the aggregator
  *
- *	Allocate first block (30) from meta_aggr: (nothing in the aggregator)
- *		request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocate from there
+ *    Allocate first block (30) from meta_aggr: (nothing in the aggregator)
+ *        request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocate from there
  *
- *	Allocate second block (50) from meta_aggr:
- *		request-size is < what is left in meta_aggr
- *	Result:
- *		The second block of 50 is allocated from what is left there
- *		There is space of 1968 left in the meta_aggr
+ *    Allocate second block (50) from meta_aggr:
+ *        request-size is < what is left in meta_aggr
+ *    Result:
+ *        The second block of 50 is allocated from what is left there
+ *        There is space of 1968 left in the meta_aggr
  *
- *	Allocate third block (1970) from meta_aggr:
- *		request-size is > what is left in meta_aggr and is < meta_aggr->alloc_size
- *	Result: A block of meta_aggr->alloc_size is extended via file allocation and is absorbed into the meta_aggr
- *		The block of 1970 is allocated from there
- *		There is space of 2046 left in meta_aggr
+ *    Allocate third block (1970) from meta_aggr:
+ *        request-size is > what is left in meta_aggr and is < meta_aggr->alloc_size
+ *    Result: A block of meta_aggr->alloc_size is extended via file allocation and is absorbed into the meta_aggr
+ *        The block of 1970 is allocated from there
+ *        There is space of 2046 left in meta_aggr
  *
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    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, addr3;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0;
+    H5FD_mem_t         type;
+    haddr_t        addr1, addr2, addr3;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_alloc() of meta/sdata aggregator:test 5");
@@ -2820,15 +2820,15 @@ test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_alloc5() */
@@ -2837,47 +2837,47 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks are allocated from the aggregator
  *
- *	Allocate first block (30) from meta_aggr: (nothing in the aggregator)
- *		request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocated from there
- *
- *	Allocate second block (50) from meta_aggr:
- *		request-size is <= what is left in meta_aggr
- *	Result:
- *		The second block of 50 is allocated from what is left in meta_aggr
- *		There is space of 1968 left in meta_aggr
- *
- *	Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
- *		request-size is > what is left in sdata_aggr and is < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocated from there
- *		There is space of 2018 left in sdata_aggr
- *
- *	Allocate third block (1970) from meta_aggr:
- *		request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
- *		sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is obtained via file allocation.
- *		The block does not adjoin meta_aggr
- *		sdata_aggr is untouched
- *		meta_aggr's unused space of [880, 1968] is freed to free-space
- *		meta_aggr is updated to point to the new block
+ *    Allocate first block (30) from meta_aggr: (nothing in the aggregator)
+ *        request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocated from there
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        request-size is <= what is left in meta_aggr
+ *    Result:
+ *        The second block of 50 is allocated from what is left in meta_aggr
+ *        There is space of 1968 left in meta_aggr
+ *
+ *    Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
+ *        request-size is > what is left in sdata_aggr and is < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocated from there
+ *        There is space of 2018 left in sdata_aggr
+ *
+ *    Allocate third block (1970) from meta_aggr:
+ *        request-size is > what is left in meta_aggr and < meta_aggr->alloc_size
+ *        sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is obtained via file allocation.
+ *        The block does not adjoin meta_aggr
+ *        sdata_aggr is untouched
+ *        meta_aggr's unused space of [880, 1968] is freed to free-space
+ *        meta_aggr is updated to point to the new block
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    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, stype;
-    haddr_t		addr1, addr2, addr3, saddr1;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0, sdata_size=0;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, addr3, saddr1;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0, sdata_size=0;
     H5FS_stat_t state;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
@@ -2976,15 +2976,15 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_alloc6() */
@@ -2999,52 +2999,52 @@ error:
  *      A block of meta_aggr->alloc_size is obtained via file allocation
  *      The first block of 30 is allocated from there
  *
- *	Allocate second block (50) from meta_aggr:
- *		request-size is <= what is left in meta_aggr
- *	Result:
- *		The second block of 50 is allocated from what is left in the aggregator
- *		There is space of 1968 left in the meta_aggr
- *
- *	Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
- *		request-size is > what is left in sdata_aggr->size and < sdata_aggr->alloc_size
- * 	Result:
- *		A block of sdata_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocate from there
- *
- *	Allocate second block (2018) from sdata_aggr:
- *		request-size is <= what is left in sdata_aggr and is < sdata_aggr->alloc_size
- *	Result:
- *		The second block of 2018 is allocated from what is left in sdata_aggr (all used up)
- *
- *	Allocate third block (50) from sdata_aggr:
- *		request-size is > what is left in sdata_aggr and < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is extended via file allocation
- *		The third block of 50 is allocated from there
- *
- *	Allocate third block (1970) from meta_aggr:
- *		request-size is > what is left in meta_aggr and is < meta_aggr->alloc_size
- *		sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
- *	Result:
- *		unused space in sdata_aggr is freed to free-space and is shrunk
- *		sdata_aggr is reset to 0
- *		A block of meta_aggr->alloc_size is obtained via file allocation
- *		The block does not adjoin meta_aggr
- *		meta_aggr's unused space of [880, 1968] is freed to free-space
- *		meta_aggr is updated to point to the new block
+ *    Allocate second block (50) from meta_aggr:
+ *        request-size is <= what is left in meta_aggr
+ *    Result:
+ *        The second block of 50 is allocated from what is left in the aggregator
+ *        There is space of 1968 left in the meta_aggr
+ *
+ *    Allocate first block (30) from sdata_aggr: (nothing in sdata_aggr)
+ *        request-size is > what is left in sdata_aggr->size and < sdata_aggr->alloc_size
+ *     Result:
+ *        A block of sdata_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocate from there
+ *
+ *    Allocate second block (2018) from sdata_aggr:
+ *        request-size is <= what is left in sdata_aggr and is < sdata_aggr->alloc_size
+ *    Result:
+ *        The second block of 2018 is allocated from what is left in sdata_aggr (all used up)
+ *
+ *    Allocate third block (50) from sdata_aggr:
+ *        request-size is > what is left in sdata_aggr and < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is extended via file allocation
+ *        The third block of 50 is allocated from there
+ *
+ *    Allocate third block (1970) from meta_aggr:
+ *        request-size is > what is left in meta_aggr and is < meta_aggr->alloc_size
+ *        sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        unused space in sdata_aggr is freed to free-space and is shrunk
+ *        sdata_aggr is reset to 0
+ *        A block of meta_aggr->alloc_size is obtained via file allocation
+ *        The block does not adjoin meta_aggr
+ *        meta_aggr's unused space of [880, 1968] is freed to free-space
+ *        meta_aggr is updated to point to the new block
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      empty_size, file_size;
-    H5FD_mem_t 		type, stype;
-    haddr_t		addr1, addr2, addr3, saddr1, saddr2, saddr3;
-    haddr_t 		ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, sdata_size=0;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, addr3, saddr1, saddr2, saddr3;
+    haddr_t         ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, sdata_size=0;
     H5FS_stat_t         state;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
@@ -3160,15 +3160,15 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_alloc7() */
@@ -3177,38 +3177,38 @@ error:
  *-------------------------------------------------------------------------
  * To verify that a block can be extended from the aggregator
  *
- *	Test 1: Allocate block A from meta_aggr which is at end of file
- *		Try to extend the block which adjoins the aggregator that is at end of file
- *		  a. block size < (% * aggr->alloc_size)
- *		     The block is allocated from the aggregator
- *		  b. block size > (% * aggr->alloc_size) but block size < aggr->alloc_size
- *		     The block is extended by aggr->alloc_size and the block is allocated from the aggregator
- *		  c. block size > (% * aggr->alloc_size) but block size > aggr->alloc_size
- *		     The block is extended by extended-request and the block is allocated from the aggregator
- *
- *	Test 2: Allocate block A from meta_aggr
- *		Allocate block B from sdata_aggr so that meta_aggr is not at end of file
- *		Try to extend a block which adjoins meta_aggr and meta_aggr can fulfill the extended-request
- *		H5MF_try_extend() succeeds: the block is extended into the aggregator
- *
- *	Test 3: Allocate block A from meta_aggr
- *		Allocate block B from sdata_aggr so that meta_aggr is not at end of file
- *		Try to extend a block which adjoins meta_aggr but meta_aggr cannot fulfill the extended-request
- *		H5MF_try_extend() fails
+ *    Test 1: Allocate block A from meta_aggr which is at end of file
+ *        Try to extend the block which adjoins the aggregator that is at end of file
+ *          a. block size < (% * aggr->alloc_size)
+ *             The block is allocated from the aggregator
+ *          b. block size > (% * aggr->alloc_size) but block size < aggr->alloc_size
+ *             The block is extended by aggr->alloc_size and the block is allocated from the aggregator
+ *          c. block size > (% * aggr->alloc_size) but block size > aggr->alloc_size
+ *             The block is extended by extended-request and the block is allocated from the aggregator
+ *
+ *    Test 2: Allocate block A from meta_aggr
+ *        Allocate block B from sdata_aggr so that meta_aggr is not at end of file
+ *        Try to extend a block which adjoins meta_aggr and meta_aggr can fulfill the extended-request
+ *        H5MF_try_extend() succeeds: the block is extended into the aggregator
+ *
+ *    Test 3: Allocate block A from meta_aggr
+ *        Allocate block B from sdata_aggr so that meta_aggr is not at end of file
+ *        Try to extend a block which adjoins meta_aggr but meta_aggr cannot fulfill the extended-request
+ *        H5MF_try_extend() fails
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      empty_size = 0, file_size;
-    H5FD_mem_t 		type, stype;
-    haddr_t		new_addr, addr, saddr;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0, sdata_size=0;
-    htri_t      	was_extended;
+    H5FD_mem_t         type, stype;
+    haddr_t        new_addr, addr, saddr;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0, sdata_size=0;
+    htri_t          was_extended;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_try_extend() of meta/sdata aggregator: test 1");
@@ -3314,8 +3314,8 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("H5MF_try_extend() of meta/sdata aggregator: test 2");
@@ -3384,8 +3384,8 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("H5MF_try_extend() of meta/sdata aggregator: test 3");
@@ -3452,15 +3452,15 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_extend() */
@@ -3471,35 +3471,35 @@ error:
  *
  * MF_try_shrink() only allows blocks to be absorbed into an aggregator
  *
- *	Test 1: H5MF_alloc() block A from meta_aggr
- *		H5MF_try_shrink() block A should merge it back into meta_aggr
- *			since block A adjoins the beginning of meta_aggr
+ *    Test 1: H5MF_alloc() block A from meta_aggr
+ *        H5MF_try_shrink() block A should merge it back into meta_aggr
+ *            since block A adjoins the beginning of meta_aggr
  *
- *	Test 2: H5MF_alloc() block A from meta_aggr
- *		H5MF_alloc() block B from sdata_aggr
- *		H5MF_try_shrink() block B should merge it back to the end of sdata_aggr
- *			because sec2 driver is FLMAP_DICHOTOMY by default
+ *    Test 2: H5MF_alloc() block A from meta_aggr
+ *        H5MF_alloc() block B from sdata_aggr
+ *        H5MF_try_shrink() block B should merge it back to the end of sdata_aggr
+ *            because sec2 driver is FLMAP_DICHOTOMY by default
  *
- *	Test 3: H5MF_alloc() block A from meta_aggr
- *		H5MF_alloc() block B from meta_aggr
- *		H5MF_alloc() block C from meta_aggr
- *		H5MF_try_shrink() block B should fail since it does not adjoin the
- *			beginning nor the end of meta_aggr
+ *    Test 3: H5MF_alloc() block A from meta_aggr
+ *        H5MF_alloc() block B from meta_aggr
+ *        H5MF_alloc() block C from meta_aggr
+ *        H5MF_try_shrink() block B should fail since it does not adjoin the
+ *            beginning nor the end of meta_aggr
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      empty_size = 0, file_size;
-    H5FD_mem_t 		type, stype;
-    haddr_t		addr1, addr2, addr3, saddr1;
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
-    haddr_t 		new_sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0;
-    hsize_t 		sdata_size=0, new_sdata_size=0;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, addr3, saddr1;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
+    haddr_t         new_sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0;
+    hsize_t         sdata_size=0, new_sdata_size=0;
     hbool_t             contig_addr_vfd;        /* Whether VFD used has a contigous address space */
 
     TESTING("H5MF_try_shrink() of meta/sdata aggregator: test 1");
@@ -3561,8 +3561,8 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("H5MF_try_shrink() of meta/sdata aggregator: test 2");
@@ -3620,8 +3620,8 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     TESTING("H5MF_try_shrink() of meta/sdata aggregator: test 3");
@@ -3682,15 +3682,15 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support metadata aggregator");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support metadata aggregator");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_aggr_absorb() */
@@ -3702,46 +3702,46 @@ error:
  * Alignment = 1024 or 4096
  *
  * Test 1:
- * 	Turn off using meta data aggregator
- * 	Allocate a block of 30 which should be from file allocation
- *	Result:
- *		The return address should be aligned
- *		A fragment [800, 224] or [800, 3296] is freed to free-space
- *		EOA is 1054 or 4126
- *
- * 	Allocate a block of 50 which should be from file allocation
- *	Result:
- *		The return address should be aligned
- *		A fragment [1054, 994] or [4126, 4066] is freed to free-space
- *		EOA is 2098 or 8242
+ *     Turn off using metadata aggregator
+ *     Allocate a block of 30 which should be from file allocation
+ *    Result:
+ *        The return address should be aligned
+ *        A fragment [800, 224] or [800, 3296] is freed to free-space
+ *        EOA is 1054 or 4126
+ *
+ *     Allocate a block of 50 which should be from file allocation
+ *    Result:
+ *        The return address should be aligned
+ *        A fragment [1054, 994] or [4126, 4066] is freed to free-space
+ *        EOA is 2098 or 8242
  * Test 2:
- * 	Turn off using meta data aggregator
- * 	Allocate a block which should be from file allocation
- *	The return address should be aligned
- *	H5MF_try_shrink() the block with aligned address should succeed
+ *     Turn off using metadata aggregator
+ *     Allocate a block which should be from file allocation
+ *    The return address should be aligned
+ *    H5MF_try_shrink() the block with aligned address should succeed
  *
  * Test 3:
- * 	Turn off using meta data aggregator
- * 	Allocate a block which should be from file allocation
- *	The return address should be aligned
- *	H5MF_try_extend() the block with aligned address should succeed
+ *     Turn off using metadata aggregator
+ *     Allocate a block which should be from file allocation
+ *    The return address should be aligned
+ *    H5MF_try_extend() the block with aligned address should succeed
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    hid_t		fapl1 = -1;
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    hid_t        fapl1 = -1;
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size, new_file_size;
-    H5FD_mem_t 		type;
-    haddr_t		addr1, addr2;
-    haddr_t 		ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0;
-    htri_t 		was_extended;
+    H5FD_mem_t         type;
+    haddr_t        addr1, addr2;
+    haddr_t         ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0;
+    htri_t         was_extended;
     H5FS_stat_t state;
-    hsize_t		alignment=0, mis_align=0, tmp=0, accum=0;
+    hsize_t        alignment=0, mis_align=0, tmp=0, accum=0;
     hbool_t             have_alloc_vfd;        /* Whether VFD used has an 'alloc' callback */
 
     TESTING("H5MM_alloc() of file allocation with alignment: test 1");
@@ -3849,8 +3849,8 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     TESTING("H5MF_try_shrink() of file allocation with alignment: test 2");
@@ -3904,8 +3904,8 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     TESTING("H5MF_try_extend() of file allocation with alignment: test 3");
@@ -3960,15 +3960,15 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_align_eoa() */
@@ -3980,43 +3980,43 @@ error:
  * Alignment = 1024 or 4096
  *
  * Test 1:
- *	Add section A with an aligned address to free-space manager (addr=alignment, size=50)
- *	Allocate a block of size=50
- *	The returned space's address should be same as section A's address
+ *    Add section A with an aligned address to free-space manager (addr=alignment, size=50)
+ *    Allocate a block of size=50
+ *    The returned space's address should be same as section A's address
  *
  * Test 2:
- *	Add section A to free-space manager (addr=70, size=8000):
- *		section A is mis-aligned but the size is big enough for allocation with alignment
- *	Allocate a block of size=600
- *	The returned space should be allocated from section A with an aligned address:
- *		address=alignment  size=600
- *	There will be 2 sections in free-space: (alignment = 1024 or alignment = 4096)
- *		the fragment left from aligning section A: [70, 954] or [70, 4026]
- *		the section left after allocating block A: [1624, 416] or [4696, 3374]
- *	H5MF_try_extend() the block of size 600 by 200 should succeed:
- *		the existing fragment left from aligning section A: [70, 954] or [70, 4026]
- *		the section left after extending block A: [1824, 216] or [4896, 3174]
+ *    Add section A to free-space manager (addr=70, size=8000):
+ *        section A is mis-aligned but the size is big enough for allocation with alignment
+ *    Allocate a block of size=600
+ *    The returned space should be allocated from section A with an aligned address:
+ *        address=alignment  size=600
+ *    There will be 2 sections in free-space: (alignment = 1024 or alignment = 4096)
+ *        the fragment left from aligning section A: [70, 954] or [70, 4026]
+ *        the section left after allocating block A: [1624, 416] or [4696, 3374]
+ *    H5MF_try_extend() the block of size 600 by 200 should succeed:
+ *        the existing fragment left from aligning section A: [70, 954] or [70, 4026]
+ *        the section left after extending block A: [1824, 216] or [4896, 3174]
  *
  * Test 3:
- *	Add section A to free-space manager (addr=70, size=700):
- *		section A is mis-aligned but the size is not big enough for allocation with alignment
- *	Allocate a block of size=40
- *	The free-space manager is unable to fulfill the request
- *	The block is allocated from file allocation and should be aligned
+ *    Add section A to free-space manager (addr=70, size=700):
+ *        section A is mis-aligned but the size is not big enough for allocation with alignment
+ *    Allocate a block of size=40
+ *    The free-space manager is unable to fulfill the request
+ *    The block is allocated from file allocation and should be aligned
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
     h5_stat_size_t      file_size;
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     H5MF_free_section_t *sect_node = NULL;
-    haddr_t		addr;
+    haddr_t        addr;
     H5FS_stat_t state;
     htri_t      was_extended;
-    hsize_t		alignment=0, tmp=0, mis_align=0;
+    hsize_t        alignment=0, tmp=0, mis_align=0;
     hbool_t             have_alloc_vfd;        /* Whether VFD used has an 'alloc' callback */
 
     TESTING("H5MF_alloc() of free-space manager with alignment: test 1");
@@ -4247,15 +4247,15 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_align_fs() */
@@ -4264,114 +4264,114 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks allocated from the aggregator are aligned
  *
- * Alignment = 1024 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (nothing in the aggregator)
- *		request-size > aggr->size and < aggr->alloc_size
- *	Result:
- *		An "aggr->alloc_size" block is allocated from file allocation for the aggregator
- *		EOA is 3072
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of file allocation is freed to free-space:[800, 224]
- *		There is space of 2018 left in meta_aggr
- *
- *	Allocate second block (50) from meta_aggr:
- *		(request-size + fragment size) <= aggr->size
- *	Result:
- *		The second block of 50 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
- *		There is space of 974 left in meta_aggr
- *
- *	Allocate third block (80) from meta_aggr:
- *		(request-size + fragment size) > aggr->size
- *		request-size < meta_aggr->alloc_size
- *		fragment size < (meta_aggr->alloc_size - request-size)
- *		meta_aggr is at EOA
- *	Result:
- *		A block of "meta_aggr->alloc_size" is extended from file allocation for meta_aggr
- *		EOA is 5120
- *		The third block of 80 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[2098, 974]
- *		There is space of 1968 left in meta_aggr
- *
- *	Allocate fourth block (1970) from meta_aggr:
- *		(request-size + fragment size) is <= aggr->size
- *		fragment size > (aggr->alloc_size - request-size)
- *		meta_aggr is at EOA
- *	Result:
- *		A block of aggr->alloc_size + fragment size - (aggr->alloc_size - request-size))
- *			 is extended from file allocation for meta_aggr
- *		The third block of 1970 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[3152, 944]
- *		There is space of 1968 left in meta_aggr
- *		EOA is at 8034
- *
- *
- * Alignment = 4096 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (aggregator is empty)
- *		request-size is > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A meta_aggr->alloc_size block is allocated from file allocation for the aggregator
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of file allocation is freed to free-space:[800, 3296]
- *		There is space of 2018 left in meta_aggr
- *		EOA is at 6144
- *
- *	Allocate second block (50) from meta_aggr:
- *		(request-size + fragment size) is > meta_aggr->size
- *		request-size < meta_aggr->alloc_size
- *		fragment size > (meta_aggr->alloc_size - request-size)
- *		meta_aggr is at EOA
- *	Result:
- *		A block of meta_aggr->alloc_size + (fragment size - (meta_aggr->alloc_size - request-size))
- *			is extended from file allocation for the aggregator
- *		The second block of 50 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
- *		There is space of 2018 left in meta_aggr
- *		EOA is at 10260
- *
- *	Allocate third block (80) from meta_aggr:
- *		(request-size + fragment size) is > meta_aggr->size
- *		request-size < meta_aggr->alloc_size
- *		fragment size > (meta_aggr->alloc_size - request-size)
- *		meta_aggr is at EOA
- *	Result:
- *		A block of meta_aggr->alloc_size + (fragment size - (meta_aggr->alloc_size - request-size))
- *			is extended from file allocation for the aggregator
- *		The third block of 80 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[8242, 4046]
- *		There is space of 2018 left in meta_aggr
- *		EOA is at 14386
- *
- *	Allocate fourth block (1970) from meta_aggr:
- *		(request-size + fragment size) > meta_aggr->size
- *		request-size < meta_aggr->alloc_size
- *		fragment size > (meta_aggr->alloc_size - request-size)
- *		meta_aggr is at EOA
- *	Result:
- *		A block of meta_aggr->alloc_size + (fragment size - (meta_aggr->alloc_size - request-size))
- *			is extended from file allocation for the aggregator
- *		The fourth block of 1970 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[12368, 4016]
- *		There is space of 2018 left in meta_aggr
- *		EOA is at 20372
+ * Alignment = 1024     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (nothing in the aggregator)
+ *        request-size > aggr->size and < aggr->alloc_size
+ *    Result:
+ *        An "aggr->alloc_size" block is allocated from file allocation for the aggregator
+ *        EOA is 3072
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 224]
+ *        There is space of 2018 left in meta_aggr
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        (request-size + fragment size) <= aggr->size
+ *    Result:
+ *        The second block of 50 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
+ *        There is space of 974 left in meta_aggr
+ *
+ *    Allocate third block (80) from meta_aggr:
+ *        (request-size + fragment size) > aggr->size
+ *        request-size < meta_aggr->alloc_size
+ *        fragment size < (meta_aggr->alloc_size - request-size)
+ *        meta_aggr is at EOA
+ *    Result:
+ *        A block of "meta_aggr->alloc_size" is extended from file allocation for meta_aggr
+ *        EOA is 5120
+ *        The third block of 80 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[2098, 974]
+ *        There is space of 1968 left in meta_aggr
+ *
+ *    Allocate fourth block (1970) from meta_aggr:
+ *        (request-size + fragment size) is <= aggr->size
+ *        fragment size > (aggr->alloc_size - request-size)
+ *        meta_aggr is at EOA
+ *    Result:
+ *        A block of aggr->alloc_size + fragment size - (aggr->alloc_size - request-size))
+ *             is extended from file allocation for meta_aggr
+ *        The third block of 1970 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[3152, 944]
+ *        There is space of 1968 left in meta_aggr
+ *        EOA is at 8034
+ *
+ *
+ * Alignment = 4096     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (aggregator is empty)
+ *        request-size is > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A meta_aggr->alloc_size block is allocated from file allocation for the aggregator
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 3296]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is at 6144
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        (request-size + fragment size) is > meta_aggr->size
+ *        request-size < meta_aggr->alloc_size
+ *        fragment size > (meta_aggr->alloc_size - request-size)
+ *        meta_aggr is at EOA
+ *    Result:
+ *        A block of meta_aggr->alloc_size + (fragment size - (meta_aggr->alloc_size - request-size))
+ *            is extended from file allocation for the aggregator
+ *        The second block of 50 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is at 10260
+ *
+ *    Allocate third block (80) from meta_aggr:
+ *        (request-size + fragment size) is > meta_aggr->size
+ *        request-size < meta_aggr->alloc_size
+ *        fragment size > (meta_aggr->alloc_size - request-size)
+ *        meta_aggr is at EOA
+ *    Result:
+ *        A block of meta_aggr->alloc_size + (fragment size - (meta_aggr->alloc_size - request-size))
+ *            is extended from file allocation for the aggregator
+ *        The third block of 80 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[8242, 4046]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is at 14386
+ *
+ *    Allocate fourth block (1970) from meta_aggr:
+ *        (request-size + fragment size) > meta_aggr->size
+ *        request-size < meta_aggr->alloc_size
+ *        fragment size > (meta_aggr->alloc_size - request-size)
+ *        meta_aggr is at EOA
+ *    Result:
+ *        A block of meta_aggr->alloc_size + (fragment size - (meta_aggr->alloc_size - request-size))
+ *            is extended from file allocation for the aggregator
+ *        The fourth block of 1970 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[12368, 4016]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is at 20372
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size;              /* File size */
 
-    H5FD_mem_t 		type;
-    haddr_t		addr1, addr2, addr3, addr4;
+    H5FD_mem_t         type;
+    haddr_t        addr1, addr2, addr3, addr4;
     H5FS_stat_t state;
-    haddr_t 		ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, mis_align=0;
-    hsize_t		alignment=0, tmp=0;
+    haddr_t         ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, mis_align=0;
+    hsize_t        alignment=0, tmp=0;
     hbool_t             have_alloc_vfd;        /* Whether VFD used has an 'alloc' callback */
 
 
@@ -4517,15 +4517,15 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_align_alloc1() */
@@ -4534,101 +4534,101 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks allocated from the aggregator are aligned
  *
- * Alignment = 1024 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size is > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A meta_aggr->alloc_size block is allocated from file allocation for the aggregator
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of file allocation is freed to free-space:[800, 224]
- *		There is space of 2018 left in meta_aggr
- *		EOA is 3072
- *
- *	Allocate second block (50) from meta_aggr:
- *		(request-size+fragment size) <= aggr->size
- *	Result:
- *		The second block of 50 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
- *		There is space of 974 left in meta_aggr
- *
- *	Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
- *		request-size is > sdata_aggr->size and < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is obtained via file allocation
- *		The first block of 30 is allocated from sdata_aggr and should be aligned
- *		EOA is 5120
- *
- *	Allocate third block (80) from meta_aggr:
- *		request-size+fragment size is > meta_aggr->size
- *		sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		The unused space in meta_aggr is freed to free-space [2098, 974]
- *		meta_aggr is updated to point to the new block
- *		The third block of 80 is allocated from meta_aggr and should be aligned
- *		EOA is 7168
- *
- * Alignment = 4096 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size is > aggr->size and < aggr->alloc_size
- *	Result:
- *		A meta_aggr->alloc_size block is allocated from file allocation for the aggregator
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of file allocation is freed to free-space:[800, 3296]
- *		There is space of 2018 left meta_aggr
- *		EOA is at 6144
- *
- *	Allocate second block (50) from meta_aggr:
- *		(request-size + fragment size) > aggr->size
- *		request-size < aggr->alloc_size
- *		fragment size > (aggr->alloc_size - request-size)
- *	Result:
- *		A block of (fragment size  + request-size) is extended from file allocation for the aggregator
- *		The second block of 50 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
- *		There is space of 2018 left in meta_aggr
- *		EOA is at 10260
- *
- *	Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
- *		request-size is > sdata_aggr->size and < sdata_aggr->alloc_size
- *		meta_aggr is at EOA and has used up more than meta_aggr->alloc_size
- *	Result:
- *		The remaining space in meta_aggr is freed to free-space [8242, 2018] and shrunk since at EOF
- *		meta_aggr is reset to 0
- *		A block of sdata_aggr->alloc_size is obtained via file allocation
- *		Fragment from alignment of file allocation is freed to free-space: [8242, 4046]
- *		The first block of 30 is allocated from sdata_aggr and should be aligned
- *		There is space of 2018 left in sdata_aggr
- *		EOA is 14336
- *
- *	Allocate third block (80) from meta_aggr:
- *		(request-size + fragment size) is > meta_aggr->size
- *		request-size < meta_aggr->alloc_size
- *		sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation for the aggregator
- *		Fragment from alignment of file allocation is freed to free-space:[14336, 2048]
- *		other_aggr is [12318, 2018]
- *		The third block of 80 is allocated from the aggregator and should be aligned
- *		There is space of 1968 left in meta_aggr
- *		EOA is at 18432
+ * Alignment = 1024     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size is > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A meta_aggr->alloc_size block is allocated from file allocation for the aggregator
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 224]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is 3072
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        (request-size+fragment size) <= aggr->size
+ *    Result:
+ *        The second block of 50 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
+ *        There is space of 974 left in meta_aggr
+ *
+ *    Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
+ *        request-size is > sdata_aggr->size and < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is obtained via file allocation
+ *        The first block of 30 is allocated from sdata_aggr and should be aligned
+ *        EOA is 5120
+ *
+ *    Allocate third block (80) from meta_aggr:
+ *        request-size+fragment size is > meta_aggr->size
+ *        sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        The unused space in meta_aggr is freed to free-space [2098, 974]
+ *        meta_aggr is updated to point to the new block
+ *        The third block of 80 is allocated from meta_aggr and should be aligned
+ *        EOA is 7168
+ *
+ * Alignment = 4096     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size is > aggr->size and < aggr->alloc_size
+ *    Result:
+ *        A meta_aggr->alloc_size block is allocated from file allocation for the aggregator
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 3296]
+ *        There is space of 2018 left meta_aggr
+ *        EOA is at 6144
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        (request-size + fragment size) > aggr->size
+ *        request-size < aggr->alloc_size
+ *        fragment size > (aggr->alloc_size - request-size)
+ *    Result:
+ *        A block of (fragment size  + request-size) is extended from file allocation for the aggregator
+ *        The second block of 50 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is at 10260
+ *
+ *    Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
+ *        request-size is > sdata_aggr->size and < sdata_aggr->alloc_size
+ *        meta_aggr is at EOA and has used up more than meta_aggr->alloc_size
+ *    Result:
+ *        The remaining space in meta_aggr is freed to free-space [8242, 2018] and shrunk since at EOF
+ *        meta_aggr is reset to 0
+ *        A block of sdata_aggr->alloc_size is obtained via file allocation
+ *        Fragment from alignment of file allocation is freed to free-space: [8242, 4046]
+ *        The first block of 30 is allocated from sdata_aggr and should be aligned
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is 14336
+ *
+ *    Allocate third block (80) from meta_aggr:
+ *        (request-size + fragment size) is > meta_aggr->size
+ *        request-size < meta_aggr->alloc_size
+ *        sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation for the aggregator
+ *        Fragment from alignment of file allocation is freed to free-space:[14336, 2048]
+ *        other_aggr is [12318, 2018]
+ *        The third block of 80 is allocated from the aggregator and should be aligned
+ *        There is space of 1968 left in meta_aggr
+ *        EOA is at 18432
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size;              /* File size */
-    H5FD_mem_t 		type, stype;
-    haddr_t		addr1, addr2, addr3, saddr1;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, addr3, saddr1;
     H5FS_stat_t state[H5FD_MEM_NTYPES];
-    haddr_t 		ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, sdata_size=0, mis_align=0;
-    hsize_t		alignment=0, tmp=0;
+    haddr_t         ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, sdata_size=0, mis_align=0;
+    hsize_t        alignment=0, tmp=0;
     hbool_t             have_alloc_vfd;        /* Whether VFD used has an 'alloc' callback */
 
     TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 2");
@@ -4717,11 +4717,11 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
          *
          * For alignment = 1024, alloc_size = 2048:
          *  block 30 is allocated from (ma_addr + ma_size),
-         *	which is already aligned
+         *    which is already aligned
          *
          * For alignment = 4096, alloc_size = 2048:
-         *	since remaining space in meta_aggr is freed and shrunk,
-         *	block 30 is allocated from ma_addr
+         *    since remaining space in meta_aggr is freed and shrunk,
+         *    block 30 is allocated from ma_addr
          */
         mis_align = 0;
         if((alignment == TEST_ALIGN1024) && (tmp = ((ma_addr + ma_size) % alignment)))
@@ -4752,10 +4752,10 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
          * Calculate fragment for the allocation of block 80 from meta_aggr:
          *
          * For alignment = 1024, alloc_size = 2048:
-         * 	fragment for unused space in meta_aggr is freed to free-space
+         *     fragment for unused space in meta_aggr is freed to free-space
          * For alignment = 4096, alloc_size = 2048:
-         * 	fragment from alignment of ma_addr is freed
-         *	block 30 is allocated from ma_addr
+         *     fragment from alignment of ma_addr is freed
+         *    block 30 is allocated from ma_addr
          */
         mis_align = 0;
         if((alignment == TEST_ALIGN1024) && (tmp = (ma_addr % alignment)))
@@ -4782,15 +4782,15 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
             TEST_ERROR
 
         /* Verify total size of free space after all the allocations */
-	if(f->shared->fs_man[type]) {
-	    if(check_stats(f, f->shared->fs_man[type], &(state[type])))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[type]) {
+        if(check_stats(f, f->shared->fs_man[type], &(state[type])))
+        TEST_ERROR
+    }
 
-	if(f->shared->fs_man[stype]) {
-	    if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[stype]) {
+        if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
+        TEST_ERROR
+    }
 
         H5MF_xfree(f, type, addr1, (hsize_t)TBLOCK_SIZE30);
         H5MF_xfree(f, type, addr2, (hsize_t)TBLOCK_SIZE50);
@@ -4803,15 +4803,15 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_align_alloc2() */
@@ -4820,153 +4820,153 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks allocated from the aggregator are aligned
  *
- * Alignment = 1024 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size is > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation for the aggregator
- *		Fragment from alignment of file allocation is freed to free-space:[800, 224]
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in meta_aggr
- *		EOA is 3072
- *
- *	Allocate second block (50) from meta_aggr:
- *		(request-size+fragment size) is <= aggr->size
- *	Result:
- *		The second block of 50 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
- *		There is space of 974 left in the aggregator
- *
- *	Allocate first block (30) from other_aggr: (nothing in other_aggr)
- *		request-size is > what is left in other_aggr->size and < other_aggr->alloc_size
- *	Result:
- *		A "other_aggr->alloc_size" block is allocated from file allocation for other_aggr
- *		The first block of 30 is allocated from other_aggr and should be aligned
- *		There is space of 2018 left in other_aggr->size
- *		EOA is 5120
- *
- *	Allocate second block (50) from sdata_aggr:
- *		(request-size+fragment size) < sdata_aggr->size
- *	Result:
- *		The second block of 50 is allocated from sdata_aggr and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[3102, 994]
- *		There is space of 974 left in sdata_aggr
- *
- *	Allocate third block (80) from sdata_aggr:
- *		(request-size+fragment size) is >= sdata_aggr->size
- *		request-size < sdata_aggr->alloc_size
- *		sdata_aggr is at EOA
- *	Result:
- *		Another block of sdata_aggr->alloc_size is extended from file allocation for sdata_aggr
- *		The third block of 80 is allocated from sdata_aggr and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[4146, 974]
- *		There is space of 1968 left in sdata_aggr
- *		EOA is 7168
- *
- *	Allocate third block (1034) from meta_aggregator:
- *		(request-size + alignment) > meta_aggr->size but < meta_aggr->alloc_size
- *		sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
- *	Result:
- *		The unused space in sdata_aggr is freed to free-space [5200, 1968] then shrunk
- *		sdata_aggr is reset to 0
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space [5200, 944]
- *		The unused space in meta_aggr is freed to free-space [2098, 974]
- *		The meta_aggr is updated to point to the new space
- *		The block of 1034 is allocated from the new block and should be aligned
- *		There is space of 1014 left in meta_aggr
- *		EOA is 8192
- *
- * Alignment = 4096 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size is > what is left in aggr->size and < aggr->alloc_size
- *	Result:
- *		A meta_aggr->alloc block is allocated from file allocation for the aggregator
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of file allocation is freed to free-space:[800, 3296]
- *		There is space of 2018 left in meta_aggr
- *		EOA is at 6144
- *
- *	Allocate second block (50) from meta_aggr:
- *		(request-size + fragment size) is > what is left in aggr->size
- *		request-size < aggr->alloc_size
- *		fragment size > (aggr->alloc_size - request-size)
- *	Result:
- *		A block of aggr->alloc_size + (fragment size - (aggr->alloc_size - request-size))
- *			is extended from file allocation for the aggregator
- *		The second block of 50 is allocated from the aggregator and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
- *		There is space of 2018 left in meta_aggr
- *		EOA is at 10260
- *
- *	Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
- *		request-size > sdata_aggr->size and < sdata_aggr->alloc_size
- *		meta_aggr is at EOA and has used up more than meta_aggr->alloc_size
- *	Result:
- *		The remaining space in meta_aggr is freed to free-space [8242, 2018] and shrunk
- *			since at EOF
- *		meta_aggr is reset to 0
- *		A block of sdata_aggr->alloc_size is obtained via file allocation
- *		Fragment from alignment of file allocation is freed to free-space: [8242, 4046]
- *		The first block of 30 is allocated from sdata_aggr and should be aligned
- *		There is space of 2018 left in sdata_aggr
- *		EOA is 14336
- *
- *	Allocate second block (50) from sdata_aggr:
- *		request-size is > sdata_aggr->size
- *		request-size < sdata_aggr->alloc_size
- *		fragment size > (sdata_aggr->alloc_size - request-size)
- *	Result:
- *		A block of sdata_aggr->alloc_size + (fragment size - (sdata_aggr->alloc_size - request-size))
- *			is extended from file allocation for the aggregator
- *		Fragment from alignment of aggregator allocation is freed to free-space:[12318, 4066]
- *		The second block of 50 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in the sdata_aggr
- *		EOA is at 18452
- *
- *	Allocate third block (80) from sdata_aggr:
- *		request-size + fragment size is > sdata_aggr->size
- *		request-size < sdata_aggr->alloc_size
- *		fragment size > (sdata_aggr->alloc_size - request-size)
- *	Result:
- *		A block of sdata_aggr->alloc_size + (fragment size - (sdata_aggr->alloc_size - request-size)
- *			is allocated from file allocation for the aggregator
- *		Fragment from alignment of aggregator allocation is freed to free-space:[16434, 4046]
- *		The third block of 80 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in the sdata_aggr
- *		EOA is at 22578
- *
- *	Allocate third block (1034) from meta_aggregator:
- *		(request-size + fragment size) is > meta_aggr->size but request-size < meta_aggr->alloc_size
- *		sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
- *	Result:
- *		The remaining space in sdata_aggr is freed to free-space [20560, 2018] then shrunk
- *		sdata_aggr is reset to 0
- *		There is nothing in meta_aggr
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space [20560, 4016]
- *		EOA is 26624
- *		The meta_aggr is updated to point to the new space
- *		The block of 1034 is allocated from the new block and should be aligned
- *		There is space of 1014 left in meta_aggr
+ * Alignment = 1024     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size is > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation for the aggregator
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 224]
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is 3072
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        (request-size+fragment size) is <= aggr->size
+ *    Result:
+ *        The second block of 50 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
+ *        There is space of 974 left in the aggregator
+ *
+ *    Allocate first block (30) from other_aggr: (nothing in other_aggr)
+ *        request-size is > what is left in other_aggr->size and < other_aggr->alloc_size
+ *    Result:
+ *        A "other_aggr->alloc_size" block is allocated from file allocation for other_aggr
+ *        The first block of 30 is allocated from other_aggr and should be aligned
+ *        There is space of 2018 left in other_aggr->size
+ *        EOA is 5120
+ *
+ *    Allocate second block (50) from sdata_aggr:
+ *        (request-size+fragment size) < sdata_aggr->size
+ *    Result:
+ *        The second block of 50 is allocated from sdata_aggr and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[3102, 994]
+ *        There is space of 974 left in sdata_aggr
+ *
+ *    Allocate third block (80) from sdata_aggr:
+ *        (request-size+fragment size) is >= sdata_aggr->size
+ *        request-size < sdata_aggr->alloc_size
+ *        sdata_aggr is at EOA
+ *    Result:
+ *        Another block of sdata_aggr->alloc_size is extended from file allocation for sdata_aggr
+ *        The third block of 80 is allocated from sdata_aggr and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[4146, 974]
+ *        There is space of 1968 left in sdata_aggr
+ *        EOA is 7168
+ *
+ *    Allocate third block (1034) from meta_aggregator:
+ *        (request-size + alignment) > meta_aggr->size but < meta_aggr->alloc_size
+ *        sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        The unused space in sdata_aggr is freed to free-space [5200, 1968] then shrunk
+ *        sdata_aggr is reset to 0
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space [5200, 944]
+ *        The unused space in meta_aggr is freed to free-space [2098, 974]
+ *        The meta_aggr is updated to point to the new space
+ *        The block of 1034 is allocated from the new block and should be aligned
+ *        There is space of 1014 left in meta_aggr
+ *        EOA is 8192
+ *
+ * Alignment = 4096     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size is > what is left in aggr->size and < aggr->alloc_size
+ *    Result:
+ *        A meta_aggr->alloc block is allocated from file allocation for the aggregator
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 3296]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is at 6144
+ *
+ *    Allocate second block (50) from meta_aggr:
+ *        (request-size + fragment size) is > what is left in aggr->size
+ *        request-size < aggr->alloc_size
+ *        fragment size > (aggr->alloc_size - request-size)
+ *    Result:
+ *        A block of aggr->alloc_size + (fragment size - (aggr->alloc_size - request-size))
+ *            is extended from file allocation for the aggregator
+ *        The second block of 50 is allocated from the aggregator and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is at 10260
+ *
+ *    Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
+ *        request-size > sdata_aggr->size and < sdata_aggr->alloc_size
+ *        meta_aggr is at EOA and has used up more than meta_aggr->alloc_size
+ *    Result:
+ *        The remaining space in meta_aggr is freed to free-space [8242, 2018] and shrunk
+ *            since at EOF
+ *        meta_aggr is reset to 0
+ *        A block of sdata_aggr->alloc_size is obtained via file allocation
+ *        Fragment from alignment of file allocation is freed to free-space: [8242, 4046]
+ *        The first block of 30 is allocated from sdata_aggr and should be aligned
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is 14336
+ *
+ *    Allocate second block (50) from sdata_aggr:
+ *        request-size is > sdata_aggr->size
+ *        request-size < sdata_aggr->alloc_size
+ *        fragment size > (sdata_aggr->alloc_size - request-size)
+ *    Result:
+ *        A block of sdata_aggr->alloc_size + (fragment size - (sdata_aggr->alloc_size - request-size))
+ *            is extended from file allocation for the aggregator
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[12318, 4066]
+ *        The second block of 50 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in the sdata_aggr
+ *        EOA is at 18452
+ *
+ *    Allocate third block (80) from sdata_aggr:
+ *        request-size + fragment size is > sdata_aggr->size
+ *        request-size < sdata_aggr->alloc_size
+ *        fragment size > (sdata_aggr->alloc_size - request-size)
+ *    Result:
+ *        A block of sdata_aggr->alloc_size + (fragment size - (sdata_aggr->alloc_size - request-size)
+ *            is allocated from file allocation for the aggregator
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[16434, 4046]
+ *        The third block of 80 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in the sdata_aggr
+ *        EOA is at 22578
+ *
+ *    Allocate third block (1034) from meta_aggregator:
+ *        (request-size + fragment size) is > meta_aggr->size but request-size < meta_aggr->alloc_size
+ *        sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        The remaining space in sdata_aggr is freed to free-space [20560, 2018] then shrunk
+ *        sdata_aggr is reset to 0
+ *        There is nothing in meta_aggr
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space [20560, 4016]
+ *        EOA is 26624
+ *        The meta_aggr is updated to point to the new space
+ *        The block of 1034 is allocated from the new block and should be aligned
+ *        There is space of 1014 left in meta_aggr
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size;
-    H5FD_mem_t 		type, stype;
-    haddr_t		addr1, addr2, addr3;
-    haddr_t		saddr1, saddr2, saddr3;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, addr3;
+    haddr_t        saddr1, saddr2, saddr3;
     H5FS_stat_t state[H5FD_MEM_NTYPES];
-    haddr_t 		ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, sdata_size=0, mis_align=0;
-    hsize_t		alignment=0, tmp=0;
+    haddr_t         ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, sdata_size=0, mis_align=0;
+    hsize_t        alignment=0, tmp=0;
     hbool_t             have_alloc_vfd;        /* Whether VFD used has an 'alloc' callback */
 
 
@@ -5163,15 +5163,15 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
             TEST_ERROR
 
         /* Verify total size of free space after all allocations */
-	if(f->shared->fs_man[type]) {
-	    if(check_stats(f, f->shared->fs_man[type], &(state[type])))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[type]) {
+        if(check_stats(f, f->shared->fs_man[type], &(state[type])))
+        TEST_ERROR
+    }
 
-	if(f->shared->fs_man[stype]) {
-	    if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[stype]) {
+        if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
+        TEST_ERROR
+    }
 
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
@@ -5179,15 +5179,15 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_align_alloc3() */
@@ -5197,81 +5197,81 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks allocated from the aggregator are aligned
  *
- * Alignment = 4096 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[800, 224]
- *		The first block of 30 is allocated from meta_aggr and should be aligned
- *		There is space of 2018 left in meta_aggr
- *		EOA is 3072
- *
- *	Allocate second block (2058) from meta_aggr:
- *		(request-size+fragment) is > meta_aggr->size and request-size is > meta_aggr->alloc_size
- *		meta_aggr is at EOA
- *	Result:
- *		The second block of 2058 + fragment is extended and merged together with meta_aggr
- *		The block of 2058 is allocated out of the aggregator
- *		Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
- *		There is space of 2018 (same as before) left in meta_aggr
- *		EOA is 6124
- *
- *	Allocate third block (5) from meta_aggr:
- *		request-size+fragment < meta_aggr->size
- *	Result:
- *		A block of 5 is allocated from the aggregator
- *		Fragment from alignment of aggregator allocation is freed to free-space:[4106, 1014]
- *		There is space of 999 left in meta_aggr
- *
- * Alignment = 4096 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size is > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[800, 3296]
- *		The first block of 30 is allocated from meta_aggr and should be aligned
- *		There is space of 2018 left in meta_aggr
- *		EOA is 6144
- *
- *	Allocate second block (2058) from meta_aggr:
- *		(request-size+fragment) is > meta_aggr->size and request-size is > meta_aggr->alloc_size
- *		meta_aggr is at EOA
- *	Result:
- *		The second block of 2058 + fragment is extended and merged together with meta_aggr
- *		The block of 2058 is allocated out of the aggregator
- *		Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
- *		There is space of 2018 (same as before) left in meta_aggr
- *		EOA is 12268
- *
- *	Allocate third block (5) from meta_aggr:
- *		request-size+fragment is > meta_aggr->size
- *		request-size < meta_aggr->alloc_size
- *		fragment < (meta_aggr->alloc_size - request-size)
- *		meta_aggr is at EOA
- *	Result:
- *		A block of meta_aggr->alloc_size is extended from file allocation for the aggregator
- *		A block of 5 is allocated from the aggregator
- *		Fragment from alignment of aggregator allocation is freed to free-space:[10250, 2038]
- *		There is space of 2023 left in meta_aggr
+ * Alignment = 4096     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 224]
+ *        The first block of 30 is allocated from meta_aggr and should be aligned
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is 3072
+ *
+ *    Allocate second block (2058) from meta_aggr:
+ *        (request-size+fragment) is > meta_aggr->size and request-size is > meta_aggr->alloc_size
+ *        meta_aggr is at EOA
+ *    Result:
+ *        The second block of 2058 + fragment is extended and merged together with meta_aggr
+ *        The block of 2058 is allocated out of the aggregator
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[1054, 994]
+ *        There is space of 2018 (same as before) left in meta_aggr
+ *        EOA is 6124
+ *
+ *    Allocate third block (5) from meta_aggr:
+ *        request-size+fragment < meta_aggr->size
+ *    Result:
+ *        A block of 5 is allocated from the aggregator
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[4106, 1014]
+ *        There is space of 999 left in meta_aggr
+ *
+ * Alignment = 4096     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size is > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 3296]
+ *        The first block of 30 is allocated from meta_aggr and should be aligned
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is 6144
+ *
+ *    Allocate second block (2058) from meta_aggr:
+ *        (request-size+fragment) is > meta_aggr->size and request-size is > meta_aggr->alloc_size
+ *        meta_aggr is at EOA
+ *    Result:
+ *        The second block of 2058 + fragment is extended and merged together with meta_aggr
+ *        The block of 2058 is allocated out of the aggregator
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[4126, 4066]
+ *        There is space of 2018 (same as before) left in meta_aggr
+ *        EOA is 12268
+ *
+ *    Allocate third block (5) from meta_aggr:
+ *        request-size+fragment is > meta_aggr->size
+ *        request-size < meta_aggr->alloc_size
+ *        fragment < (meta_aggr->alloc_size - request-size)
+ *        meta_aggr is at EOA
+ *    Result:
+ *        A block of meta_aggr->alloc_size is extended from file allocation for the aggregator
+ *        A block of 5 is allocated from the aggregator
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[10250, 2038]
+ *        There is space of 2023 left in meta_aggr
  *
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size;
-    H5FD_mem_t 		type;
-    haddr_t		addr1, addr2, addr3;
+    H5FD_mem_t         type;
+    haddr_t        addr1, addr2, addr3;
     H5FS_stat_t     state;
-    haddr_t 		ma_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, saved_ma_size=0;
-    hsize_t		alignment=0, mis_align=0, tmp=0;
+    haddr_t         ma_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, saved_ma_size=0;
+    hsize_t        alignment=0, mis_align=0, tmp=0;
     hbool_t             have_alloc_vfd;        /* Whether VFD used has an 'alloc' callback */
 
 
@@ -5377,10 +5377,10 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if(addr3 % alignment) TEST_ERROR
 
         /* Verify total size of free space after all allocations */
-	if(f->shared->fs_man[type]) {
-	    if(check_stats(f, f->shared->fs_man[type], &state))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[type]) {
+        if(check_stats(f, f->shared->fs_man[type], &state))
+        TEST_ERROR
+    }
 
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
@@ -5388,15 +5388,15 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_align_alloc4() */
@@ -5405,79 +5405,79 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks allocated from the aggregator are aligned
  *
- * Alignment = 1024 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[800, 224]
- *		The first block of 30 is allocated from meta_aggr and should be aligned
- *		There is space of 2018 left in meta_aggr
- *		EOA is 3072
- *
- *	Allocate first block (30) from sdata_aggr: (nothing in the aggregator)
- *		A block of sdata_aggr->alloc_size is allocated from file allocation
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in sdata_aggr
- *		EOA is 5120
- *
- *	Allocate second block (2058) from meta_aggr:
- *		(request-size + fragment size) > meta_aggr->size and > meta_aggr->alloc_size
- *		sdata_aggr is at EOA but has not used up sdata_aggr->alloc_size
- *	Result:
- *		A block of 2058 is allocated from file allocation
- *		EOA is 7178
- *		Nothing is changed in meta_aggr and sdata_aggr
- *
- * Alignment = 4096 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size is > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[800, 3296]
- *		The first block of 30 is allocated from meta_aggr and should be aligned
- *		There is space of 2018 left in meta_aggr
- *		EOA is 6144
- *
- *	Allocate first block (30) from sdata_aggr: (meta_aggr is empty)
- *		meta_aggr is at EOA but has not used up more than meta_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[6144, 2048]
- *		This fragment adjoins meta_aggr and fulfills "absorb" condition,
- *			the remaining space left in meta_aggr is absorbed into the fragment and
- *			freed to free-space: [4126, 2018]
- *		meta_aggr is reset to 0
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in sdata_aggr
- *		EOA is 10240
- *
- *	Allocate second block (2058) from meta_aggr:
- *		request-size + fragment size is > meta_aggr->size
- *		request_size is > meta_aggr->alloc_size
- *		sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
- *	Result:
- *		A block of 2058 is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[10240, 2048]
- *		This fragment adjoins sdata_aggr and fulfills "absorb" condition,
- *			the remaining space left in sdata_aggr is absorbed into the fragment and
- *			freed to free-space: [8222, 2018]
- *		sdata_aggr is reset to 0
- *		EOA is 14346
- *		meta_aggr and sdata_aggr are all 0
+ * Alignment = 1024     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 224]
+ *        The first block of 30 is allocated from meta_aggr and should be aligned
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is 3072
+ *
+ *    Allocate first block (30) from sdata_aggr: (nothing in the aggregator)
+ *        A block of sdata_aggr->alloc_size is allocated from file allocation
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is 5120
+ *
+ *    Allocate second block (2058) from meta_aggr:
+ *        (request-size + fragment size) > meta_aggr->size and > meta_aggr->alloc_size
+ *        sdata_aggr is at EOA but has not used up sdata_aggr->alloc_size
+ *    Result:
+ *        A block of 2058 is allocated from file allocation
+ *        EOA is 7178
+ *        Nothing is changed in meta_aggr and sdata_aggr
+ *
+ * Alignment = 4096     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size is > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 3296]
+ *        The first block of 30 is allocated from meta_aggr and should be aligned
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is 6144
+ *
+ *    Allocate first block (30) from sdata_aggr: (meta_aggr is empty)
+ *        meta_aggr is at EOA but has not used up more than meta_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[6144, 2048]
+ *        This fragment adjoins meta_aggr and fulfills "absorb" condition,
+ *            the remaining space left in meta_aggr is absorbed into the fragment and
+ *            freed to free-space: [4126, 2018]
+ *        meta_aggr is reset to 0
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is 10240
+ *
+ *    Allocate second block (2058) from meta_aggr:
+ *        request-size + fragment size is > meta_aggr->size
+ *        request_size is > meta_aggr->alloc_size
+ *        sdata_aggr is at EOA but has not used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        A block of 2058 is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[10240, 2048]
+ *        This fragment adjoins sdata_aggr and fulfills "absorb" condition,
+ *            the remaining space left in sdata_aggr is absorbed into the fragment and
+ *            freed to free-space: [8222, 2018]
+ *        sdata_aggr is reset to 0
+ *        EOA is 14346
+ *        meta_aggr and sdata_aggr are all 0
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size;
-    H5FD_mem_t 		type, stype;
-    haddr_t		addr1, addr2, saddr1;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2, saddr1;
     H5FS_stat_t state[H5FD_MEM_NTYPES];
     haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF;
     haddr_t 		sdata_addr=HADDR_UNDEF, new_sdata_addr=HADDR_UNDEF;
@@ -5585,15 +5585,15 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         }
 
         /* Verify total size of free space after all allocations */
-	if(f->shared->fs_man[type]) {
-	    if(check_stats(f, f->shared->fs_man[type], &(state[type])))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[type]) {
+        if(check_stats(f, f->shared->fs_man[type], &(state[type])))
+        TEST_ERROR
+    }
 
-	if(f->shared->fs_man[stype]) {
-	    if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[stype]) {
+        if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
+        TEST_ERROR
+    }
 
         /* nothing is changed in meta_aggr */
         H5MF__aggr_query(f, &(f->shared->meta_aggr), &new_ma_addr, &new_ma_size);
@@ -5611,15 +5611,15 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
     return(0);
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_mf_align_alloc5() */
@@ -5629,125 +5629,125 @@ error:
  *-------------------------------------------------------------------------
  * To verify that blocks allocated from the aggregator are aligned
  *
- * Alignment = 1024 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is empty)
- *		request-size is > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[800, 224]
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in meta_aggr->size
- *		EOA is 3072
- *
- *	Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
- *		request_size > sdata_aggr->size and < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is allocated from file allocation
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in sdata_aggr
- *		EOA is 5120
- *
- *	Allocate second block (50) from sdata_aggr:
- *		(request-size+fragment size) <= sdata_aggr->size
- *	Result:
- *		The second block of 50 is allocated from sdata_aggr and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[3102, 994]
- *		There is space of 974 left in sdata_aggr
- *
- *	Allocate third block (80) from sdata_aggr:
- *		(request-size+fragment size) > sdata_aggr->size
- *		request-size < sdata_aggr->alloc_size
- *		fragment size < (sdata_aggr->alloc_size - request-size)
- *	Result:
- *		Another block of sdata_aggr->alloc_size block is extended from file allocation
- *			for sdata_aggr
- *		The third block of 80 is allocated from sdata_aggr and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[4146, 974]
- *		There is space of 1968 left in sdata_aggr
- *		EOA is 7168
- *
- *	Allocate second block (2058) from meta_aggr:
- *		request-size + fragment size is > meta_aggr->size
- *		request-size is > meta_aggr->alloc_size
- *		sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
- *	Result:
- *		The remaining space in sdata_aggr is freed to free-space and shrunk
- *		sdata_aggr is reset to 0
- *		A block of 2058 is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[5200, 944]
- *		EOA is at 8202
- *		meta_aggr is unchanged
- *
- * Alignment = 4096 	aggr->alloc_size = 2048
- *
- *	Allocate first block (30) from meta_aggr: (meta_aggr is emtpy)
- *		request-size is > meta_aggr->size and < meta_aggr->alloc_size
- *	Result:
- *		A block of meta_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[800, 3296]
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in meta_aggr
- *		EOA is 6144
- *
- *	Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
- *		request_size > sdata_aggr->size and < sdata_aggr->alloc_size
- *	Result:
- *		A block of sdata_aggr->alloc_size is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space: [6144, 2048]
- *		The first block of 30 is allocated from the aggregator and should be aligned
- *		There is space of 2018 left in sdata_aggr
- *		EOA is 10240
- *
- *	Allocate second block (50) from sdata_aggr:
- *		(request-size+fragment size) is > sdata_aggr->size
- *		request-size < sdata_aggr->alloc_size
- *		fragment size > (sdata_aggr->alloc_size - request-size)
- *	Result:
- *		A block of (fragment size + request-size) is extended from file allocation for the aggregator
- *		The second block of 50 is allocated from sdata_aggr and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[8222, 4066]
- *		There is space of 2018 left in sdata_aggr
- *		EOA is at 14356
- *
- *	Allocate third block (80) from sdata_aggr:
- *		(request-size+fragment size) is > sdata_aggr->size
- *		request-size < sdata_aggr->alloc_size
- *		fragment size > (sdata_aggr->alloc_size - request-size)
- *	Result:
- *		A block of (fragment size + request-size) is extended from file allocation for sdata_aggr
- *		The third block of 80 is allocated from sdata_aggr and should be aligned
- *		Fragment from alignment of aggregator allocation is freed to free-space:[12338, 4046]
- *		There is space of 2018 left in sdata_aggr
- *		EOA is 18482
- *
- *	Allocate second block (2058) from meta_aggr:
- *		request-size + fragment size is > meta_aggr->size
- *		request-size is > meta_aggr->alloc_size
- *		sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
- *	Result:
- *		The remaining space in sdata_aggr is freed to free-space and shrunk: [16464, 2018]
- *		sdata_aggr is reset to 0
- *		A block of 2058 is allocated from file allocation
- *		Fragment from alignment of file allocation is freed to free-space:[16464, 4016]
- *		EOA is at 22538
- *		meta_aggr is unchanged
+ * Alignment = 1024     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is empty)
+ *        request-size is > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 224]
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in meta_aggr->size
+ *        EOA is 3072
+ *
+ *    Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
+ *        request_size > sdata_aggr->size and < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is allocated from file allocation
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is 5120
+ *
+ *    Allocate second block (50) from sdata_aggr:
+ *        (request-size+fragment size) <= sdata_aggr->size
+ *    Result:
+ *        The second block of 50 is allocated from sdata_aggr and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[3102, 994]
+ *        There is space of 974 left in sdata_aggr
+ *
+ *    Allocate third block (80) from sdata_aggr:
+ *        (request-size+fragment size) > sdata_aggr->size
+ *        request-size < sdata_aggr->alloc_size
+ *        fragment size < (sdata_aggr->alloc_size - request-size)
+ *    Result:
+ *        Another block of sdata_aggr->alloc_size block is extended from file allocation
+ *            for sdata_aggr
+ *        The third block of 80 is allocated from sdata_aggr and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[4146, 974]
+ *        There is space of 1968 left in sdata_aggr
+ *        EOA is 7168
+ *
+ *    Allocate second block (2058) from meta_aggr:
+ *        request-size + fragment size is > meta_aggr->size
+ *        request-size is > meta_aggr->alloc_size
+ *        sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        The remaining space in sdata_aggr is freed to free-space and shrunk
+ *        sdata_aggr is reset to 0
+ *        A block of 2058 is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[5200, 944]
+ *        EOA is at 8202
+ *        meta_aggr is unchanged
+ *
+ * Alignment = 4096     aggr->alloc_size = 2048
+ *
+ *    Allocate first block (30) from meta_aggr: (meta_aggr is emtpy)
+ *        request-size is > meta_aggr->size and < meta_aggr->alloc_size
+ *    Result:
+ *        A block of meta_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[800, 3296]
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in meta_aggr
+ *        EOA is 6144
+ *
+ *    Allocate first block (30) from sdata_aggr: (sdata_aggr is empty)
+ *        request_size > sdata_aggr->size and < sdata_aggr->alloc_size
+ *    Result:
+ *        A block of sdata_aggr->alloc_size is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space: [6144, 2048]
+ *        The first block of 30 is allocated from the aggregator and should be aligned
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is 10240
+ *
+ *    Allocate second block (50) from sdata_aggr:
+ *        (request-size+fragment size) is > sdata_aggr->size
+ *        request-size < sdata_aggr->alloc_size
+ *        fragment size > (sdata_aggr->alloc_size - request-size)
+ *    Result:
+ *        A block of (fragment size + request-size) is extended from file allocation for the aggregator
+ *        The second block of 50 is allocated from sdata_aggr and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[8222, 4066]
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is at 14356
+ *
+ *    Allocate third block (80) from sdata_aggr:
+ *        (request-size+fragment size) is > sdata_aggr->size
+ *        request-size < sdata_aggr->alloc_size
+ *        fragment size > (sdata_aggr->alloc_size - request-size)
+ *    Result:
+ *        A block of (fragment size + request-size) is extended from file allocation for sdata_aggr
+ *        The third block of 80 is allocated from sdata_aggr and should be aligned
+ *        Fragment from alignment of aggregator allocation is freed to free-space:[12338, 4046]
+ *        There is space of 2018 left in sdata_aggr
+ *        EOA is 18482
+ *
+ *    Allocate second block (2058) from meta_aggr:
+ *        request-size + fragment size is > meta_aggr->size
+ *        request-size is > meta_aggr->alloc_size
+ *        sdata_aggr is at EOA and has used up more than sdata_aggr->alloc_size
+ *    Result:
+ *        The remaining space in sdata_aggr is freed to free-space and shrunk: [16464, 2018]
+ *        sdata_aggr is reset to 0
+ *        A block of 2058 is allocated from file allocation
+ *        Fragment from alignment of file allocation is freed to free-space:[16464, 4016]
+ *        EOA is at 22538
+ *        meta_aggr is unchanged
  *-------------------------------------------------------------------------
  */
 static unsigned
 test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
 {
-    hid_t		file = -1;              /* File ID */
-    char		filename[FILENAME_LEN]; /* Filename to use */
-    H5F_t		*f = NULL;              /* Internal file object pointer */
+    hid_t        file = -1;              /* File ID */
+    char        filename[FILENAME_LEN]; /* Filename to use */
+    H5F_t        *f = NULL;              /* Internal file object pointer */
     h5_stat_size_t      file_size;
-    H5FD_mem_t 		type, stype;
-    haddr_t		addr1, addr2;
-    haddr_t		saddr1, saddr2, saddr3;
+    H5FD_mem_t         type, stype;
+    haddr_t        addr1, addr2;
+    haddr_t        saddr1, saddr2, saddr3;
     H5FS_stat_t state[H5FD_MEM_NTYPES];
-    haddr_t 		ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
-    hsize_t 		ma_size=0, new_ma_size=0, sdata_size=0;
-    hsize_t		alignment=0, mis_align=0, tmp=0;
+    haddr_t         ma_addr=HADDR_UNDEF, new_ma_addr=HADDR_UNDEF, sdata_addr=HADDR_UNDEF;
+    hsize_t         ma_size=0, new_ma_size=0, sdata_size=0;
+    hsize_t        alignment=0, mis_align=0, tmp=0;
     hbool_t             have_alloc_vfd;        /* Whether VFD used has an 'alloc' callback */
 
     TESTING("H5MF_alloc() of meta/sdata aggregator with alignment: test 6");
@@ -5900,16 +5900,16 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         if (sdata_addr != HADDR_UNDEF || sdata_size != 0)
             TEST_ERROR
 
-	if(f->shared->fs_man[type]) {
-	    if(check_stats(f, f->shared->fs_man[type], &(state[type])))
-		TEST_ERROR
-	}
-	
+    if(f->shared->fs_man[type]) {
+        if(check_stats(f, f->shared->fs_man[type], &(state[type])))
+        TEST_ERROR
+    }
+
 
-	if(f->shared->fs_man[stype]) {
-	    if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
-		TEST_ERROR
-	}
+    if(f->shared->fs_man[stype]) {
+        if(check_stats(f, f->shared->fs_man[stype], &(state[stype])))
+        TEST_ERROR
+    }
 
         if(H5Fclose(file) < 0)
             FAIL_STACK_ERROR
@@ -5917,17 +5917,17 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
         PASSED()
     } /* end if */
     else {
-	SKIPPED();
-	puts("    Current VFD doesn't support mis-aligned fragments");
+        SKIPPED();
+        HDputs("    Current VFD doesn't support mis-aligned fragments");
     } /* end else */
 
-    return(0);
+    return 0;
 
 error:
     H5E_BEGIN_TRY {
-	H5Fclose(file);
+        H5Fclose(file);
     } H5E_END_TRY;
-    return(1);
+    return 1;
 } /* test_mf_align_alloc6() */
 
 /*
@@ -6135,18 +6135,18 @@ test_mf_fs_persist_split(void)
     if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
 
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     /* Set up split driver */
     if(H5Pset_fapl_split(fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT)<0)
-    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     /* File creation property list template */
     if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
-    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     /* Set the filename to use for this test (dependent on fapl) */
     h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
@@ -6311,7 +6311,7 @@ test_mf_fs_persist_split(void)
 
     /* Retrieve block #3 from H5FD_MEM_SUPER free-space manager */
     if(HADDR_UNDEF == (tmp_addr = H5MF_alloc(f, type, (hsize_t)TBLOCK_SIZE3)))
-    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
     if(tmp_addr != addr3)
         TEST_ERROR
 
@@ -9002,12 +9002,12 @@ main(void)
 
     if(nerrors)
         goto error;
-    puts("All free-space manager tests for file memory passed.");
+    HDputs("All free-space manager tests for file memory passed.");
 
     return(0);
 
 error:
-    puts("*** TESTS FAILED ***");
+    HDputs("*** TESTS FAILED ***");
     H5E_BEGIN_TRY {
         H5Pclose(fapl);
         H5Pclose(new_fapl);
diff --git a/test/mtime.c b/test/mtime.c
index 80730eb..f7a441d 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -15,10 +15,10 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Thursday, July 30, 1998
  *
- * Purpose:	Determines if the modification time message is working
- *		properly.  Specifically, the code in H5O_mtime_decode() is
- *		very OS-dependent and this test tries to figure out if it's
- *		working properly.
+ * Purpose:    Determines if the modification time message is working
+ *        properly.  Specifically, the code in H5O_mtime_decode() is
+ *        very OS-dependent and this test tries to figure out if it's
+ *        working properly.
  */
 #include "h5test.h"
 #include "H5srcdir.h"
@@ -33,17 +33,17 @@ const char *FILENAME[] = {
 #define TESTFILE2       "tmtimen.h5"
 #define MTIME2          1041606478
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	H5O_mtime_decode() test.
+ * Purpose:    H5O_mtime_decode() test.
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, July 30, 1998
  *
  * Modifications:
@@ -58,13 +58,13 @@ const char *FILENAME[] = {
 int
 main(void)
 {
-    hid_t	fapl, file, space, dset;
-    hsize_t	size[1] = {2};
-    time_t	now;
-    struct tm	*tm;
-    H5O_info_t	oi1, oi2;
-    signed char	buf1[32], buf2[32];
-    char	filename[1024];
+    hid_t    fapl, file, space, dset;
+    hsize_t    size[1] = {2};
+    time_t    now;
+    struct tm    *tm;
+    H5O_info_t    oi1, oi2;
+    signed char    buf1[32], buf2[32];
+    char    filename[1024];
 
     h5_reset();
     fapl = h5_fileaccess();
@@ -99,18 +99,18 @@ main(void)
     /* Compare addresses & times from the two ways of calling H5Oget_info() */
     if(oi1.addr != oi2.addr || oi1.ctime != oi2.ctime) {
         H5_FAILED();
-        puts("    Calling H5Oget_info() with the dataset ID returned");
-        puts("    different values than calling it with a file and dataset");
-        puts("    name.");
+        HDputs("    Calling H5Oget_info() with the dataset ID returned");
+        HDputs("    different values than calling it with a file and dataset");
+        HDputs("    name.");
         goto error;
     }
 
     /* Compare times -- they must be within 60 seconds of one another */
     if(0 == oi1.ctime) {
         SKIPPED();
-        puts("    The modification time could not be decoded on this OS.");
-        puts("    Modification times will be mantained in the file but");
-        puts("    cannot be queried on this system.  See H5O_mtime_decode().");
+        HDputs("    The modification time could not be decoded on this OS.");
+        HDputs("    Modification times will be mantained in the file but");
+        HDputs("    cannot be queried on this system.  See H5O_mtime_decode().");
         return 0;
     } else if(HDfabs(HDdifftime(now, oi1.ctime)) > (double)60.0F) {
         H5_FAILED();
@@ -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();
@@ -147,7 +147,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 */
@@ -168,14 +168,14 @@ main(void)
                 TEST_ERROR;
             if(oi2.ctime != MTIME2) {
                H5_FAILED();
-               puts("    Modification time incorrect.");
+               HDputs("    Modification time incorrect.");
                goto error;
             }
             if(H5Fclose(file) < 0) TEST_ERROR;
         }
         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 */
@@ -186,7 +186,7 @@ main(void)
     if(h5_verify_cached_stabs(FILENAME, fapl) < 0) TEST_ERROR
 
     /* All looks good */
-    puts("All modification time tests passed.");
+    HDputs("All modification time tests passed.");
     h5_cleanup(FILENAME, fapl);
     return 0;
 
diff --git a/test/ntypes.c b/test/ntypes.c
index b6f4de7..83cdfd2 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 b4854d0..b0904d0 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -284,8 +284,6 @@ addr_reset(void)
  * Programmer:  Peter Cao
  *              Friday, August 4, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -345,8 +343,6 @@ error:
  * Programmer:  Peter Cao
  *              Monday, March 5, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -422,8 +418,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, August 4, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -517,8 +511,6 @@ error:
  * Programmer:  Peter Cao
  *              Saturday, December 17, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -579,8 +571,6 @@ done:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -602,7 +592,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);
@@ -671,7 +661,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);
@@ -856,10 +846,6 @@ error:
  * Note:    This isn't very general, the attributes are assumed to be
  *              those written in test_copy_attach_attributes().
  *
- * Modifier:    Peter Cao
- *              Wednesday, March 21, 2007
- *              Change to compare any attributes of two objects
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1471,7 +1457,7 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags)
                     case H5O_TYPE_UNKNOWN:
                     case H5O_TYPE_NTYPES:
                     default:
-HDassert(0 && "Unknown type of object");
+                        HDassert(0 && "Unknown type of object");
                         break;
                 } /* end switch */
 
@@ -1569,8 +1555,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1858,8 +1842,6 @@ error:
  * Programmer:  Neil
  *              Friday, March 11, 2011
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1999,8 +1981,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2149,7 +2129,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src)
             buf[i][j] = 10000 + 100*i+j;
 
     /* Create a file access property list for destination file */
-    if ((fapl_dst = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR
+    if ((fapl_dst = h5_fileaccess()) < 0) TEST_ERROR
 
     /* Initialize the filenames */
     h5_fixname(FILENAME[4], fapl_src, src_fname, sizeof src_fname);
@@ -2293,8 +2273,6 @@ error:
  * Programmer:  Neil Fortner
  *              Thursday, January 15, 2009
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2518,8 +2496,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -2650,8 +2626,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -4395,8 +4369,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -5870,6 +5842,8 @@ compare_attribute_compound_vlstr(hid_t loc, hid_t loc2)
 {
     hid_t aid = -1, aid2 = -1;    /* Attribute IDs */
     hid_t tid = -1, tid2 = -1;    /* Datatype IDs */
+    hid_t sid = -1, sid2 = -1;    /* Dataspace IDs */
+    hid_t dxpl_id = -1;
     typedef struct {        /* Compound structure for the attribute */
     int i;
     char *v;
@@ -5889,6 +5863,12 @@ compare_attribute_compound_vlstr(hid_t loc, hid_t loc2)
     if((tid2 = H5Aget_type(aid2)) < 0)
     FAIL_STACK_ERROR
 
+    /* Get the attributes' dataspaces */
+    if((sid = H5Aget_space(aid)) < 0)
+    FAIL_STACK_ERROR
+    if((sid2 = H5Aget_space(aid2)) < 0)
+    FAIL_STACK_ERROR
+
     /* Read the attributes */
     if(H5Aread(aid, tid, &rbuf) < 0)
     FAIL_STACK_ERROR
@@ -5903,6 +5883,19 @@ compare_attribute_compound_vlstr(hid_t loc, hid_t loc2)
     if(HDmemcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v)))
     FAIL_STACK_ERROR
 
+    /* Reclaim vlen buffer */
+    if((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR
+    if(H5Pset_vlen_mem_manager(dxpl_id, NULL, NULL, NULL, NULL) < 0) TEST_ERROR
+    if(H5Dvlen_reclaim(tid, sid, dxpl_id, &rbuf) < 0) TEST_ERROR
+    if(H5Dvlen_reclaim(tid, sid, dxpl_id, &rbuf2) < 0) TEST_ERROR
+    if(H5Pclose(dxpl_id) < 0) TEST_ERROR
+
+    /* Close the dataspaces */
+    if(H5Sclose(sid) < 0)
+    FAIL_STACK_ERROR
+    if(H5Sclose(sid2) < 0)
+    FAIL_STACK_ERROR
+
     /* Close the attributes */
     if(H5Aclose(aid) < 0)
     FAIL_STACK_ERROR
@@ -5914,8 +5907,13 @@ error:
     H5E_BEGIN_TRY {
         H5Aclose(aid);
         H5Aclose(aid2);
+        H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, &rbuf);
+        H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, &rbuf2);
+        H5Sclose(sid);
+        H5Sclose(sid2);
         H5Tclose(tid);
         H5Tclose(tid2);
+        H5Pclose(dxpl_id);
     } H5E_END_TRY;
     return FALSE;
 
@@ -6254,8 +6252,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -6349,8 +6345,6 @@ error:
  * Programmer:  Peter Cao
  *              August 8, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -6482,8 +6476,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -6665,15 +6657,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
@@ -6906,11 +6898,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 */
@@ -6997,12 +6989,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *              Neil Fortner
- *              Tuesday, February 16, 2010
- *              Modified test to test flags for expanding soft and external
- *              links.
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -7852,6 +7838,7 @@ test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open)
 {
     hid_t fid_src = -1, fid_dst = -1;           /* File IDs */
     hid_t did = -1, did2 = -1;                  /* Dataset IDs */
+    hid_t src_fapl = -1;                        /* Source file FAPL ID */
     const char *src_filename = H5_get_srcdir_filename(FILE_OLD_LAYOUT); /* Corrected test file name */
     char dst_filename[NAME_BUF_SIZE];
 
@@ -7912,6 +7899,7 @@ test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open)
 
 error:
     H5E_BEGIN_TRY {
+        H5Pclose(src_fapl);
         H5Dclose(did2);
         H5Dclose(did);
         H5Fclose(fid_dst);
@@ -7982,7 +7970,7 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     /* make a copy of the datatype for later use */
     if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create and set compact plist */
@@ -8136,7 +8124,7 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* make a copy of the datatype for later use */
     if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -8452,7 +8440,7 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_
     /* make a copy of the datatype for later use */
     if((tid_copy = H5Tcopy(tid)) < 0)TEST_ERROR
 
-    /* named data type */
+    /* named datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_VL, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
      /* create and set chunk plist */
@@ -10254,7 +10242,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src1, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -10278,7 +10266,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src2, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -10489,7 +10477,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid, NAME_GROUP_TOP "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset */
@@ -10516,7 +10504,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid, NAME_GROUP_TOP2 "/" NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset */
@@ -10761,7 +10749,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -10788,7 +10776,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "a" */
+    /* committed datatype "a" */
     if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -10797,7 +10785,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "b" */
+    /* committed datatype "b" */
     if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -11022,7 +11010,7 @@ test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* create anonymous committed data type */
+    /* create anonymous committed datatype */
     if((H5Tcommit_anon(fid_dst, tid, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create attribute at SRC file */
@@ -12812,7 +12800,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "a" */
+    /* committed datatype "a" */
     if((H5Tcommit2(fid_dst, "/a", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -12821,7 +12809,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type "b" */
+    /* committed datatype "b" */
     if((H5Tcommit2(fid_dst, "/b", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* close the datatype */
@@ -13141,7 +13129,7 @@ test_copy_set_get_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* create datatype */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)TEST_ERROR
 
-    /* committed data type */
+    /* committed datatype */
     if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* create dataset at SRC file */
@@ -13464,8 +13452,6 @@ error:
  * Programmer:  Peter Cao
  *               March 11, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -14103,8 +14089,6 @@ error:
  * Programmer:  Peter Cao
  *              Friday, September 30, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -14124,7 +14108,7 @@ main(void)
 
     ExpressMode = GetTestExpress();
     if (ExpressMode > 1)
-        printf("***Express test mode on.  Some tests may be skipped\n");
+        HDprintf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Copy the file access property list */
     if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
@@ -14160,40 +14144,40 @@ main(void)
 
         /* Test with and without shared messages */
         if(configuration & CONFIG_SHARE_SRC) {
-            puts("\nTesting with shared src messages:");
+            HDputs("\nTesting with shared src messages:");
             fcpl_src = fcpl_shared;
         }
         else {
-            puts("\nTesting without shared src messages:");
+            HDputs("\nTesting without shared src messages:");
             fcpl_src = H5P_DEFAULT;
         }
         if(configuration & CONFIG_SHARE_DST) {
-            puts("Testing with shared dst messages:");
+            HDputs("Testing with shared dst messages:");
             fcpl_dst = fcpl_shared;
             same_file = FALSE;
         }
         else {
-            puts("Testing without shared dst messages:");
+            HDputs("Testing without shared dst messages:");
             fcpl_dst = H5P_DEFAULT;
         }
 
         /* Set the FAPL for the source file's type of format */
         if(configuration & CONFIG_SRC_NEW_FORMAT) {
-            puts("Testing with latest format for source file:");
+            HDputs("Testing with latest format for source file:");
             src_fapl = fapl2;
 
             /* Test with and without dense attributes */
             if(configuration & CONFIG_DENSE) {
-                puts("Testing with dense attributes:");
+                HDputs("Testing with dense attributes:");
                 num_attributes_g = max_compact + 1;
             }
             else {
-                puts("Testing without dense attributes:");
+                HDputs("Testing without dense attributes:");
                 num_attributes_g = MAX(min_dense, 2) - 2;
             }
         } /* end if */
         else {
-        puts("Testing with oldest file format for source file:");
+            HDputs("Testing with oldest file format for source file:");
             src_fapl = fapl;
             num_attributes_g = 4;
         } /* end else */
@@ -14205,7 +14189,7 @@ main(void)
             same_file = FALSE;
         } /* end if */
         else {
-            puts("Testing with oldest file format for destination file:");
+            HDputs("Testing with oldest file format for destination file:");
             dst_fapl = fapl;
         } /* end else */
 
@@ -14381,7 +14365,7 @@ main(void)
         exit(EXIT_FAILURE);
     } /* end if */
 
-    puts ("All object copying tests passed.");
+    HDputs ("All object copying tests passed.");
 
     /* close property list.
      * NOTE: if this property list is not closed and the test is
diff --git a/test/ohdr.c b/test/ohdr.c
index c959e35..f97254e 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -1683,7 +1683,7 @@ main(void)
         /* Display info about testing */
         low_string = h5_get_version_string(low);
         high_string = h5_get_version_string(high);
-        sprintf(msg, "Using file format version: (%s, %s)", low_string,
+        HDsprintf(msg, "Using file format version: (%s, %s)", low_string,
                 high_string);
         HDputs(msg);
 
@@ -1917,7 +1917,7 @@ main(void)
     return 0;
 
 error:
-    puts("*** TESTS FAILED ***");
+    HDputs("*** TESTS FAILED ***");
     H5E_BEGIN_TRY {
         H5Fclose(file);
     } H5E_END_TRY;
diff --git a/test/page_buffer.c b/test/page_buffer.c
index 39d6340..93749a2 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -21,6 +21,10 @@
 
 #include "h5test.h"
 
+#include "H5CXprivate.h"        /* API Contexts                         */
+#include "H5Iprivate.h"
+#include "H5PBprivate.h"
+
 /*
  * This file needs to access private information from the H5F package.
  */
@@ -31,10 +35,6 @@
 #define H5F_TESTING
 #include "H5Fpkg.h"
 
-#include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Iprivate.h"
-#include "H5PBprivate.h"
-
 
 #define FILENAME_LEN            1024
 #define NUM_DSETS               5
diff --git a/test/reserved.c b/test/reserved.c
index d8d0c59..7e53d9c 100644
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -22,17 +22,17 @@ const char *FILENAME[] = {
 };
 
 /*-------------------------------------------------------------------------
- * Function:	rsrv_heap
+ * Function:    rsrv_heap
  *
- * Purpose:	Ensure that heaps reserve file address space.
- *			This function does this by creating datasets up to and past
- *			the limit of the file, then ensuring that an error (not an
- *			assert) was generated and that the file is readable.
+ * Purpose:    Ensure that heaps reserve file address space.
+ *            This function does this by creating datasets up to and past
+ *            the limit of the file, then ensuring that an error (not an
+ *            assert) was generated and that the file is readable.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	James Laird
+ * Programmer:    James Laird
  *              Nat Furrer
  *              Friday, May 28, 2004
  *
@@ -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;
@@ -135,17 +135,17 @@ error:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	rsrv_ohdr
+ * Function:    rsrv_ohdr
  *
- * Purpose:	Ensure that object headers reserve file address space.
- *			This function does this by creating attributes of a dataset
- *			past the limit of the file, then ensuring that an error (not
- *			an assert) was generated and that the file is readable.
+ * Purpose:    Ensure that object headers reserve file address space.
+ *            This function does this by creating attributes of a dataset
+ *            past the limit of the file, then ensuring that an error (not
+ *            an assert) was generated and that the file is readable.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	James Laird
+ * Programmer:    James Laird
  *              Nat Furrer
  *              Friday, May 28, 2004
  *
@@ -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);
@@ -257,20 +257,20 @@ error:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	rsrv_vlen
+ * Function:    rsrv_vlen
  *
- * Purpose:	Ensure that variable length datatypes properly ensure that
+ * Purpose:    Ensure that variable length datatypes properly ensure that
  *              enough file address space exists before writing.
- *		This function does this by creating a dataset containing
+ *        This function does this by creating a dataset containing
  *              variable length data past the limit of the file, then
  *              ensuring that an error (not an assert) was generated and
  *              that the file is readable.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	James Laird
- *		Nat Furrer
+ * Programmer:    James Laird
+ *        Nat Furrer
  *              Thursday, July 1, 2004
  *
  * Modifications:
@@ -401,15 +401,15 @@ error:
 #endif /* BROKEN */
 
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
  * Purpose:
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Nat Furrer and James Laird
+ * Programmer:    Nat Furrer and James Laird
  *              Thursday, July 1, 2004
  *
  * Modifications:
@@ -434,22 +434,22 @@ main(void)
         envval = "nomatch";
 /* QAK: should be able to use the core driver? */
     if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) {
-	num_errs+=rsrv_ohdr();
-	num_errs+=rsrv_heap();
-	num_errs+=rsrv_vlen();
-
-	if(num_errs > 0)
-	    printf("**** %d FAILURE%s! ****\n", num_errs, num_errs==1?"":"S");
-	else
-	    puts("All address space reservation tests passed.");
-
-	fapl = h5_fileaccess();
-	h5_cleanup(FILENAME, fapl);
-	return num_errs;
+    num_errs+=rsrv_ohdr();
+    num_errs+=rsrv_heap();
+    num_errs+=rsrv_vlen();
+
+    if(num_errs > 0)
+        HDprintf("**** %d FAILURE%s! ****\n", num_errs, num_errs==1?"":"S");
+    else
+        HDputs("All address space reservation tests passed.");
+
+    fapl = h5_fileaccess();
+    h5_cleanup(FILENAME, fapl);
+    return num_errs;
     }
     else
     {
-        puts("All address space reservation tests skippped - Incompatible with current Virtual File Driver");
+        HDputs("All address space reservation tests skippped - Incompatible with current Virtual File Driver");
     }
 #endif /* BROKEN */
 
diff --git a/test/set_extent.c b/test/set_extent.c
index 5d11819..b8ce3df 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -49,13 +49,13 @@ const char *FILENAME[] = {
                                 + CONFIG_EARLY_ALLOC + CONFIG_UNFILT_EDGE)
 #define FILL_VALUE -1
 #define DO_RANKS_PRINT_CONFIG(TEST) {                                          \
-    printf("  Config:\n");                                                     \
-    printf("   Test: %s\n", TEST);                                             \
-    printf("   Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \
-    printf("   Fill value: %s\n", (do_fillvalue ? "yes" : "no"));              \
-    printf("   Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes"   \
+    HDprintf("  Config:\n");                                                     \
+    HDprintf("   Test: %s\n", TEST);                                             \
+    HDprintf("   Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \
+    HDprintf("   Fill value: %s\n", (do_fillvalue ? "yes" : "no"));              \
+    HDprintf("   Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes"   \
             : "no"));                                                          \
-    printf("   Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE         \
+    HDprintf("   Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE         \
             ? "disabled" : "enabled"));                                        \
 } /* end DO_RANKS_PRINT_CONFIG */
 
@@ -136,8 +136,8 @@ int main( void )
     hid_t fapl2;                /* file access property list w/latest format set */
     unsigned new_format;         /* Whether to use the latest file format */
     unsigned chunk_cache;        /* Whether to enable chunk caching */
-    int	  nerrors = 0;
-    const char  *env_h5_drvr;	/* File Driver value from environment */
+    int      nerrors = 0;
+    const char  *env_h5_drvr;    /* File Driver value from environment */
     hbool_t contig_addr_vfd;    /* Whether VFD used has a contigous address space */
 
 
@@ -173,17 +173,17 @@ int main( void )
         for(chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) {
             /* Output message about the type of format */
             if(new_format)
-                printf("Testing with new file format");
+                HDprintf("Testing with new file format");
             else
-                printf("Testing with old file format");
+                HDprintf("Testing with old file format");
 
             /* Set the FAPL for the chunk cache settings */
             if(chunk_cache) {
-                puts(" and chunk cache enabled:");
+                HDputs(" and chunk cache enabled:");
                 my_fapl = fapl;
             } /* end if */
             else {
-                puts(" and chunk cache disabled:");
+                HDputs(" and chunk cache disabled:");
                 my_fapl = fapl2;
             } /* end else */
 
@@ -201,15 +201,15 @@ int main( void )
                         H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
             /* Tests which use chunked datasets */
-	    if(!new_format || (new_format && contig_addr_vfd))
-		nerrors += do_ranks( my_fapl, new_format ) < 0 ? 1 : 0;
+        if(!new_format || (new_format && contig_addr_vfd))
+            nerrors += do_ranks( my_fapl, new_format ) < 0 ? 1 : 0;
         } /* end for */
 
         /* Tests which do not use chunked datasets */
-	if(!new_format || (new_format && contig_addr_vfd)) {
-	    nerrors += test_external( fapl ) < 0 ? 1 : 0;
-	    nerrors += do_layouts( fapl ) < 0 ? 1 : 0;
-	}
+        if(!new_format || (new_format && contig_addr_vfd)) {
+            nerrors += test_external( fapl ) < 0 ? 1 : 0;
+            nerrors += do_layouts( fapl ) < 0 ? 1 : 0;
+        }
     } /* end for */
 
     /* Close 2nd FAPL */
@@ -225,13 +225,13 @@ int main( void )
 
     if(nerrors)
         goto error;
-    puts("All H5Dset_extent tests passed.");
+    HDputs("All H5Dset_extent tests passed.");
 
     return 0;
 
 error:
     nerrors = MAX(1, nerrors);
-    printf("***** %d H5Dset_extent TEST%s FAILED! *****\n",
+    HDprintf("***** %d H5Dset_extent TEST%s FAILED! *****\n",
             nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
@@ -303,25 +303,25 @@ static int do_ranks( hid_t fapl, hbool_t new_format )
 
                 if(test_rank1(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 1")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if(test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 2")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if(test_rank3(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 3")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if(test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree")
-                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
                             : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
@@ -362,7 +362,7 @@ static int do_ranks( hid_t fapl, hbool_t new_format )
             /* Standard test */
             if(test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) {
                 DO_RANKS_PRINT_CONFIG("Randomized rank 4")
-                printf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
+                HDprintf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
                         ? "btree" : (index_type == RANK4_INDEX_FARRAY ? "farray"
                         : "earray"));
                 goto error;
@@ -372,7 +372,7 @@ static int do_ranks( hid_t fapl, hbool_t new_format )
             if(test_random_rank4_vl(fapl, dcpl, do_fillvalue,
                     disable_edge_filters, FALSE, index_type) < 0) {
                 DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length")
-                printf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
+                HDprintf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
                         ? "btree" : (index_type == RANK4_INDEX_FARRAY ? "farray"
                         : "earray"));
                 goto error;
@@ -383,7 +383,7 @@ static int do_ranks( hid_t fapl, hbool_t new_format )
                 if(test_random_rank4(fapl, dcpl, do_fillvalue,
                         disable_edge_filters, TRUE, index_type) < 0) {
                     DO_RANKS_PRINT_CONFIG("Randomized rank 4 with sparse allocation")
-                    printf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
+                    HDprintf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
                             ? "btree" : (index_type == RANK4_INDEX_FARRAY
                             ? "farray" : "earray"));
                     goto error;
@@ -391,7 +391,7 @@ static int do_ranks( hid_t fapl, hbool_t new_format )
                 if(test_random_rank4_vl(fapl, dcpl, do_fillvalue,
                         disable_edge_filters, TRUE, index_type) < 0) {
                     DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length with sparse allocation")
-                    printf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
+                    HDprintf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
                             ? "btree" : (index_type == RANK4_INDEX_FARRAY
                             ? "farray" : "earray"));
                     goto error;
@@ -558,10 +558,10 @@ static int test_rank1( hid_t fapl,
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n buf_o: ");
+    HDprintf("\n buf_o: ");
     for (i = 0; i < (int)dims_o[0]; i++ )
-        printf("%d ", buf_o[i]);
-    printf("\n");
+        HDprintf("%d ", buf_o[i]);
+    HDprintf("\n");
 #endif
 
     if(H5Sclose(sid) < 0)
@@ -598,18 +598,18 @@ static int test_rank1( hid_t fapl,
 
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n buf_e: ");
+    HDprintf("\n buf_e: ");
     for (i = 0; i < (int)dims_r[0]; i++ )
-        printf("%d ", buf_e[i]);
-    printf("\n");
+        HDprintf("%d ", buf_e[i]);
+    HDprintf("\n");
 #endif
 
     /* compare the read array with the expanded array */
     for (i = 0; i < (int)dims_r[0]; i++ )
         if(i >= DIM0) {
             if(buf_e[i] != comp_value) {
-                printf("buf_e[%d] = %d\n", i, buf_e[i]);
-                printf("expected = %d\n", comp_value);
+                HDprintf("buf_e[%d] = %d\n", i, buf_e[i]);
+                HDprintf("expected = %d\n", comp_value);
                 TEST_ERROR
             } /* end if */
         } /* end if */
@@ -670,17 +670,17 @@ static int test_rank1( hid_t fapl,
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n dims_r: ");
+    HDprintf("\n dims_r: ");
     for (i = 0; i < (int)dims_r[0]; i++ )
-        printf("%d ", buf_s[i]);
-    printf("\n");
+        HDprintf("%d ", buf_s[i]);
+    HDprintf("\n");
 #endif
 
     /* compare the read array with the shrinked array */
     for( i = 0; i < (int)dims_r[0]; i++ )
         if(buf_s[i] != buf_o[i]) {
-            printf("buf_s[%d] = %d\n", i, buf_s[i]);
-            printf("buf_o[%d] = %d\n", i, buf_o[i]);
+            HDprintf("buf_s[%d] = %d\n", i, buf_s[i]);
+            HDprintf("buf_o[%d] = %d\n", i, buf_o[i]);
             TEST_ERROR
         } /* end if */
 
@@ -714,18 +714,18 @@ static int test_rank1( hid_t fapl,
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n dims_r: ");
+    HDprintf("\n dims_r: ");
     for (i = 0; i < (int)dims_r[0]; i++ )
-        printf("%d ", buf_r[i]);
-    printf("\n");
+        HDprintf("%d ", buf_r[i]);
+    HDprintf("\n");
 #endif
 
     /* compare the read array with the original array */
     for(i = 0; i < (int)dims_r[0]; i++ )
         if(i >= DIMS0 ) {
             if(buf_r[i] != comp_value) {
-                printf("buf_r[%d] = %d\n", i, buf_r[i] );
-                printf("expected = %d\n", comp_value);
+                HDprintf("buf_r[%d] = %d\n", i, buf_r[i] );
+                HDprintf("expected = %d\n", comp_value);
                 TEST_ERROR
             } /* end if */
         } /* end if */
@@ -820,61 +820,47 @@ error:
  *-------------------------------------------------------------------------
  */
 
-static int test_rank2( hid_t fapl,
-                       hid_t dcpl,
-                       hbool_t do_fill_value,
-                       hbool_t disable_edge_filters,
-                       hbool_t set_istore_k)
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   my_dcpl=-1;
-    hid_t   fcpl;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
-    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */
-    hsize_t dims_c[RANK2] = {2,2};          /* chunk dimensions */
-    hsize_t dims_r[RANK2];                  /* read dimensions */
-    hsize_t maxdims[RANK2] = {H5S_UNLIMITED,H5S_UNLIMITED};
-    int     buf_o[DIM0][DIM1];
-    int     buf_s[DIMS0][DIMS1];
-    int     buf_e[DIME0][DIME1];
-    int     buf_r[DIM0][DIM1];
-    int     i, j;
-    int     comp_value;
-    char    filename[NAME_BUF_SIZE];
-
-    if ( do_fill_value )
-    {
+static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, hbool_t set_istore_k) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t my_dcpl = -1;
+    hid_t fcpl;
+    hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */
+    hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = { DIME0, DIME1 }; /* extended dimensions */
+    hsize_t dims_c[RANK2] = { 2, 2 }; /* chunk dimensions */
+    hsize_t dims_r[RANK2]; /* read dimensions */
+    hsize_t maxdims[RANK2] = { H5S_UNLIMITED, H5S_UNLIMITED };
+    int buf_o[DIM0][DIM1];
+    int buf_s[DIMS0][DIMS1];
+    int buf_e[DIME0][DIME1];
+    int buf_r[DIM0][DIM1];
+    int i, j;
+    int comp_value;
+    char filename[NAME_BUF_SIZE];
+
+    if (do_fill_value) {
         comp_value = FILL_VALUE;
-    }
-    else
-    {
+    } else {
         comp_value = 0;
     }
 
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
             buf_o[i][j] = 2;
         }
     }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-    {
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
         TEST_ERROR
     }
 
-    if  ( set_istore_k )
-    {
+    if (set_istore_k) {
         /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
-        {
+        if (H5Pset_istore_k(fcpl, ISTORE_IK) < 0) {
             TEST_ERROR
         }
 
@@ -882,79 +868,65 @@ static int test_rank2( hid_t fapl,
 
     /* create a new file */
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-    {
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
         TEST_ERROR
     }
 
-
-
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
 
     /* modify dataset creation properties, i.e. enable chunking. */
-    if ((my_dcpl = H5Pcopy (dcpl)) < 0)
-    {
+    if ((my_dcpl = H5Pcopy(dcpl)) < 0) {
         TEST_ERROR
     }
-    if (H5Pset_chunk(my_dcpl, RANK2, dims_c) < 0)
-    {
+    if (H5Pset_chunk(my_dcpl, RANK2, dims_c) < 0) {
         TEST_ERROR
     }
-    if(disable_edge_filters)
-        if(H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0)
+    if (disable_edge_filters)
+        if (H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0)
             TEST_ERROR
 
-    /*-------------------------------------------------------------------------
-    * Procedure 1
-    * a.	Write an array AxB. These are the dimensions for creating the dataset
-    * b.	Define a greater array CxD where C > A and D > B
-    * c.	Read data back
-    * d.	Verify if new dimensions are C and D
-    * e.	Verify if data from A to C and B to D is what it is to be expected
-    *
-    * original data is
-    *
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *
-    *-------------------------------------------------------------------------
-    */
-
-    /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+                    /*-------------------------------------------------------------------------
+                    * Procedure 1
+                    * a.    Write an array AxB. These are the dimensions for creating the dataset
+                    * b.    Define a greater array CxD where C > A and D > B
+                    * c.    Read data back
+                    * d.    Verify if new dimensions are C and D
+                    * e.    Verify if data from A to C and B to D is what it is to be expected
+                    *
+                    * original data is
+                    *
+                    *  2 2 2 2
+                    *  2 2 2 2
+                    *  2 2 2 2
+                    *  2 2 2 2
+                    *
+                    *-------------------------------------------------------------------------
+                    */
+
+                    /* create a dataset */
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
 
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
-    {
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) {
         TEST_ERROR
     }
 
-
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            printf("%d ", buf_o[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            HDprintf("%d ", buf_o[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
@@ -974,32 +946,26 @@ static int test_rank2( hid_t fapl,
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_e) < 0)
-    {
+    if (H5Dset_extent(did, dims_e) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_e[i])
             TEST_ERROR
     }
@@ -1008,55 +974,39 @@ static int test_rank2( hid_t fapl,
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         TEST_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_e[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_e[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
-    /* compare the read array with the expanded array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if ( i >= DIM0 || j >= DIM1 )
-            {
-                if(buf_e[i][j] != comp_value)
-                {
-                    printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
-                    printf("value = %d\n", comp_value);
+                /* compare the read array with the expanded array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (i >= DIM0 || j >= DIM1) {
+                if (buf_e[i][j] != comp_value) {
+                    HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
+                    HDprintf("value = %d\n", comp_value);
                     TEST_ERROR
                 }
-            }
-            else
-            {
-                if(buf_e[i][j] != buf_o[i][j])
+            } else {
+                if (buf_e[i][j] != buf_o[i][j])
                     TEST_ERROR
             }
         }
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     *
     * Procedure 2
-    * a.	Define a smaller array ExF where E < A and F < B
-    * b.	Read data back
-    * c.	Verify if new dimensions are E and F
-    * d.	Verify if data up until E and F is what to be expected
+    * a.    Define a smaller array ExF where E < A and F < B
+    * b.    Read data back
+    * c.    Verify if new dimensions are E and F
+    * d.    Verify if data up until E and F is what to be expected
     *
     * data is now
     *
@@ -1067,106 +1017,81 @@ static int test_rank2( hid_t fapl,
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
     /* for this case we close and reopen file */
-    if ( set_istore_k )
-    {
+    if (set_istore_k) {
 
-        if (H5Dclose(did) < 0)
-        {
+        if (H5Dclose(did) < 0) {
             TEST_ERROR
         }
-        if (H5Fclose(fid) < 0)
-        {
+        if (H5Fclose(fid) < 0) {
             TEST_ERROR
         }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
-        {
+        if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) {
             TEST_ERROR
         }
 
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
-        {
+        if ((did = H5Dopen2(fid, "dset1", H5P_DEFAULT)) < 0) {
             TEST_ERROR
         }
 
-
-
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
-    {
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) {
         TEST_ERROR
     }
 
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_s[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_s[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
     /* compare the read array with the shrinked array */
-    for( i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for( j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if (  buf_s[i][j] != buf_o[i][j] )
-            {
-                printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
-                printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (buf_s[i][j] != buf_o[i][j]) {
+                HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
+                HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 TEST_ERROR
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it back to original size
     * data is now, extended space was initialized with fill value or default value
@@ -1180,36 +1105,30 @@ static int test_rank2( hid_t fapl,
     */
 
     /* set new dimensions for the array */
-    if (H5Dset_extent(did, dims_o) < 0)
-    {
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions. */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
@@ -1220,36 +1139,26 @@ static int test_rank2( hid_t fapl,
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG2)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_r[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_r[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    /* compare the read array with the original array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if (i >= DIMS0 || j >= DIMS1)
-            {
-                if(buf_r[i][j] != comp_value)
-                {
-                    printf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
-                    printf("value = %d\n", comp_value);
+                /* compare the read array with the original array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (i >= DIMS0 || j >= DIMS1) {
+                if (buf_r[i][j] != comp_value) {
+                    HDprintf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
+                    HDprintf("value = %d\n", comp_value);
                     TEST_ERROR
                 }
-            }
-            else
-            {
-                if(buf_r[i][j] != buf_o[i][j])
+            } else {
+                if (buf_r[i][j] != buf_o[i][j])
                     TEST_ERROR
             }
         }
@@ -1265,36 +1174,30 @@ static int test_rank2( hid_t fapl,
     dims_s[1] = 0;
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * expand then shrink to 0 in dimension 1 while expanding again in
     * dimension 0
@@ -1302,10 +1205,8 @@ static int test_rank2( hid_t fapl,
     *-------------------------------------------------------------------------
     */
 
-
     /* expand to original dimensions for the array. */
-    if (H5Dset_extent(did , dims_o) < 0)
-    {
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
@@ -1313,266 +1214,208 @@ static int test_rank2( hid_t fapl,
     dims_s[1] = 0;
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * close dataset
     *-------------------------------------------------------------------------
     */
 
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
 
-
-     /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * test a dataset with non initialized chunks
     *-------------------------------------------------------------------------
     */
 
-
-    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+    if ((did = H5Dcreate2(fid, "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
     /* set new dimensions for the array */
-    dims_o[ 0 ] = 0;
-    dims_o[ 1 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0)
-    {
+    dims_o[0] = 0;
+    dims_o[1] = 0;
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
-
-
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
 
-
-    if (H5Pclose(my_dcpl) < 0)
-    {
+    if (H5Pclose(my_dcpl) < 0) {
         TEST_ERROR
     }
 
     /* close file creation property list */
-    if(H5Pclose(fcpl) < 0)
-    {
+    if (H5Pclose(fcpl) < 0) {
         TEST_ERROR
     }
 
-    if (H5Fclose( fid ) < 0)
-    {
+    if (H5Fclose(fid) < 0) {
         TEST_ERROR
     }
 
-
     return 0;
 
-
-
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( my_dcpl  );
-        H5Pclose( fcpl  );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(my_dcpl);
+            H5Pclose(fcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 
 }
 
-
-
-
 /*-------------------------------------------------------------------------
  * test usage with a 3D rank
  *-------------------------------------------------------------------------
  */
 
-static int test_rank3( hid_t fapl,
-                       hid_t dcpl,
-                       hbool_t do_fill_value,
-                       hbool_t disable_edge_filters,
-                       hbool_t set_istore_k)
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   my_dcpl=-1;
-    hid_t   fcpl;
-    hsize_t dims_o[RANK3] = {DIM0,DIM1,DIM2};    /* original dimensions */
-    hsize_t dims_s[RANK3] = {DIMS0,DIMS1,DIMS2}; /* shrinking dimensions */
-    hsize_t dims_e[RANK3] = {DIME0,DIME1,DIME2}; /* extended dimensions */
-    hsize_t dims_c[RANK3] = {2,2,2};             /* chunk dimensions */
-    hsize_t dims_r[RANK3];                       /* read dimensions */
-    hsize_t maxdims[RANK3] = {H5S_UNLIMITED,H5S_UNLIMITED,H5S_UNLIMITED};
-    int     buf_o[DIM0][DIM1][DIM2];
-    int     buf_s[DIMS0][DIMS1][DIMS2];
-    int     buf_e[DIME0][DIME1][DIME2];
-    int     buf_r[DIM0][DIM1][DIM2];
-    int     i, j, k;
-    int     comp_value;
-    char	filename[NAME_BUF_SIZE];
-
-    if ( do_fill_value )
-    {
+static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, hbool_t set_istore_k) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t my_dcpl = -1;
+    hid_t fcpl;
+    hsize_t dims_o[RANK3] = { DIM0, DIM1, DIM2 }; /* original dimensions */
+    hsize_t dims_s[RANK3] = { DIMS0, DIMS1, DIMS2 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK3] = { DIME0, DIME1, DIME2 }; /* extended dimensions */
+    hsize_t dims_c[RANK3] = { 2, 2, 2 }; /* chunk dimensions */
+    hsize_t dims_r[RANK3]; /* read dimensions */
+    hsize_t maxdims[RANK3] = { H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED };
+    int buf_o[DIM0][DIM1][DIM2];
+    int buf_s[DIMS0][DIMS1][DIMS2];
+    int buf_e[DIME0][DIME1][DIME2];
+    int buf_r[DIM0][DIM1][DIM2];
+    int i, j, k;
+    int comp_value;
+    char filename[NAME_BUF_SIZE];
+
+    if (do_fill_value) {
         comp_value = FILL_VALUE;
-    }
-    else
-    {
+    } else {
         comp_value = 0;
     }
 
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
-            for( k = 0; k < DIM2; k++ )
-            {
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
+            for (k = 0; k < DIM2; k++) {
                 buf_o[i][j][k] = 2;
             }
         }
     }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-    {
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
         TEST_ERROR
     }
 
-    if  ( set_istore_k )
-    {
+    if (set_istore_k) {
         /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
-        {
+        if (H5Pset_istore_k(fcpl, ISTORE_IK) < 0) {
             TEST_ERROR
         }
 
     }
     /* create a new file */
     h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-    {
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
         TEST_ERROR
     }
 
     /* close property list */
-    if(H5Pclose(fcpl) < 0)
-    {
+    if (H5Pclose(fcpl) < 0) {
         TEST_ERROR
     }
 
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
 
     /* modify dataset creation properties, i.e. enable chunking. */
-    if ((my_dcpl = H5Pcopy (dcpl)) < 0)
-    {
+    if ((my_dcpl = H5Pcopy(dcpl)) < 0) {
         TEST_ERROR
     }
-    if (H5Pset_chunk(my_dcpl, RANK3, dims_c) < 0)
-    {
+    if (H5Pset_chunk(my_dcpl, RANK3, dims_c) < 0) {
         TEST_ERROR
     }
-    if(disable_edge_filters)
-        if(H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0)
+    if (disable_edge_filters)
+        if (H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0)
             TEST_ERROR
 
-    /*-------------------------------------------------------------------------
-    * create, write array
-    *-------------------------------------------------------------------------
-    */
+                    /*-------------------------------------------------------------------------
+                    * create, write array
+                    *-------------------------------------------------------------------------
+                    */
 
-    /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+                    /* create a dataset */
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
 
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
-    {
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) {
         TEST_ERROR
     }
 
-
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_o[2]; k++ )
-            {
-                printf("%d ", buf_o[i][j][k]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            for( k = 0; k < (int)dims_o[2]; k++ ) {
+                HDprintf("%d ", buf_o[i][j][k]);
             }
-            printf("[%d] ", j);
+            HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
@@ -1583,32 +1426,26 @@ static int test_rank3( hid_t fapl,
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_e) < 0)
-    {
+    if (H5Dset_extent(did, dims_e) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_e[i])
             TEST_ERROR
     }
@@ -1617,203 +1454,153 @@ static int test_rank3( hid_t fapl,
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         TEST_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                printf("%d ", buf_e[i][j][k]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            for( k = 0; k < (int)dims_r[2]; k++ ) {
+                HDprintf("%d ", buf_e[i][j][k]);
             }
-            printf("[%d] ", j);
+            HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-
-    /* compare the read array with the expanded array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                if ( i >= DIM0 || j >= DIM1 || k >= DIM2 )
-                {
-                    if(buf_e[i][j][k] != comp_value)
-                    {
-                        printf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k] );
-                        printf("value = %d\n", comp_value);
+                /* compare the read array with the expanded array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            for (k = 0; k < (int) dims_r[2]; k++) {
+                if (i >= DIM0 || j >= DIM1 || k >= DIM2) {
+                    if (buf_e[i][j][k] != comp_value) {
+                        HDprintf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k]);
+                        HDprintf("value = %d\n", comp_value);
                         TEST_ERROR
                     }
-                }
-                else
-                {
-                    if(buf_e[i][j][k] != buf_o[i][j][k] )
+                } else {
+                    if (buf_e[i][j][k] != buf_o[i][j][k])
                         TEST_ERROR
                 }
             }
         }
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * shrink
     *-------------------------------------------------------------------------
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
     /* for this case we close and reopen file */
-    if ( set_istore_k )
-    {
+    if (set_istore_k) {
 
-        if (H5Dclose(did) < 0)
-        {
+        if (H5Dclose(did) < 0) {
             TEST_ERROR
         }
-        if (H5Fclose(fid) < 0)
-        {
+        if (H5Fclose(fid) < 0) {
             TEST_ERROR
         }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
-        {
+        if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) {
             TEST_ERROR
         }
 
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
-        {
+        if ((did = H5Dopen2(fid, "dset1", H5P_DEFAULT)) < 0) {
             TEST_ERROR
         }
 
-
-
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
-    {
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) {
         TEST_ERROR
     }
 
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                printf("%d ", buf_s[i][j][k]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            for( k = 0; k < (int)dims_r[2]; k++ ) {
+                HDprintf("%d ", buf_s[i][j][k]);
             }
-             printf("[%d] ", j);
+             HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-
     /* compare the read array with the shrinked array */
-    for( i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for( j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                if (  buf_s[i][j][k] != buf_o[i][j][k] )
-                {
-                    printf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k] );
-                    printf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k] );
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            for (k = 0; k < (int) dims_r[2]; k++) {
+                if (buf_s[i][j][k] != buf_o[i][j][k]) {
+                    HDprintf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k]);
+                    HDprintf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k]);
                     TEST_ERROR
                 }
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it back to original size
     *-------------------------------------------------------------------------
     */
 
     /* set new dimensions for the array */
-    if (H5Dset_extent(did, dims_o) < 0)
-    {
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions. */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
@@ -1823,52 +1610,39 @@ static int test_rank3( hid_t fapl,
         TEST_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG3)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            for( k = 0; k < (int)dims_r[2]; k++ ) {
 
-                printf("%d ", buf_r[i][j][k]);
+                HDprintf("%d ", buf_r[i][j][k]);
             }
-             printf("[%d] ", j);
+             HDprintf("[%d] ", j);
         }
-        printf("\n");
+        HDprintf("\n");
 
     }
-    printf("\n");
+    HDprintf("\n");
 #endif
 
-
-
-    /* compare the read array with the original array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            for( k = 0; k < (int)dims_r[2]; k++ )
-            {
-                if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2 )
-                {
-                    if( buf_r[i][j][k] != comp_value )
-                    {
-                        printf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k] );
-                        printf("value = %d\n", comp_value);
+                /* compare the read array with the original array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            for (k = 0; k < (int) dims_r[2]; k++) {
+                if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2) {
+                    if (buf_r[i][j][k] != comp_value) {
+                        HDprintf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k]);
+                        HDprintf("value = %d\n", comp_value);
                         TEST_ERROR
                     }
-                }
-                else
-                {
-                    if(buf_r[i][j][k] != buf_o[i][j][k])
+                } else {
+                    if (buf_r[i][j][k] != buf_o[i][j][k])
                         TEST_ERROR
                 }
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * shrink to 0
     *
@@ -1880,158 +1654,126 @@ static int test_rank3( hid_t fapl,
     dims_s[2] = 0;
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
-    {
+    if (H5Dset_extent(did, dims_s) < 0) {
         TEST_ERROR
     }
 
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK3; i++ )
-    {
+    for (i = 0; i < RANK3; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
     /*-------------------------------------------------------------------------
     * close dataset
     *-------------------------------------------------------------------------
     */
 
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * test a dataset with non initialized chunks
     *-------------------------------------------------------------------------
     */
 
-
-    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0) {
         TEST_ERROR
     }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
-    {
+    if ((did = H5Dcreate2(fid, "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
     /* set new dimensions for the array */
-    dims_o[ 0 ] = 0;
-    dims_o[ 1 ] = 0;
-    dims_o[ 2 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0)
-    {
+    dims_o[0] = 0;
+    dims_o[1] = 0;
+    dims_o[2] = 0;
+    if (H5Dset_extent(did, dims_o) < 0) {
         TEST_ERROR
     }
 
-
-
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
 
-
-    if (H5Pclose(my_dcpl) < 0)
-    {
+    if (H5Pclose(my_dcpl) < 0) {
         TEST_ERROR
     }
 
-    if (H5Fclose( fid ) < 0)
-    {
+    if (H5Fclose(fid) < 0) {
         TEST_ERROR
     }
 
-
     return 0;
 
-
-
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( my_dcpl  );
-        H5Pclose( fcpl  );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(my_dcpl);
+            H5Pclose(fcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 
 }
 
-
 /*-------------------------------------------------------------------------
  * test usage with external storage
  *-------------------------------------------------------------------------
  */
-static int test_external( hid_t fapl )
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   dcpl=-1;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
-    hsize_t dims_e[RANK2] = {DIME0,DIM1};   /* extended dimensions, dimension 1 is the original */
-    hsize_t dims_r[RANK2];                  /* read dimensions */
-    hsize_t maxdims[RANK2] = {DIME0,DIM1};  /* only the first dimension can be extendible */
-    int     buf_o[DIM0][DIM1];              /* original buffer, for writing */
-    int     buf_s[DIMS0][DIMS1];            /* shrinked buffer, for reading */
-    int     buf_e[DIME0][DIM1];             /* extended buffer, for writing, dimension 1 is the original */
-    int     buf_ro[DIM0][DIM1];             /* original buffer for reading */
-    int     i, j;
-    int     comp_value = 0;
-    char	filename[NAME_BUF_SIZE];
-
-
-    hsize_t size;        /* number of bytes reserved in the file for the data */
+static int test_external(hid_t fapl) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t dcpl = -1;
+    hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */
+    hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = { DIME0, DIM1 }; /* extended dimensions, dimension 1 is the original */
+    hsize_t dims_r[RANK2]; /* read dimensions */
+    hsize_t maxdims[RANK2] = { DIME0, DIM1 }; /* only the first dimension can be extendible */
+    int buf_o[DIM0][DIM1]; /* original buffer, for writing */
+    int buf_s[DIMS0][DIMS1]; /* shrinked buffer, for reading */
+    int buf_e[DIME0][DIM1]; /* extended buffer, for writing, dimension 1 is the original */
+    int buf_ro[DIM0][DIM1]; /* original buffer for reading */
+    int i, j;
+    int comp_value = 0;
+    char filename[NAME_BUF_SIZE];
+
+    hsize_t size; /* number of bytes reserved in the file for the data */
     hsize_t max_size[2];
 
     max_size[0] = dims_e[0];
     max_size[1] = dims_e[1];
     size = max_size[0] * max_size[1] * sizeof(int) / 2;
 
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
             buf_o[i][j] = 2;
         }
     }
@@ -2043,30 +1785,27 @@ static int test_external( hid_t fapl )
     if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
 
-    /* modify dataset creation properties */
-    if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
+                /* modify dataset creation properties */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
 
-    if(H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t)0, size) < 0)
+    if (H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t) 0, size) < 0)
         FAIL_STACK_ERROR
 
-    if(H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t)0, size) < 0)
+    if (H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t) 0, size) < 0)
         FAIL_STACK_ERROR
 
     {
 
-        char	name[256];		/*external file name		*/
-        off_t	file_offset;    /*external file offset		*/
-        hsize_t	file_size;		/*sizeof external file segment	*/
+        char name[256]; /*external file name        */
+        off_t file_offset; /*external file offset        */
+        hsize_t file_size; /*sizeof external file segment    */
 
-        if(H5Pget_external(dcpl, 0, sizeof(name), name, &file_offset,
-                &file_size) < 0)
+        if (H5Pget_external(dcpl, 0, sizeof(name), name, &file_offset, &file_size) < 0)
             FAIL_STACK_ERROR
 
     }
 
-
-
     /*-------------------------------------------------------------------------
     * Write an array AxB. These are the dimensions for creating the dataset
     *
@@ -2080,80 +1819,72 @@ static int test_external( hid_t fapl )
     *-------------------------------------------------------------------------
     */
 
-
     /* create the data space with unlimited dimensions. */
     if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
         FAIL_STACK_ERROR
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
         FAIL_STACK_ERROR
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
 
+                /*-------------------------------------------------------------------------
+                * read
+                *-------------------------------------------------------------------------
+                */
 
-    /*-------------------------------------------------------------------------
-    * read
-    *-------------------------------------------------------------------------
-    */
-
-     /* read */
+                /* read */
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_ro) < 0)
         FAIL_STACK_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            printf("%d ", buf_ro[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            HDprintf("%d ", buf_ro[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    /*-------------------------------------------------------------------------
-    * expand
-    *-------------------------------------------------------------------------
-    */
-
-     /*-------------------------------------------------------------------------
-    * set new dimensions for the array; expand it
-    * data is now, extended space was initialized with default value
-    *
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *  2 2 2 2
-    *  0 0 0 0
-    *  0 0 0 0
-    *  0 0 0 0
-    *
-    *-------------------------------------------------------------------------
-    */
-
-    /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_e) < 0)
+                /*-------------------------------------------------------------------------
+                * expand
+                *-------------------------------------------------------------------------
+                */
+
+                /*-------------------------------------------------------------------------
+                * set new dimensions for the array; expand it
+                * data is now, extended space was initialized with default value
+                *
+                *  2 2 2 2
+                *  2 2 2 2
+                *  2 2 2 2
+                *  2 2 2 2
+                *  0 0 0 0
+                *  0 0 0 0
+                *  0 0 0 0
+                *
+                *-------------------------------------------------------------------------
+                */
+
+                /* set new dimensions for the array. */
+    if (H5Dset_extent(did, dims_e) < 0)
         FAIL_STACK_ERROR
 
-     /* get the space */
+                /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
         FAIL_STACK_ERROR
 
-    /* get dimensions */
+                /* get dimensions */
     if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         FAIL_STACK_ERROR
 
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
 
-
-    /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+                /* check dimensions */
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_e[i])
             TEST_ERROR
     }
@@ -2162,48 +1893,33 @@ static int test_external( hid_t fapl )
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         FAIL_STACK_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_e[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_e[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
-    /* compare the read array with the expanded array */
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if ( i >= DIM0 || j >= DIM1 )
-            {
-                if(buf_e[i][j] != comp_value)
-                {
-                    printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
-                    printf("value = %d\n", comp_value);
+                /* compare the read array with the expanded array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (i >= DIM0 || j >= DIM1) {
+                if (buf_e[i][j] != comp_value) {
+                    HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
+                    HDprintf("value = %d\n", comp_value);
                     TEST_ERROR
                 }
-            }
-            else
-            {
-                if(buf_e[i][j] != buf_o[i][j])
+            } else {
+                if (buf_e[i][j] != buf_o[i][j])
                     TEST_ERROR
             }
         }
     }
 
-
-
-     /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * shrink
     *
     * data is now
@@ -2215,208 +1931,172 @@ static int test_external( hid_t fapl )
     */
 
     /* set new dimensions for the array. */
-    if (H5Dset_extent(did , dims_s) < 0)
+    if (H5Dset_extent(did, dims_s) < 0)
         FAIL_STACK_ERROR
 
-    /* get the space */
+                /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
         FAIL_STACK_ERROR
 
-    /* get dimensions */
+                /* get dimensions */
     if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         FAIL_STACK_ERROR
 
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
 
-    /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+                /* check dimensions */
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
-
-
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0)
         FAIL_STACK_ERROR
 
 #if defined (H5_SET_EXTENT_DEBUG)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_s[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_s[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-
-    /* compare the read array with the shrinked array */
-    for( i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for( j = 0; j < (int)dims_r[1]; j++ )
-        {
-            if (  buf_s[i][j] != buf_o[i][j] )
-            {
-                printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
-                printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
+                /* compare the read array with the shrinked array */
+    for (i = 0; i < (int) dims_r[0]; i++) {
+        for (j = 0; j < (int) dims_r[1]; j++) {
+            if (buf_s[i][j] != buf_o[i][j]) {
+                HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
+                HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 TEST_ERROR
             }
         }
     }
 
-
     /*-------------------------------------------------------------------------
     * negative test
     * try to extend dimension above maximum
     *-------------------------------------------------------------------------
     */
 
-
     dims_e[1] = DIME1;
 
-
     H5E_BEGIN_TRY
-    {
-
-
-        /* set new dimensions for the array. */
-        if (H5Dset_extent(did , dims_e) == SUCCEED)
         {
-            TEST_ERROR
-        }
-
-    } H5E_END_TRY;
 
+            /* set new dimensions for the array. */
+            if (H5Dset_extent(did, dims_e) == SUCCEED) {
+                TEST_ERROR
+            }
 
+        }H5E_END_TRY;
 
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
 
-
     if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR
 
-    if (H5Dclose( did ) < 0)
+    if (H5Dclose(did) < 0)
         FAIL_STACK_ERROR
 
-    if (H5Fclose( fid ) < 0)
+    if (H5Fclose(fid) < 0)
         FAIL_STACK_ERROR
 
-    PASSED();
+    PASSED()
+    ;
 
     return 0;
 
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( dcpl );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(dcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
  * test usage with layouts compact and contiguous
  *-------------------------------------------------------------------------
  */
-static int test_layouts( H5D_layout_t layout, hid_t fapl )
-{
-
-    hid_t   fid=-1;
-    hid_t   did=-1;
-    hid_t   sid=-1;
-    hid_t   dcpl=-1;
-    herr_t  ret;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
-    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */
-    hsize_t dims_r[RANK2];                  /* read dimensions */
-    int     buf_o[DIM0][DIM1];
-    int     buf_r[DIM0][DIM1];
-    int     i, j;
-    char	filename[NAME_BUF_SIZE];
-
-    for( i = 0; i < DIM0; i++ )
-    {
-        for( j = 0; j < DIM1; j++ )
-        {
+static int test_layouts(H5D_layout_t layout, hid_t fapl) {
+
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t dcpl = -1;
+    herr_t ret;
+    hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */
+    hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = { DIME0, DIME1 }; /* extended dimensions */
+    hsize_t dims_r[RANK2]; /* read dimensions */
+    int buf_o[DIM0][DIM1];
+    int buf_r[DIM0][DIM1];
+    int i, j;
+    char filename[NAME_BUF_SIZE];
+
+    for (i = 0; i < DIM0; i++) {
+        for (j = 0; j < DIM1; j++) {
             buf_o[i][j] = 2;
         }
     }
 
-
     /* create a new file */
     h5_fixname(FILENAME[4], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-    {
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
         TEST_ERROR
     }
 
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK2, dims_o, NULL)) < 0)
-    {
+    if ((sid = H5Screate_simple(RANK2, dims_o, NULL)) < 0) {
         TEST_ERROR
     }
 
     /* modify dataset creation properties */
-    if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
-    {
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         TEST_ERROR
     }
 
-    if (H5Pset_layout (dcpl, layout) < 0)
-    {
+    if (H5Pset_layout(dcpl, layout) < 0) {
         TEST_ERROR
     }
 
     /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-    {
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
         TEST_ERROR
     }
 
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
-    {
+    if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) {
         TEST_ERROR
     }
 
-
 #if defined (H5_SET_EXTENT_DEBUG4)
-    printf("\n");
-    for (i = 0; i < (int)dims_o[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_o[1]; j++ )
-        {
-            printf("%d ", buf_o[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_o[0]; i++ ) {
+        for (j = 0; j < (int)dims_o[1]; j++ ) {
+            HDprintf("%d ", buf_o[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
@@ -2427,39 +2107,31 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
     */
 
     H5E_BEGIN_TRY
-    {
+        {
 
-        ret = H5Dset_extent(did , dims_e);
+            ret = H5Dset_extent(did, dims_e);
 
-    } H5E_END_TRY;
+        }H5E_END_TRY;
 
-    if(ret >= 0)
+    if (ret >= 0)
         TEST_ERROR
 
-
-
-
-    /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+                /* get the space */
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
-
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
@@ -2468,123 +2140,100 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
     if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
         TEST_ERROR
 
-
-
 #if defined (H5_SET_EXTENT_DEBUG4)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_r[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_r[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
-    /*-------------------------------------------------------------------------
-    * negative test
-    * try to shrink dimension
-    *-------------------------------------------------------------------------
-    */
+                /*-------------------------------------------------------------------------
+                * negative test
+                * try to shrink dimension
+                *-------------------------------------------------------------------------
+                */
 
     H5E_BEGIN_TRY
-    {
+        {
 
-        ret = H5Dset_extent(did , dims_s);
+            ret = H5Dset_extent(did, dims_s);
 
-    } H5E_END_TRY;
+        }H5E_END_TRY;
 
-    if(ret >= 0)
+    if (ret >= 0)
         TEST_ERROR
 
-
-    /* get the space */
-    if ((sid = H5Dget_space(did)) < 0)
-    {
+                /* get the space */
+    if ((sid = H5Dget_space(did)) < 0) {
         TEST_ERROR
     }
 
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
-    {
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) {
         TEST_ERROR
     }
 
-    if (H5Sclose(sid) < 0)
-    {
+    if (H5Sclose(sid) < 0) {
         TEST_ERROR
     }
 
     /* check dimensions */
-    for( i = 0; i < RANK2; i++ )
-    {
+    for (i = 0; i < RANK2; i++) {
         if (dims_r[i] != dims_o[i])
             TEST_ERROR
     }
 
-
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
 
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r ) < 0)
-    {
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) {
         TEST_ERROR
     }
 
 #if defined (H5_SET_EXTENT_DEBUG4)
-    printf("\n");
-    for (i = 0; i < (int)dims_r[0]; i++ )
-    {
-        for (j = 0; j < (int)dims_r[1]; j++ )
-        {
-            printf("%d ", buf_r[i][j]);
+    HDprintf("\n");
+    for (i = 0; i < (int)dims_r[0]; i++ ) {
+        for (j = 0; j < (int)dims_r[1]; j++ ) {
+            HDprintf("%d ", buf_r[i][j]);
         }
-        printf("\n");
+        HDprintf("\n");
     }
 #endif
 
-
-
     /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
 
-    if (H5Dclose(did) < 0)
-    {
+    if (H5Dclose(did) < 0) {
         TEST_ERROR
     }
 
-    if (H5Pclose(dcpl) < 0)
-    {
+    if (H5Pclose(dcpl) < 0) {
         TEST_ERROR
     }
 
-    if (H5Fclose( fid ) < 0)
-    {
+    if (H5Fclose(fid) < 0) {
         TEST_ERROR
     }
 
-
     return 0;
 
-
-
-error:
+    error:
 
     H5E_BEGIN_TRY
-    {
-        H5Dclose( did );
-        H5Sclose( sid );
-        H5Pclose( dcpl  );
-        H5Fclose( fid );
-    } H5E_END_TRY;
+        {
+            H5Dclose(did);
+            H5Sclose(sid);
+            H5Pclose(dcpl);
+            H5Fclose(fid);
+        }H5E_END_TRY;
     return -1;
 
 }
@@ -3077,16 +2726,15 @@ static void test_random_rank4_dump( unsigned ndim_sets, hsize_t dim_log[][4],
 {
     unsigned i;
 
-    printf("  Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0],
+    HDprintf("  Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0],
             (unsigned)cdims[1], (unsigned)cdims[2], (unsigned)cdims[3]);
-    printf("  Log of dataset dimensions (oldest first):\n");
+    HDprintf("  Log of dataset dimensions (oldest first):\n");
     for(i=0; i<ndim_sets; i++)
-        printf("  Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i,
+        HDprintf("  Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i,
                 (unsigned)dim_log[i][0], (unsigned)dim_log[i][1],
                 (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]);
     if(j>=0)
-        printf("  First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l,
-                m);
+        HDprintf("  First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m);
 
     return;
 } /* end test_random_rank4_dump */
diff --git a/test/stab.c b/test/stab.c
index 37097b7..80c8b06 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -16,13 +16,13 @@
  *              Tuesday, November 24, 1998
  */
 
-#define H5G_FRIEND		/*suppress error about including H5Gpkg	  */
+#define H5G_FRIEND        /*suppress error about including H5Gpkg      */
 
 /* Define this macro to indicate that the testing APIs should be available */
 #define H5G_TESTING
 
 #include "h5test.h"
-#include "H5Gpkg.h"		/* Groups				*/
+#include "H5Gpkg.h"        /* Groups                */
 
 const char *FILENAME[] = {
     "stab",
@@ -78,17 +78,17 @@ const char *FILENAME[] = {
 #define CORRUPT_STAB_TMP_FILE       "corrupt_stab_msg_tmp.h5"
 #define CORRUPT_STAB_DSET           "DS1"
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_misc
+ * Function:    test_misc
  *
- * Purpose:	Test miscellaneous group stuff.
+ * Purpose:    Test miscellaneous group stuff.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	number of errors
+ *        Failure:    number of errors
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Tuesday, November 24, 1998
  *
  *-------------------------------------------------------------------------
@@ -96,10 +96,10 @@ const char *FILENAME[] = {
 static int
 test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format)
 {
-    hid_t	fid = (-1);             /* File ID */
-    hid_t	g1 = (-1), g2 = (-1), g3 = (-1);
-    char	filename[NAME_BUF_SIZE];
-    char	comment[64];
+    hid_t    fid = (-1);             /* File ID */
+    hid_t    g1 = (-1), g2 = (-1), g3 = (-1);
+    char    filename[NAME_BUF_SIZE];
+    char    comment[64];
 
     if(new_format)
         TESTING("miscellaneous group tests (w/new group format)")
@@ -125,10 +125,10 @@ test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format)
     if((g3 = H5Gopen2(fid, "/test_1b", H5P_DEFAULT)) < 0) TEST_ERROR
     if(H5Oget_comment_by_name(g3, "././.", comment, sizeof comment, H5P_DEFAULT) < 0) TEST_ERROR
     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);
-	TEST_ERROR
+    H5_FAILED();
+    HDputs("    Read the wrong comment string from the group.");
+    HDprintf("    got: \"%s\"\n    ans: \"hello world\"\n", comment);
+    TEST_ERROR
     }
     if(H5Gclose(g1) < 0) TEST_ERROR
     if(H5Gclose(g2) < 0) TEST_ERROR
@@ -153,21 +153,21 @@ test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format)
 
  error:
     H5E_BEGIN_TRY {
-	H5Gclose(g1);
-	H5Gclose(g2);
-	H5Gclose(g3);
-    	H5Fclose(fid);
+    H5Gclose(g1);
+    H5Gclose(g2);
+    H5Gclose(g3);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Purpose:     Creates a group with a very long name
  *
- * Return:      Success:	0
+ * Return:      Success:    0
  *
- * 		Failure:	number of errors
+ *         Failure:    number of errors
  *
  * Programmer:  Robb Matzke <matzke@llnl.gov> 2002-03-28
  *
@@ -177,10 +177,10 @@ test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format)
 static int
 test_long(hid_t fcpl, hid_t fapl, hbool_t new_format)
 {
-    hid_t	fid = (-1);             /* File ID */
+    hid_t    fid = (-1);             /* File ID */
     hid_t       g1 = (-1), g2 = (-1);
     char        *name1 = NULL, *name2 = NULL;
-    char	filename[NAME_BUF_SIZE];
+    char    filename[NAME_BUF_SIZE];
     size_t      i;
 
     if(new_format)
@@ -198,7 +198,7 @@ test_long(hid_t fcpl, 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
@@ -226,22 +226,22 @@ error:
     H5E_BEGIN_TRY {
         H5Gclose(g1);
         H5Gclose(g2);
-    	H5Fclose(fid);
+        H5Fclose(fid);
         HDfree(name2);
         HDfree(name1);
     } H5E_END_TRY;
     return 1;
 } /* end test_long() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_large
  *
  * Purpose:     Creates a really large directory.
  *
- * Return:      Success:	0
+ * Return:      Success:    0
  *
- * 		Failure:	number of errors
+ *         Failure:    number of errors
  *
  * Programmer:  Robb Matzke
  *              robb@maya.nuance.com
@@ -252,9 +252,9 @@ error:
 static int
 test_large(hid_t fcpl, hid_t fapl, hbool_t new_format)
 {
-    hid_t	fid = (-1);             /* File ID */
+    hid_t    fid = (-1);             /* File ID */
     hid_t       cwg = (-1), dir = (-1); /* Group IDs */
-    char	filename[NAME_BUF_SIZE];
+    char    filename[NAME_BUF_SIZE];
     char        name[NAME_BUF_SIZE];
     int         i;
 
@@ -275,8 +275,8 @@ test_large(hid_t fcpl, 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);
-	if((dir = H5Gcreate2(cwg, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+        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
     }
     if(new_format)
@@ -291,14 +291,14 @@ test_large(hid_t fcpl, hid_t fapl, hbool_t new_format)
 
  error:
     H5E_BEGIN_TRY {
-	H5Gclose(dir);
-	H5Gclose(cwg);
-    	H5Fclose(fid);
+    H5Gclose(dir);
+    H5Gclose(cwg);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 } /* end test_large() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    lifecycle
  *
@@ -318,19 +318,19 @@ test_large(hid_t fcpl, hid_t fapl, hbool_t new_format)
 static int
 lifecycle(hid_t fcpl, hid_t fapl2)
 {
-    hid_t	fid = (-1);             /* File ID */
-    hid_t	gid = (-1);             /* Group ID */
-    hid_t	gid2 = (-1);            /* Datatype ID */
+    hid_t    fid = (-1);             /* File ID */
+    hid_t    gid = (-1);             /* Group ID */
+    hid_t    gid2 = (-1);            /* Datatype ID */
     hid_t       gcpl = (-1);            /* Group creation property list ID */
     size_t      lheap_size_hint;        /* Local heap size hint */
     unsigned    max_compact;            /* Maximum # of links to store in group compactly */
     unsigned    min_dense;              /* Minimum # of links to store in group "densely" */
-    unsigned	est_num_entries;	/* Estimated # of entries in group */
-    unsigned	est_name_len;		/* Estimated length of entry name */
-    unsigned	nmsgs;		        /* Number of messages in group's header */
+    unsigned    est_num_entries;    /* Estimated # of entries in group */
+    unsigned    est_name_len;        /* Estimated length of entry name */
+    unsigned    nmsgs;                /* Number of messages in group's header */
     H5O_info_t  oinfo;                  /* Object info */
     char        objname[NAME_BUF_SIZE];         /* Object name */
-    char	filename[NAME_BUF_SIZE];
+    char    filename[NAME_BUF_SIZE];
     h5_stat_size_t       empty_size;             /* Size of an empty file */
     unsigned    u;                      /* Local index variable */
     h5_stat_size_t       file_size;              /* Size of each file created */
@@ -385,7 +385,7 @@ lifecycle(hid_t fcpl, 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 fcpl, 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 fcpl, 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 fcpl, 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 fcpl, 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 fcpl, 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 */
@@ -505,15 +505,15 @@ lifecycle(hid_t fcpl, hid_t fapl2)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gcpl);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid);
+        H5Gclose(gcpl);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 } /* end lifecycle() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    long_compact
  *
@@ -532,11 +532,11 @@ error:
 static int
 long_compact(hid_t fcpl, hid_t fapl2)
 {
-    hid_t	fid = (-1);             /* File ID */
-    hid_t	gid = (-1);             /* Group ID */
-    hid_t	gid2 = (-1);            /* Group ID */
+    hid_t    fid = (-1);             /* File ID */
+    hid_t    gid = (-1);             /* Group ID */
+    hid_t    gid2 = (-1);            /* Group ID */
     char        *objname = NULL;        /* Object name */
-    char	filename[NAME_BUF_SIZE];
+    char    filename[NAME_BUF_SIZE];
     h5_stat_size_t       empty_size;             /* Size of an empty file */
     h5_stat_size_t       file_size;              /* Size of each file created */
 
@@ -638,9 +638,9 @@ long_compact(hid_t fcpl, hid_t fapl2)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid);
     } H5E_END_TRY;
 
     if(objname)
@@ -649,7 +649,7 @@ error:
     return 1;
 } /* end long_compact() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    read_old
  *
@@ -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 */
 
@@ -730,13 +730,13 @@ read_old(void)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gid);
-    	H5Fclose(fid);
+        H5Gclose(gid);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 } /* end read_old() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    no_compact
  *
@@ -755,16 +755,16 @@ error:
 static int
 no_compact(hid_t fcpl, hid_t fapl2)
 {
-    hid_t	fid = (-1);             /* File ID */
-    hid_t	gid = (-1);             /* Group ID */
-    hid_t	gid2 = (-1);            /* Datatype ID */
+    hid_t    fid = (-1);             /* File ID */
+    hid_t    gid = (-1);             /* Group ID */
+    hid_t    gid2 = (-1);            /* Datatype ID */
     hid_t       gcpl = (-1);            /* Group creation property list ID */
     char        objname[NAME_BUF_SIZE];         /* Object name */
-    char	filename[NAME_BUF_SIZE];
+    char    filename[NAME_BUF_SIZE];
     h5_stat_size_t       empty_size;             /* Size of an empty file */
     h5_stat_size_t       file_size;              /* Size of each file created */
-    unsigned	est_num_entries;	/* Estimated # of entries in group */
-    unsigned	est_name_len;		/* Estimated length of entry name */
+    unsigned    est_num_entries;    /* Estimated # of entries in group */
+    unsigned    est_name_len;        /* Estimated length of entry name */
 
     TESTING("group without compact form");
 
@@ -802,7 +802,7 @@ no_compact(hid_t fcpl, 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 fcpl, 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 */
@@ -843,15 +843,15 @@ no_compact(hid_t fcpl, hid_t fapl2)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gcpl);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Fclose(fid);
+        H5Gclose(gcpl);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 } /* end no_compact() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    gcpl_on_root
  *
@@ -869,15 +869,15 @@ error:
 static int
 gcpl_on_root(hid_t fapl2)
 {
-    hid_t	fid = (-1);             /* File ID */
-    hid_t	gid = (-1);             /* Group ID */
-    hid_t	gid2 = (-1);            /* Datatype ID */
+    hid_t    fid = (-1);             /* File ID */
+    hid_t    gid = (-1);             /* Group ID */
+    hid_t    gid2 = (-1);            /* Datatype ID */
     hid_t       fcpl = (-1);            /* File creation property list ID */
     hid_t       gcpl = (-1);            /* Group creation property list ID */
     hid_t       lcpl = (-1);            /* Link creation property list ID */
     unsigned    max_compact;            /* Maximum # of links to store in group compactly */
     unsigned    min_dense;              /* Minimum # of links to store in group "densely" */
-    char	filename[NAME_BUF_SIZE];
+    char    filename[NAME_BUF_SIZE];
 
     TESTING("setting root group creation properties");
 
@@ -962,17 +962,17 @@ gcpl_on_root(hid_t fapl2)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(lcpl);
-    	H5Gclose(gcpl);
-    	H5Gclose(gid2);
-    	H5Gclose(gid);
-    	H5Gclose(fcpl);
-    	H5Fclose(fid);
+        H5Gclose(lcpl);
+        H5Gclose(gcpl);
+        H5Gclose(gid2);
+        H5Gclose(gid);
+        H5Gclose(fcpl);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 } /* end gcpl_on_root() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    old_api
  *
@@ -990,11 +990,11 @@ static int
 old_api(hid_t fapl)
 {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-    hid_t	fid = (-1);             /* File ID */
-    hid_t	gid = (-1);             /* Group ID */
+    hid_t    fid = (-1);             /* File ID */
+    hid_t    gid = (-1);             /* Group ID */
     h5_stat_size_t small_file_size;     /* Size of small group file */
     h5_stat_size_t large_file_size;     /* Size of large group file */
-    char	filename[NAME_BUF_SIZE];
+    char    filename[NAME_BUF_SIZE];
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
     TESTING("old API routines");
@@ -1049,7 +1049,7 @@ old_api(hid_t fapl)
     fapl = fapl;
 
     SKIPPED();
-    puts("    Deprecated API symbols not enabled");
+    HDputs("    Deprecated API symbols not enabled");
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
     return 0;
@@ -1057,14 +1057,14 @@ old_api(hid_t fapl)
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 error:
     H5E_BEGIN_TRY {
-    	H5Gclose(gid);
-    	H5Fclose(fid);
+        H5Gclose(gid);
+        H5Fclose(fid);
     } H5E_END_TRY;
     return 1;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 } /* end old_api() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    corrupt_stab_msg
  *
@@ -1136,24 +1136,24 @@ corrupt_stab_msg(void)
 
 error:
     H5E_BEGIN_TRY {
-    	H5Dclose(did);
-    	H5Fclose(fid);
+        H5Dclose(did);
+        H5Fclose(fid);
     } H5E_END_TRY;
 
     return 1;
 } /* end corrupt_stab_msg() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test groups
+ * Purpose:    Test groups
  *
- * Return:	Success:	zero
+ * Return:    Success:    zero
  *
- *		Failure:	non-zero
+ *        Failure:    non-zero
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Tuesday, November 24, 1998
  *
  * Modifications:
@@ -1163,12 +1163,12 @@ error:
 int
 main(void)
 {
-    hid_t	fapl, fapl2;    	/* File access property list IDs */
-    hid_t	fcpl, fcpl2;    	/* File creation property list ID */
-    unsigned 	new_format;     	/* Whether to use the new format or not */
-    const char  *env_h5_drvr;      	/* File Driver value from environment */
-    hbool_t 	contig_addr_vfd; 	/* Whether VFD used has a contigous address space */
-    int		nerrors = 0;
+    hid_t    fapl, fapl2;        /* File access property list IDs */
+    hid_t    fcpl, fcpl2;        /* File creation property list ID */
+    unsigned     new_format;         /* Whether to use the new format or not */
+    const char  *env_h5_drvr;          /* File Driver value from environment */
+    hbool_t     contig_addr_vfd;     /* Whether VFD used has a contigous address space */
+    int        nerrors = 0;
 
     /* Get the VFD to use */
     env_h5_drvr = HDgetenv("HDF5_DRIVER");
@@ -1191,7 +1191,7 @@ main(void)
     /* Set up file creation property list */
     if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR
     if((fcpl2 = H5Pcopy(fcpl)) < 0) TEST_ERROR
-    
+
     /* Set to use paged aggregation strategy and persisting free-space */
     /* Skip testing for multi/split drivers */
     if(H5Pset_file_space_strategy(fcpl2, H5F_FSPACE_STRATEGY_PAGE, 1, (hsize_t)1) < 0)
@@ -1241,7 +1241,7 @@ main(void)
     if(nerrors)
         goto error;
 
-    puts("All symbol table tests passed.");
+    HDputs("All symbol table tests passed.");
 
     /* Cleanup */
     if (GetTestCleanup()) {
@@ -1253,7 +1253,7 @@ main(void)
     return 0;
 
 error:
-    puts("*** TESTS FAILED ***");
+    HDputs("*** TESTS FAILED ***");
     return 1;
 }
 
diff --git a/test/swmr_addrem_writer.c b/test/swmr_addrem_writer.c
index 51caa3d..01e2ce1 100644
--- a/test/swmr_addrem_writer.c
+++ b/test/swmr_addrem_writer.c
@@ -288,20 +288,20 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_addrem_writer [-q] [-f <# of operations between flushing\n");
-    printf("    file contents>] [-r <random seed>] <# of operations>\n");
-    printf("\n");
-    printf("<# of operations between flushing file contents> should be 0 (for\n");
-    printf("no flushing) or between 1 and (<# of operations> - 1).\n");
-    printf("\n");
-    printf("<# of operations> must be specified.\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n");
-    printf("('-f 1000'), and will generate a random seed (no -r given).\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_addrem_writer [-q] [-f <# of operations between flushing\n");
+    HDprintf("    file contents>] [-r <random seed>] <# of operations>\n");
+    HDprintf("\n");
+    HDprintf("<# of operations between flushing file contents> should be 0 (for\n");
+    HDprintf("no flushing) or between 1 and (<# of operations> - 1).\n");
+    HDprintf("\n");
+    HDprintf("<# of operations> must be specified.\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n");
+    HDprintf("('-f 1000'), and will generate a random seed (no -r given).\n");
+    HDprintf("\n");
     HDexit(1);
 }
 
diff --git a/test/swmr_common.c b/test/swmr_common.c
index a0d79e3..b323769 100644
--- a/test/swmr_common.c
+++ b/test/swmr_common.c
@@ -73,7 +73,7 @@ unsigned symbol_count[NLEVELS] = {100, 200, 400, 800, 1600};
 /* Array of dataset information entries (1 per dataset) */
 symbol_info_t *symbol_info[NLEVELS];
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    choose_dataset
  *
@@ -101,7 +101,7 @@ choose_dataset(void)
     return &symbol_info[level][offset];
 } /* end choose_dataset() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    create_symbol_datatype
  *
@@ -142,7 +142,7 @@ create_symbol_datatype(void)
     return sym_type_id;
 } /* end create_symbol_datatype() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    generate_name
  *
@@ -161,7 +161,7 @@ create_symbol_datatype(void)
  *              The dataset's count
  *
  * Return:      Success:    0
- *                          
+ *
  *              Failure:    Can't fail
  *
  *-------------------------------------------------------------------------
@@ -170,13 +170,13 @@ int
 generate_name(char *name_buf, unsigned level, unsigned count)
 {
     HDassert(name_buf);
-    
-    sprintf(name_buf, "%u-%04u", level, count);
+
+    HDsprintf(name_buf, "%u-%04u", level, count);
 
     return 0;
 } /* end generate_name() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    generate_symbols
  *
@@ -210,7 +210,7 @@ generate_symbols(void)
     return 0;
 } /* end generate_symbols() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    shutdown_symbols
  *
@@ -238,7 +238,7 @@ shutdown_symbols(void)
     return 0;
 } /* end shutdown_symbols() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    print_metadata_retries_info
  *
@@ -273,7 +273,7 @@ print_metadata_retries_info(hid_t fid)
         power = 1;
         for(j = 0; j < info.nbins; j++) {
             if(info.retries[i][j])
-            HDfprintf(stderr, "\t# of retries for %u - %u retries: %u\n", 
+            HDfprintf(stderr, "\t# of retries for %u - %u retries: %u\n",
                 power, (power * 10) - 1, info.retries[i][j]);
             power *= 10;
         } /* end for */
diff --git a/test/swmr_generator.c b/test/swmr_generator.c
index 1c2ec04..4d8a976 100644
--- a/test/swmr_generator.c
+++ b/test/swmr_generator.c
@@ -266,23 +266,23 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write,
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_generator [-q] [-s] [-c <deflate compression level>]\n");
-    printf("    [-i <index type>] [-r <random seed>]\n");
-    printf("\n");
-    printf("NOTE: The random seed option is only used by the sparse test.  Other\n");
-    printf("      tests specify the random seed as a reader/writer option.\n");
-    printf("\n");
-    printf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
-    printf("\n");
-    printf("<index type> should be b2 or ea\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given), no SWMR_WRITE mode (no '-s' given) no\n");
-    printf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n");
-    printf("seed (no -r given).\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_generator [-q] [-s] [-c <deflate compression level>]\n");
+    HDprintf("    [-i <index type>] [-r <random seed>]\n");
+    HDprintf("\n");
+    HDprintf("NOTE: The random seed option is only used by the sparse test.  Other\n");
+    HDprintf("      tests specify the random seed as a reader/writer option.\n");
+    HDprintf("\n");
+    HDprintf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
+    HDprintf("\n");
+    HDprintf("<index type> should be b2 or ea\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given), no SWMR_WRITE mode (no '-s' given) no\n");
+    HDprintf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n");
+    HDprintf("seed (no -r given).\n");
+    HDprintf("\n");
     HDexit(1);
 } /* end usage() */
 
diff --git a/test/swmr_reader.c b/test/swmr_reader.c
index e181d3a..c994a71 100644
--- a/test/swmr_reader.c
+++ b/test/swmr_reader.c
@@ -371,19 +371,19 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file,
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_reader [-q] [-s <# of seconds to sleep between polling>]\n");
-    printf("    [-h <# of common symbols to poll>] [-l <# of random symbols to poll>]\n");
-    printf("    [-r <random seed>] <# of seconds to test>\n");
-    printf("\n");
-    printf("<# of seconds to test> must be specified.\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
-    printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
-    printf("and will generate a random seed (no -r given).\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_reader [-q] [-s <# of seconds to sleep between polling>]\n");
+    HDprintf("    [-h <# of common symbols to poll>] [-l <# of random symbols to poll>]\n");
+    HDprintf("    [-r <random seed>] <# of seconds to test>\n");
+    HDprintf("\n");
+    HDprintf("<# of seconds to test> must be specified.\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
+    HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
+    HDprintf("and will generate a random seed (no -r given).\n");
+    HDprintf("\n");
     HDexit(1);
 }
 
diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c
index 1fae5e7..b4f0d5b 100644
--- a/test/swmr_remove_reader.c
+++ b/test/swmr_remove_reader.c
@@ -359,17 +359,17 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds,
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_remove_reader [-q] [-s <# of seconds to sleep between\n");
-    printf("    polling>] [-h <# of common symbols to poll>] [-l <# of random symbols\n");
-    printf("    to poll>] [-r <random seed>] <# of seconds to test>\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
-    printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
-    printf("and will generate a random seed (no -r given).\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_remove_reader [-q] [-s <# of seconds to sleep between\n");
+    HDprintf("    polling>] [-h <# of common symbols to poll>] [-l <# of random symbols\n");
+    HDprintf("    to poll>] [-r <random seed>] <# of seconds to test>\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
+    HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
+    HDprintf("and will generate a random seed (no -r given).\n");
+    HDprintf("\n");
     HDexit(1);
 } 
 
diff --git a/test/swmr_remove_writer.c b/test/swmr_remove_writer.c
index 43743d9..c4f7b6e 100644
--- a/test/swmr_remove_writer.c
+++ b/test/swmr_remove_writer.c
@@ -224,18 +224,18 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_remove_writer [-q] [-o] [-f <# of shrinks between flushing\n");
-    printf("    file contents>] [-r <random seed>] <# of shrinks>\n");
-    printf("\n");
-    printf("<# of shrinks between flushing file contents> should be 0 (for no\n");
-    printf("flushing) or between 1 and (<# of shrinks> - 1)\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
-    printf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_remove_writer [-q] [-o] [-f <# of shrinks between flushing\n");
+    HDprintf("    file contents>] [-r <random seed>] <# of shrinks>\n");
+    HDprintf("\n");
+    HDprintf("<# of shrinks between flushing file contents> should be 0 (for no\n");
+    HDprintf("flushing) or between 1 and (<# of shrinks> - 1)\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
+    HDprintf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n");
+    HDprintf("\n");
     HDexit(1);
 }
 
diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c
index 3c98f48..cd0ece6 100644
--- a/test/swmr_sparse_reader.c
+++ b/test/swmr_sparse_reader.c
@@ -326,18 +326,18 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords,
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_sparse_reader [-q] [-s <# of seconds to wait for writer>]\n");
-    printf("    [-n <# of reads between reopens>] <# of records>\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given), 1 second wait ('-s 1') and 1 read\n");
-    printf("between reopens ('-r 1')\n");
-    printf("\n");
-    printf("Note that the # of records *must* be the same as that supplied to\n");
-    printf("swmr_sparse_writer\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_sparse_reader [-q] [-s <# of seconds to wait for writer>]\n");
+    HDprintf("    [-n <# of reads between reopens>] <# of records>\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given), 1 second wait ('-s 1') and 1 read\n");
+    HDprintf("between reopens ('-r 1')\n");
+    HDprintf("\n");
+    HDprintf("Note that the # of records *must* be the same as that supplied to\n");
+    HDprintf("swmr_sparse_writer\n");
+    HDprintf("\n");
     HDexit(1);
 } /* end usage() */
 
diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c
index e46f54c..17d8c61 100644
--- a/test/swmr_sparse_writer.c
+++ b/test/swmr_sparse_writer.c
@@ -49,7 +49,7 @@ static int add_records(hid_t fid, unsigned verbose, unsigned long nrecords,
 static void usage(void);
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    open_skeleton
  *
@@ -117,7 +117,7 @@ open_skeleton(const char *filename, unsigned verbose)
 
     /* Emit informational message */
     if(verbose)
-        fprintf(stderr, "Opening datasets\n");
+        HDfprintf(stderr, "Opening datasets\n");
 
     /* Seed the random number generator with the attribute in the file */
     if((aid = H5Aopen(fid, "seed", H5P_DEFAULT)) < 0)
@@ -139,7 +139,7 @@ open_skeleton(const char *filename, unsigned verbose)
     return fid;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    add_records
  *
@@ -311,7 +311,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
 
     /* Emit informational message */
     if(verbose)
-        fprintf(stderr, "Closing datasets\n");
+        HDfprintf(stderr, "Closing datasets\n");
 
     /* Close the datasets */
     for(u = 0; u < NLEVELS; u++)
@@ -325,18 +325,18 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_sparse_writer [-q] [-f <# of records to write between\n");
-    printf("    flushing file contents>] <# of records>\n");
-    printf("\n");
-    printf("<# of records to write between flushing file contents> should be 0\n");
-    printf("(for no flushing) or between 1 and (<# of records> - 1)\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n");
-    printf("('-f 1000')\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_sparse_writer [-q] [-f <# of records to write between\n");
+    HDprintf("    flushing file contents>] <# of records>\n");
+    HDprintf("\n");
+    HDprintf("<# of records to write between flushing file contents> should be 0\n");
+    HDprintf("(for no flushing) or between 1 and (<# of records> - 1)\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n");
+    HDprintf("('-f 1000')\n");
+    HDprintf("\n");
     HDexit(1);
 }
 
diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c
index af4b743..0ee382d 100644
--- a/test/swmr_start_write.c
+++ b/test/swmr_start_write.c
@@ -337,26 +337,26 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file,
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_start_write [-f <# of records to write between flushing file contents>]\n");
-    printf("    [-i <index type>] [-c <deflate compression level>]\n");
-    printf("    [-r <random seed>] [-q] <# of records>\n");
-    printf("\n");
-    printf("<# of records to write between flushing file contents> should be 0\n");
-    printf("(for no flushing) or between 1 and (<# of records> - 1).\n");
-    printf("\n");
-    printf("<index type> should be b2 or ea\n");
-    printf("\n");
-    printf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
-    printf("\n");
-    printf("<# of records> must be specified.\n");
-    printf("\n");
-    printf("Defaults to flushing every 10000 records ('-f 10000'),\n");
-    printf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n");
-    printf("will generate a random seed (no -r given), and verbose (no '-q' given)\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_start_write [-f <# of records to write between flushing file contents>]\n");
+    HDprintf("    [-i <index type>] [-c <deflate compression level>]\n");
+    HDprintf("    [-r <random seed>] [-q] <# of records>\n");
+    HDprintf("\n");
+    HDprintf("<# of records to write between flushing file contents> should be 0\n");
+    HDprintf("(for no flushing) or between 1 and (<# of records> - 1).\n");
+    HDprintf("\n");
+    HDprintf("<index type> should be b2 or ea\n");
+    HDprintf("\n");
+    HDprintf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
+    HDprintf("\n");
+    HDprintf("<# of records> must be specified.\n");
+    HDprintf("\n");
+    HDprintf("Defaults to flushing every 10000 records ('-f 10000'),\n");
+    HDprintf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n");
+    HDprintf("will generate a random seed (no -r given), and verbose (no '-q' given)\n");
+    HDprintf("\n");
     HDexit(1);
 } /* usage() */
 
diff --git a/test/swmr_writer.c b/test/swmr_writer.c
index ee7e32e..6df7355 100644
--- a/test/swmr_writer.c
+++ b/test/swmr_writer.c
@@ -277,20 +277,20 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file,
 static void
 usage(void)
 {
-    printf("\n");
-    printf("Usage error!\n");
-    printf("\n");
-    printf("Usage: swmr_writer [-q] [-o] [-f <# of records to write between flushing\n");
-    printf("    file contents>] [-r <random seed>] <# of records>\n");
-    printf("\n");
-    printf("<# of records to write between flushing file contents> should be 0\n");
-    printf("(for no flushing) or between 1 and (<# of records> - 1).\n");
-    printf("\n");
-    printf("<# of records> must be specified.\n");
-    printf("\n");
-    printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
-    printf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n");
-    printf("\n");
+    HDprintf("\n");
+    HDprintf("Usage error!\n");
+    HDprintf("\n");
+    HDprintf("Usage: swmr_writer [-q] [-o] [-f <# of records to write between flushing\n");
+    HDprintf("    file contents>] [-r <random seed>] <# of records>\n");
+    HDprintf("\n");
+    HDprintf("<# of records to write between flushing file contents> should be 0\n");
+    HDprintf("(for no flushing) or between 1 and (<# of records> - 1).\n");
+    HDprintf("\n");
+    HDprintf("<# of records> must be specified.\n");
+    HDprintf("\n");
+    HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
+    HDprintf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n");
+    HDprintf("\n");
     HDexit(1);
 }
 
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 6edbc69..53e0e43 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -897,8 +897,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 */
 
@@ -1035,7 +1035,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 */
@@ -1675,7 +1675,6 @@ test_attr_dtype_shared(hid_t fapl)
     if(empty_filesize < 0)
         TestErrPrintf("Line %d: file size wrong!\n", __LINE__);
 
-
     /* Re-open file */
     file_id = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl);
     CHECK(file_id, FAIL, "H5Fopen");
@@ -2082,7 +2081,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");
 
@@ -2106,7 +2105,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))
@@ -2205,7 +2204,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");
 
@@ -2224,7 +2223,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");
 
@@ -2345,7 +2344,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");
 
@@ -2368,7 +2367,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");
 
@@ -2438,7 +2437,6 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Deleting Attributes in Dense Storage\n"));
 
-    /* Create file */
     if (use_min_dset_oh) { /* using minimized dataset headers */
         /* modify fcpl...
          * sidestep "bug" where file space is lost with minimized dset ohdrs
@@ -2502,7 +2500,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");
 
@@ -2548,7 +2546,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");
 
@@ -2562,7 +2560,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");
 
@@ -2575,7 +2573,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");
 
@@ -2635,7 +2633,6 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl)
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Renaming Attributes in Dense Storage\n"));
 
-    /* Create file */
     if (use_min_dset_oh) { /* using minimized dataset headers */
         /* modify fcpl...
          * sidestep "bug" where file space is lost with minimized dset ohdrs
@@ -2699,7 +2696,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");
 
@@ -2712,7 +2709,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);
@@ -2766,7 +2763,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");
 
@@ -2827,7 +2824,6 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl)
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Unlinking Object with Attributes in Dense Storage\n"));
 
-    /* Create file */
     if (use_min_dset_oh) { /* using minimized dataset headers */
         /* modify fcpl...
          * sidestep "bug" where file space is lost with minimized dset ohdrs
@@ -2842,11 +2838,9 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl)
     if (use_min_dset_oh)
         CHECK(H5Pclose(fcpl), FAIL, "H5Pclose");
 
-    /* Close file */
     ret = H5Fclose(fid);
     CHECK(ret, FAIL, "H5Fclose");
 
-    /* Get size of file */
     empty_filesize = h5_get_file_size(FILENAME, fapl);
     if(empty_filesize < 0)
         TestErrPrintf("Line %d: file size wrong!\n", __LINE__);
@@ -2887,7 +2881,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");
 
@@ -3031,7 +3025,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");
 
@@ -3052,7 +3046,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");
 
@@ -3084,7 +3078,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");
 
@@ -3192,7 +3186,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");
 
@@ -3215,7 +3209,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");
 
@@ -3503,7 +3497,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");
 
@@ -3573,7 +3567,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");
 
@@ -3740,7 +3734,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");
 
@@ -3759,7 +3753,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");
 
@@ -3778,7 +3772,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");
@@ -3802,7 +3796,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");
 
@@ -3825,7 +3819,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");
 
@@ -3840,7 +3834,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");
 
@@ -3855,7 +3849,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");
 
@@ -3870,7 +3864,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");
 
@@ -4280,7 +4274,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");
@@ -4333,7 +4327,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");
@@ -4583,7 +4577,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");
 
@@ -4673,7 +4667,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");
 
@@ -4788,7 +4782,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");
 
@@ -4811,7 +4805,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");
 
@@ -4905,7 +4899,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");
 
@@ -5181,7 +5175,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");
 
@@ -5204,7 +5198,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");
 
@@ -5232,7 +5226,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");
 
@@ -5252,7 +5246,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");
 
@@ -5268,7 +5262,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");
 
@@ -5356,7 +5350,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");
 
@@ -5376,7 +5370,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");
 
@@ -5392,7 +5386,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");
 
@@ -5421,11 +5415,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 */
@@ -5567,7 +5561,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");
 
@@ -5908,7 +5902,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");
 
@@ -5945,7 +5939,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");
 
@@ -6151,7 +6145,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");
 
@@ -6223,9 +6217,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 */
@@ -6261,7 +6255,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");
 
@@ -6348,9 +6342,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 */
@@ -6394,7 +6388,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");
 
@@ -6459,9 +6453,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 */
@@ -6508,9 +6502,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 */
@@ -6600,7 +6594,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);
 
@@ -7114,7 +7108,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");
 
@@ -7184,7 +7178,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");
 
@@ -7465,7 +7459,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");
 
@@ -7523,7 +7517,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");
 
@@ -7628,7 +7622,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");
 
@@ -7798,7 +7792,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");
 
@@ -7865,7 +7859,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");
 
@@ -8047,7 +8041,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");
 
@@ -8104,7 +8098,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");
 
@@ -8328,7 +8322,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) {
@@ -8664,7 +8658,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) {
@@ -8771,7 +8765,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);
@@ -9115,7 +9109,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) {
@@ -9225,7 +9219,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);
@@ -9489,7 +9483,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) {
@@ -9616,7 +9610,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);
@@ -9891,7 +9885,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");
 
@@ -9901,7 +9895,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");
     }
@@ -9925,7 +9919,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");
 
@@ -9968,7 +9962,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");
 
@@ -9978,7 +9972,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 574d7c9..2611178 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/testframe.c b/test/testframe.c
index 97b2d1f..a096f36 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -74,12 +74,12 @@ AddTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), con
 {
     /* Sanity checking */
     if (HDstrlen(TheDescr) >= MAXTESTDESC) {
-        printf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n",
+        HDprintf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n",
         TheDescr, MAXTESTDESC);
         exit(EXIT_FAILURE);
     } /* end if */
     if (HDstrlen(TheName) >= MAXTESTNAME) {
-        printf("Test name too long, increase MAXTESTNAME(%d).\n",
+        HDprintf("Test name too long, increase MAXTESTNAME(%d).\n",
         MAXTESTNAME);
         exit(EXIT_FAILURE);
     } /* end if */
@@ -91,7 +91,7 @@ AddTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), con
 
         /* Reallocate array */
         if(NULL == (newTest = (TestStruct *)HDrealloc(Test, newAlloc * sizeof(TestStruct)))) {
-            printf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc, newAlloc);
+            HDprintf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc, newAlloc);
             exit(EXIT_FAILURE);
         } /* end if */
 
@@ -559,9 +559,9 @@ 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;
@@ -609,7 +609,7 @@ void SetTest(const char *testname, int action)
         break;
     default:
         /* error */
-        printf("*** ERROR: Unknown action (%d) for SetTest\n", action);
+        HDprintf("*** ERROR: Unknown action (%d) for SetTest\n", action);
         break;
     }
 }
diff --git a/test/tfile.c b/test/tfile.c
index 0fbc4e3..a3bcfb7 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -1098,14 +1098,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");
     }
@@ -1165,7 +1165,7 @@ test_get_obj_ids(void)
 
     /* 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");
     }
@@ -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 */
@@ -2153,6 +2153,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     hsize_t max_dims2[2] = {H5S_UNLIMITED, H5S_UNLIMITED};    /* Maximum dimension sizes for v2 B-tree index */
     hsize_t chunks[1] = {2}, chunks2[2] = {4, 5};        /* Chunk dimension sizes */
     hsize_t size;                               /* File size */
+    char filename[FILENAME_LEN];    /* Filename to use */
     const char* data[] = {"String 1", "String 2", "String 3", "String 4", "String 5"};    /* Input Data */
     const char* e_data[] = {"String 1", "String 2", "String 3", "String 4", "String 5", "String 6", "String 7"};    /* Input Data */
     char* buffer[5];                /* Output buffer */
@@ -2163,15 +2164,16 @@ test_file_double_file_dataset_open(hbool_t new_format)
     MESSAGE(5, ("Testing double file and dataset open/close\n"));
 
     /* Setting up test file */
-    fapl = H5Pcreate(H5P_FILE_ACCESS);
+    fapl = h5_fileaccess();
     CHECK(fapl, FAIL, "H5Pcreate");
     if(new_format) {
         ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
         CHECK(ret, FAIL, "H5Pset_libver_bounds");
     } /* end if */
+    h5_fixname(FILE1, fapl, filename, sizeof filename);
 
     /* Create the test file */
-    fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+    fid1 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     CHECK(fid1, FAIL, "H5Fcreate");
 
     /* Create a chunked dataset with fixed array indexing */
@@ -2253,8 +2255,6 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(ret, FAIL, "H5Sclose");
     ret = H5Pclose(dcpl);
     CHECK(ret, FAIL, "H5Pclose");
-    ret = H5Pclose(fapl);
-    CHECK(ret, FAIL, "H5Pclose");
     ret = H5Fclose(fid1);
     CHECK(ret, FAIL, "H5Fclose");
 
@@ -2263,7 +2263,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
      */
 
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* First file's dataset open */
@@ -2278,7 +2278,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2319,11 +2319,11 @@ test_file_double_file_dataset_open(hbool_t new_format)
      */
 
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2384,7 +2384,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
      */
 
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* First file's dataset open */
@@ -2396,7 +2396,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(size, 0, "H5Dget_storage_size");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2429,7 +2429,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
      *     from second call to H5Dset_extent->...H5D__earray_idx_remove->H5EA_get...H5EA__iblock_protect...H5AC_protect
      */
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* First file's dataset open */
@@ -2448,7 +2448,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2479,6 +2479,9 @@ test_file_double_file_dataset_open(hbool_t new_format)
     ret = H5Tclose(tid1);
     CHECK(ret, FAIL, "H5Tclose");
 
+    /* Close FAPL */
+    ret = H5Pclose(fapl);
+    CHECK(ret, FAIL, "H5Pclose");
 } /* end test_file_double_dataset_open() */
 
 /****************************************************************
@@ -3947,14 +3950,6 @@ error:
 **      This routine checks the free space available in a file as
 **      returned by the public routine H5Fget_freespace().
 **
-**  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; Dec 2012
-**    Add changes due to paged aggregation via new format:
-**    the amount of freespace is different.
 **
 *****************************************************************/
 static void
@@ -4063,7 +4058,7 @@ test_file_freespace(const char *env_h5_drvr)
 
             /* Create datasets in file */
             for(u = 0; u < 10; u++) {
-                sprintf(name, "Dataset %u", u);
+                HDsprintf(name, "Dataset %u", u);
                 dset = H5Dcreate2(file, name, H5T_STD_U32LE, dspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
                 CHECK(dset, FAIL, "H5Dcreate2");
 
@@ -4086,7 +4081,7 @@ test_file_freespace(const char *env_h5_drvr)
 
             /* Delete datasets in file */
             for(k = 9; k >= 0; k--) {
-                sprintf(name, "Dataset %u", (unsigned)k);
+                HDsprintf(name, "Dataset %u", (unsigned)k);
                 ret = H5Ldelete(file, name, H5P_DEFAULT);
                 CHECK(ret, FAIL, "H5Ldelete");
             } /* end for */
@@ -4094,10 +4089,7 @@ test_file_freespace(const char *env_h5_drvr)
             /* Check that there is the right amount of free space in the file */
             free_space = H5Fget_freespace(file);
             CHECK(free_space, FAIL, "H5Fget_freespace");
-            if(new_format)
-                VERIFY(free_space, expected_fs_del, "H5Fget_freespace");
-            else
-                VERIFY(free_space, expected_fs_del, "H5Fget_freespace");
+            VERIFY(free_space, expected_fs_del, "H5Fget_freespace");
 
             /* Close file */
             ret = H5Fclose(file);
@@ -4217,7 +4209,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format)
 
         /* Create datasets in file */
         for(u = 0; u < 10; u++) {
-            sprintf(name, "Dataset %u", u);
+            HDsprintf(name, "Dataset %u", u);
             dset = H5Dcreate2(file, name, H5T_STD_U32LE, dspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
             CHECK(dset, FAIL, "H5Dcreate2");
 
@@ -4235,7 +4227,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format)
 
         /* Delete odd-numbered datasets in file */
         for(u = 0; u < 10; u++) {
-            sprintf(name, "Dataset %u", u);
+            HDsprintf(name, "Dataset %u", u);
             if(u % 2) {
                 ret = H5Ldelete(file, name, H5P_DEFAULT);
                 CHECK(ret, FAIL, "H5Ldelete");
@@ -5094,13 +5086,13 @@ test_libver_bounds_open(void)
  *              This test is copied from the user test program: copy10.c.
  *              (See attached programs in the jira issue.)
  *
- *              The source file used in the test is generated by the user test 
- *              program "fill18.c" with the 1.8 library.  The file is created 
+ *              The source file used in the test is generated by the user test
+ *              program "fill18.c" with the 1.8 library.  The file is created
  *              with the latest format and the dataset created in the file
  *              has version 3 fill value message (latest).
  *
  *              The test creates the destination file with (v18, v18) version bounds.
- *              H5Ocopy() should succeed in copying the dataset in the source file 
+ *              H5Ocopy() should succeed in copying the dataset in the source file
  *              to the destination file.
  *
  * Return:      Success:    0
@@ -5121,15 +5113,15 @@ test_libver_bounds_copy(void)
     MESSAGE(5, ("Testing H5Ocopy a dataset in a 1.8 library file to a 1.10 library file\n"));
 
     /* Get the test file name */
-    src_fname = H5_get_srcdir_filename(SRC_FILE); 
+    src_fname = H5_get_srcdir_filename(SRC_FILE);
 
     /* Open the source test file */
     src_fid = H5Fopen(src_fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-    CHECK(src_fid, H5I_INVALID_HID, "H5Fopen");
+    CHECK(src_fid, FAIL, "H5Fopen");
 
     /* Create file access property list */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
-    CHECK(fapl, H5I_INVALID_HID, "H5Pcreate");
+    CHECK(fapl, FAIL, "H5Pcreate");
 
     /* Set library version bounds to (v18, v18) */
     ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_V18, H5F_LIBVER_V18);
@@ -5137,7 +5129,7 @@ test_libver_bounds_copy(void)
 
     /* Create the destination file with the fapl */
     dst_fid = H5Fcreate(DST_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
-    CHECK(dst_fid, H5I_INVALID_HID, "H5Pcreate");
+    CHECK(dst_fid, FAIL, "H5Pcreate");
 
     /* Close the fapl */
     ret = H5Pclose(fapl);
@@ -5397,7 +5389,7 @@ test_libver_bounds_super(hid_t fapl)
 ** File creation      |                             succeed                                          |
 **                    |______________________________________________________________________________|
 **
-**                                  Creating a file with SWMR-write access 
+**                                  Creating a file with SWMR-write access
 **                    --------------------------------------------------------------------------------
 **                    | (earliest, v18) | (earliest, v110) | (v18, v18) | (v18, v110) | (v110, v110) |
 **                    |______________________________________________________________________________|
@@ -5458,11 +5450,11 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n
 
         switch(low) {
             case H5F_LIBVER_EARLIEST:
-                ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_DEF ||
-                      f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_1 ||
-                      f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_2);
-                VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds");
-                break;
+               ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_DEF  ||
+                     f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_1 ||
+                     f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_2);
+               VERIFY(ok, TRUE, "HDF5_superblock_ver_bounds");
+               break;
 
             case H5F_LIBVER_V18:
                ok = (f->shared->sblock->super_vers == HDF5_SUPERBLOCK_VERSION_2);
@@ -7109,7 +7101,7 @@ test_incr_filesize(void)
 
         /* Create datasets in file */
         for(u = 0; u < 10; u++) {
-            sprintf(name, "Dataset %u", u);
+            HDsprintf(name, "Dataset %u", u);
             dset = H5Dcreate2(fid, name, H5T_STD_U32LE, dspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
             CHECK(dset, FAIL, "H5Dcreate2");
 
@@ -7139,7 +7131,7 @@ test_incr_filesize(void)
         /* Get the stored EOA */
         ret = H5Fget_eoa(fid, &stored_eoa);
         CHECK(ret, FAIL, "H5Fget_eoa");
-        
+
         /* Verify the stored EOA is the same as filesize */
         VERIFY(filesize, stored_eoa, "file size");
 
@@ -7529,6 +7521,8 @@ void
 test_file(void)
 {
     const char  *env_h5_drvr;         /* File Driver value from environment */
+    hid_t fapl_id = H5I_INVALID_HID;    /* VFD-dependent fapl ID */
+    herr_t   ret;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Low-Level File I/O\n"));
@@ -7538,6 +7532,10 @@ test_file(void)
     if(env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
+    /* Improved version of VFD-dependent checks */
+    fapl_id = h5_fileaccess();
+    CHECK(fapl_id, H5I_INVALID_HID, "h5_fileaccess");
+
     test_file_create();                         /* Test file creation(also creation templates)*/
     test_file_open();                           /* Test file opening */
     test_file_reopen();                         /* Test file reopening */
@@ -7584,6 +7582,10 @@ test_file(void)
 #ifndef H5_NO_DEPRECATED_SYMBOLS
     test_deprec();                              /* Test deprecated routines */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
+
+    ret = H5Pclose(fapl_id);
+    CHECK(ret, FAIL, "H5Pclose");
+
 } /* test_file() */
 
 
diff --git a/test/tgenprop.c b/test/tgenprop.c
index d5e767f..72fe7ca 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -678,7 +678,7 @@ test_genprop_basic_list(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!H5_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", (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
 
@@ -770,7 +770,7 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!H5_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", (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
 
@@ -783,7 +783,7 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!H5_DBL_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 */
@@ -820,7 +820,7 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!H5_DBL_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 */
@@ -1225,7 +1225,7 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!H5_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", (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
     /* Check values of temporary properties (set with regular values) */
@@ -1240,7 +1240,7 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if(!H5_DBL_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/th5o.c b/test/th5o.c
index 3ecd08b..009cc2c 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -13,7 +13,7 @@
 
 /***********************************************************
 *
-* Test program:	 th5o
+* Test program:     th5o
 *
 * Test public H5O functions for accessing
 *
@@ -30,7 +30,7 @@
 #define TEST6_DIM1 100
 #define TEST6_DIM2 100
 
-
+
 /****************************************************************
 **
 **  test_h5o_open(): Test H5Oopen function.
@@ -140,7 +140,7 @@ test_h5o_open(void)
 } /* test_h5o_open() */
 
 
-
+
 /****************************************************************
 **
 **  test_h5o_close(): Test H5Oclose function.
@@ -230,7 +230,7 @@ test_h5o_close(void)
     CHECK(ret, FAIL, "H5Fclose");
 }
 
-
+
 /****************************************************************
 **
 **  test_h5o_open_by_addr(): Test H5Oopen_by_addr function.
@@ -367,7 +367,7 @@ test_h5o_open_by_addr(void)
     VERIFY(dtype, FAIL, "H5Oopen_by_addr");
 } /* test_h5o_open_by_addr() */
 
-
+
 /****************************************************************
 **
 **  test_h5o_refcount(): Test H5O refcounting functions.
@@ -562,7 +562,7 @@ test_h5o_refcount(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* test_h5o_refcount() */
 
-
+
 /****************************************************************
 **
 **  test_h5o_plist(): Test object creation properties
@@ -756,7 +756,7 @@ test_h5o_plist(void)
     CHECK(ret, FAIL, "H5Pclose");
 } /* test_h5o_plist() */
 
-
+
 /****************************************************************
 **
 **  test_h5o_link(): Test creating link to object
@@ -910,7 +910,7 @@ test_h5o_link(void)
     HDfree(rdata);
 } /* end test_h5o_link() */
 
-
+
 /****************************************************************
 **
 **  test_h5o_comment(): Test H5Oset(get)_comment functions.
@@ -1083,7 +1083,7 @@ test_h5o_comment(void)
 
 } /* test_h5o_comment() */
 
-
+
 /****************************************************************
 **
 **  test_h5o_comment_by_name(): Test H5Oset(get)_comment_by_name functions.
@@ -1242,7 +1242,7 @@ test_h5o_comment_by_name(void)
 
 } /* test_h5o_comment_by_name() */
 
-
+
 /****************************************************************
 **
 **  test_h5o_getinfo_same_file():  Test that querying the object info for
@@ -1382,7 +1382,7 @@ visit_obj_cb(hid_t group_id, const char *name, const H5O_info_t *oinfo1,
     return(H5_ITER_CONT);
 } /* end visit_obj_cb() */
 
-
+
 /****************************************************************
 **
 **  test_h5o_getinfo_visit():
@@ -1419,7 +1419,7 @@ test_h5o_getinfo_visit(void)
     /* Attach 10 attributes to "group1" */
     for(j = 0; j <10; j++) {
         /* Create the attribute name */
-        sprintf(attrname, "attr%u", j);
+        HDsprintf(attrname, "attr%u", j);
         /* Create the attribute */
         aid = H5Acreate2(gid1, attrname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(aid, FAIL, "H5Acreate2");
@@ -1479,7 +1479,7 @@ test_h5o_getinfo_visit(void)
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
+
 /****************************************************************
 **
 **  test_h5o(): Main H5O (generic object) testing routine.
@@ -1505,7 +1505,7 @@ test_h5o(void)
 #endif
 } /* test_h5o() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    cleanup_h5o
  *
diff --git a/test/th5s.c b/test/th5s.c
index ed205df..78baf08 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -187,7 +187,7 @@ test_h5s_basic(void)
     CHECK(ret, FAIL, "H5Sclose");
 
     /*
-     * Check to be sure we can't create a simple data space that has too many
+     * Check to be sure we can't create a simple dataspace that has too many
      * dimensions.
      */
     H5E_BEGIN_TRY {
@@ -214,7 +214,7 @@ test_h5s_basic(void)
         CHECK_I(ret, "H5Fclose");
     }
     else
-        printf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile);
+        HDprintf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile);
     }
 
     /* Verify that incorrect dimensions don't work */
@@ -318,7 +318,7 @@ test_h5s_basic(void)
 
 /****************************************************************
 **
-**  test_h5s_null(): Test NULL data space
+**  test_h5s_null(): Test NULL dataspace
 **
 ****************************************************************/
 static void
@@ -460,7 +460,7 @@ test_h5s_null(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*============================================
-     *  Reopen the file to check the data space
+     *  Reopen the file to check the dataspace
      *============================================
      */
     fid = H5Fopen(NULLFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
@@ -683,7 +683,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]);
                 }
             }
@@ -705,7 +705,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]);
                 }
             }
@@ -772,7 +772,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]);
                 }
         }
@@ -798,7 +798,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]);
                     }
                 }
@@ -822,7 +822,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]);
                 }
         }
@@ -869,7 +869,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]);
                 }
         }
@@ -913,7 +913,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[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]);
                 }
             }
@@ -967,7 +967,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]);
                 }
             }
@@ -1029,7 +1029,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]);
                     }
                 }
@@ -1078,7 +1078,7 @@ test_h5s_zero_dim(void)
         CHECK(ret, FAIL, "H5Fclose");
 
         /*============================================
-         *  Reopen the file to check the data space
+         *  Reopen the file to check the dataspace
          *============================================
          */
         fid1 = H5Fopen(ZEROFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
@@ -1116,7 +1116,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]);
                 }
             }
@@ -1154,7 +1154,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]);
                 }
             }
@@ -1218,8 +1218,10 @@ test_h5s_encode(void)
     ret = H5Sencode(sid1, NULL, &sbuf_size);
     CHECK(ret, FAIL, "H5Sencode");
 
-    if(sbuf_size>0)
+    if(sbuf_size>0) {
         sbuf = (unsigned char*)HDcalloc((size_t)1, sbuf_size);
+        CHECK(sbuf, NULL, "HDcalloc");
+    }
 
     /* Try decoding bogus buffer */
     H5E_BEGIN_TRY {
@@ -1277,8 +1279,10 @@ test_h5s_encode(void)
     ret = H5Sencode(sid2, NULL, &null_size);
     CHECK(ret, FAIL, "H5Sencode");
 
-    if(null_size>0)
+    if(null_size>0) {
         null_sbuf = (unsigned char*)HDcalloc((size_t)1, null_size);
+        CHECK(null_sbuf, NULL, "HDcalloc");
+    }
 
     ret = H5Sencode(sid2, null_sbuf, &null_size);
     CHECK(ret, FAIL, "H5Sencode");
@@ -1306,12 +1310,14 @@ test_h5s_encode(void)
     sid3 = H5Screate(H5S_SCALAR);
     CHECK(sid3, FAIL, "H5Screate_simple");
 
-    /* Encode scalar data space in a buffer */
+    /* Encode scalar dataspace in a buffer */
     ret = H5Sencode(sid3, NULL, &scalar_size);
     CHECK(ret, FAIL, "H5Sencode");
 
-    if(scalar_size>0)
+    if(scalar_size>0) {
         scalar_buf = (unsigned char*)HDcalloc((size_t)1, scalar_size);
+        CHECK(scalar_buf, NULL, "HDcalloc");
+    }
 
     ret = H5Sencode(sid3, scalar_buf, &scalar_size);
     CHECK(ret, FAIL, "H5Sencode");
@@ -1621,9 +1627,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",(double)space4_data.f,(double)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",(double)space4_data.f,(double)rdata.f);
         TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n",space4_data.c1,rdata.c2);
      } /* end if */
 
@@ -1677,7 +1683,7 @@ test_h5s_chunk(void)
     status = H5Pset_chunk(plist_id, 2, csize);
     CHECK(status, FAIL, "H5Pset_chunk");
 
-    /* Create the data space */
+    /* Create the dataspace */
     dims[0] = 50000;
     dims[1] = 3;
     space_id = H5Screate_simple(2, dims, NULL);
@@ -2811,8 +2817,8 @@ test_h5s(void)
     test_h5s_encode_points_exceed32();      /* Testing encoding point selection that exceeds 32 bits */
     test_h5s_encode_length();               /* Test version 2 hyperslab encoding length is correct */
 
-    test_h5s_scalar_write();	/* Test scalar H5S writing code */
-    test_h5s_scalar_read();	    /* Test scalar H5S reading code */
+    test_h5s_scalar_write();    /* Test scalar H5S writing code */
+    test_h5s_scalar_read();     /* Test scalar H5S reading code */
 
     test_h5s_compound_scalar_write();    /* Test compound datatype scalar H5S writing code */
     test_h5s_compound_scalar_read();    /* Test compound datatype scalar H5S reading code */
diff --git a/test/titerate.c b/test/titerate.c
index 6a75d5b..9ad145d 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -379,7 +379,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() */
@@ -416,7 +416,7 @@ 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");
 
@@ -621,7 +621,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);
diff --git a/test/tmisc.c b/test/tmisc.c
index 47c0606..b1c20dc 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -981,13 +981,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 */
         }
@@ -1064,7 +1064,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);
@@ -2953,7 +2953,7 @@ 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);
@@ -4721,7 +4721,7 @@ test_misc25a(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc25a() */
 
-
+
 /****************************************************************
 **
 **  test_misc25b(): Exercise null object header message merge bug
@@ -4757,7 +4757,7 @@ test_misc25b(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc25b() */
 
-
+
 /****************************************************************
 **
 **  test_misc25c(): Exercise another null object header message merge bug.
@@ -4891,7 +4891,7 @@ test_misc25c(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc25c() */
 
-
+
 /****************************************************************
 **
 **  test_misc26(): Regression test: ensure that copying filter
@@ -4977,7 +4977,7 @@ test_misc26(void)
     CHECK_I(ret, "H5Pclose");
 }
 
-
+
 /****************************************************************
 **
 **  test_misc27(): Ensure that objects with incorrect # of object
@@ -5022,7 +5022,7 @@ test_misc27(void)
     CHECK(ret, FAIL, "H5Fclose");
 } /* end test_misc27() */
 
-
+
 /****************************************************************
 **
 **  test_misc28(): Ensure that the dataset chunk cache will hold
@@ -5199,7 +5199,7 @@ test_misc28(void)
     CHECK_I(ret, "H5Pclose");
 } /* end test_misc28() */
 
-
+
 /****************************************************************
 **
 **  test_misc29(): Ensure that speculative metadata reads don't
@@ -5248,7 +5248,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
@@ -5292,7 +5292,7 @@ test_misc30(void)
                 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");
 
@@ -5313,7 +5313,7 @@ test_misc30(void)
     VERIFY(file_size[0], file_size[1], "test_misc30");
 } /* end test_misc30() */
 
-
+
 /****************************************************************
 **
 **  test_misc31(): Test reentering library through deprecated
@@ -5411,7 +5411,7 @@ test_misc31(void)
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 } /* end test_misc31() */
 
-
+
 /****************************************************************
  *
  *  test_misc32(): Simple test of filter memory allocation
@@ -5585,7 +5585,7 @@ test_misc34(void)
 
 } /* end test_misc34() */
 
-
+
 /****************************************************************
 **
 **  test_misc(): Main misc. test routine.
@@ -5638,7 +5638,7 @@ test_misc(void)
 
 } /* test_misc() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    cleanup_misc
  *
diff --git a/test/tselect.c b/test/tselect.c
index 90e7508..00ddeb1 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -1188,8 +1188,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 */
@@ -1565,13 +1565,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 */
@@ -5046,10 +5046,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 */
@@ -5377,12 +5377,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 */
 
@@ -5508,12 +5508,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 */
 
@@ -5638,12 +5638,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 */
 
@@ -5812,14 +5812,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 {
@@ -8401,7 +8401,8 @@ 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");
@@ -8515,7 +8516,8 @@ 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");
@@ -8681,7 +8683,8 @@ test_shape_same(void)
             /* 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;
+                    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");
@@ -8990,26 +8993,26 @@ test_shape_same(void)
 **
 **  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),
+**      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.
+**    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),
+**    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.
-**	H5S_select_shape_same() should return FALSE when comparing
-**	each to the 2 D selection.
+**    H5Sselect_shape_same() should return FALSE when comparing
+**    each to the 2-D selection.
 **
 ****************************************************************/
 static void
@@ -9281,7 +9284,7 @@ test_shape_same_dr__smoke_check_1(void)
 **
 **  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:
 **
 **		* * - - * * - - * *
@@ -9298,25 +9301,25 @@ test_shape_same_dr__smoke_check_1(void)
 **	where asterisks indicate selected elements, and dashes
 **	indicate unselected elements.
 **
-**	Similarly, create nine, 3 D data spaces (10 X 10 X 10),
+**    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
+**    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),
+**    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.
-**	H5S_select_shape_same() should return FALSE when
-**	comparing this selection to the 2 D selection.
+**    H5Sselect_shape_same() should return FALSE when
+**    comparing this selection to the 2-D selection.
 **
 ****************************************************************/
 static void
@@ -9689,7 +9692,7 @@ test_shape_same_dr__smoke_check_2(void)
 **
 **  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
@@ -9708,7 +9711,7 @@ test_shape_same_dr__smoke_check_2(void)
 **	where asterisks indicate selected elements, and dashes
 **	indicate unselected elements.
 **
-**	Similarly, create nine, 3 D data spaces (10 X 10 X 10),
+**    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.
@@ -9716,10 +9719,10 @@ test_shape_same_dr__smoke_check_2(void)
 **	cases.
 **
 **	Assuming that z is the fastest changing dimension,
-**	H5S_select_shape_same() should return TRUE when
-**	comparing the 2 D irregular hyperslab selection
+**    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
+**    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.
 **
@@ -10206,10 +10209,10 @@ test_shape_same_dr__smoke_check_3(void)
 **
 **  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)
@@ -10226,8 +10229,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.
 **
@@ -10425,10 +10428,10 @@ 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().
+**    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
+**    H5Sselect_shape_same() should always return FALSE if
 **	they don't).
 **
 **	Per Quincey's suggestion, only test up to 5 dimensional
@@ -10469,13 +10472,13 @@ test_shape_same_dr__full_space_vs_slice(int test_num,
     HDassert( edge_size > 0 );
     HDassert( edge_size <= 1000 );
 
-    sprintf(test_desc_0,
+    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],
@@ -10558,10 +10561,10 @@ test_shape_same_dr__full_space_vs_slice(int test_num,
 **
 **  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).
@@ -10569,7 +10572,7 @@ test_shape_same_dr__full_space_vs_slice(int test_num,
 **	sufficient.
 **
 **	All the n-cubes will have lengths of the same size, so
-**	H5S_select_shape_same() should return true iff:
+**    H5Sselect_shape_same() should return true iff:
 **
 **	1) the rank for the fully selected n cube equals the
 **         number of dimensions selected in the slice through the
@@ -10771,13 +10774,13 @@ test_shape_same_dr__checkerboard(int test_num,
     HDassert( dims_selected >= 0 );
     HDassert( dims_selected <= large_rank );
 
-    sprintf(test_desc_0,
+    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,
@@ -11424,13 +11427,13 @@ test_shape_same_dr__irregular(int test_num,
     HDassert( dims_selected >= 0 );
     HDassert( dims_selected <= large_rank );
 
-    sprintf(test_desc_0,
+    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,
@@ -13787,13 +13790,11 @@ test_select(void)
  * Programmer:	Albert Cheng
  *              July 2, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
 cleanup_select(void)
 {
-    remove(FILENAME);
+    HDremove(FILENAME);
 }
 
diff --git a/test/tunicode.c b/test/tunicode.c
index 255dc50..b3fa237 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -774,15 +774,15 @@ void dump_string(const char * string)
   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 = HDstrlen(string);
 
   for(x=0; x<length; x++)
-    printf("%x ", string[x] & (0x000000FF));
+    HDprintf("%x ", string[x] & (0x000000FF));
 
-  printf("\n");
+  HDprintf("\n");
 }
 
 /* Main test.
diff --git a/test/unlink.c b/test/unlink.c
index 2a7bbcd..f79aa29 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -15,16 +15,16 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Friday, September 25, 1998
  *
- * Purpose:	Test unlinking operations.
+ * Purpose:    Test unlinking operations.
  */
 
-#define H5G_FRIEND		/*suppress error about including H5Gpkg	  */
+#define H5G_FRIEND        /*suppress error about including H5Gpkg      */
 
 /* Define this macro to indicate that the testing APIs should be available */
 #define H5G_TESTING
 
 #include "h5test.h"
-#include "H5Gpkg.h"		/* Groups				*/
+#include "H5Gpkg.h"        /* Groups                */
 
 const char *FILENAME[] = {
     "unlink",
@@ -77,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:
@@ -98,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
@@ -122,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 */
@@ -136,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:
@@ -162,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;
@@ -175,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();
 
@@ -233,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
  *
  *-------------------------------------------------------------------------
@@ -257,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");
 
@@ -274,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:
@@ -299,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");
@@ -326,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
  *
@@ -353,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");
 
@@ -403,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
  *
@@ -433,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");
 
@@ -473,7 +473,7 @@ error:
     return 1;
 } /* end check_new_move() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_filespace
  *
@@ -492,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 */
@@ -514,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 */
@@ -806,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
@@ -912,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 */
@@ -920,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 */
 
@@ -975,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 */
@@ -1004,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 */
 
@@ -1024,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 */
 
@@ -1032,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 */
 
@@ -1232,7 +1232,7 @@ error:
     return 1;
 } /* end test_filespace() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_create_unlink
  *
@@ -1251,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);
 
@@ -1265,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 */
@@ -1299,7 +1299,7 @@ error:
     return 1;
 } /* end test_create_unlink() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_link_slashes
  *
@@ -1320,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");
 
@@ -1367,7 +1367,7 @@ error:
     return 1;
 } /* end test_link_slashes() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_slashes
  *
@@ -1388,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");
 
@@ -1464,7 +1464,7 @@ delete_node(hid_t pid, hid_t id)
     return(0);
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_rightleaf
  *
@@ -1499,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 */
 
@@ -1543,7 +1543,7 @@ error:
     return 1;
 } /* end test_unlink_rightleaf() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_rightnode
  *
@@ -1578,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 */
 
@@ -1622,7 +1622,7 @@ error:
     return 1;
 } /* end test_unlink_rightnode() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_unlink_middlenode
  *
@@ -1657,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 */
 
@@ -1844,7 +1844,7 @@ error:
     return 1;
 } /* end test_unlink_middlenode() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_resurrect_dataset
  *
@@ -1865,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");
 
@@ -1908,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
  *
@@ -1978,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
  *
@@ -2046,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
  *
@@ -2129,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
  *
@@ -2156,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 */
@@ -2177,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 */
@@ -2205,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 */
@@ -2227,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_name2(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 2) TEST_ERROR
     } /* end for */
@@ -2244,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_name2(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 1) TEST_ERROR
     } /* end for */
@@ -2263,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
  *
@@ -2290,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 */
@@ -2311,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 */
@@ -2351,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 */
@@ -2373,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_name2(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 2) TEST_ERROR
     } /* end for */
@@ -2390,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_name2(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         if(oi.rc != 1) TEST_ERROR
     } /* end for */
@@ -2409,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:
@@ -2437,10 +2437,10 @@ error:
 int
 main(void)
 {
-    hid_t	fapl, fapl2, file;
-    int		nerrors = 0;
-    char	filename[1024];
-    unsigned	new_format;
+    hid_t    fapl, fapl2, file;
+    int        nerrors = 0;
+    char    filename[1024];
+    unsigned    new_format;
 
     /* Metadata cache parameters */
     int mdc_nelmts;
@@ -2467,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 */
 
@@ -2500,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);
@@ -2550,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");
+        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/use_common.c b/test/use_common.c
index 3ecb2e1..b600dca 100644
--- a/test/use_common.c
+++ b/test/use_common.c
@@ -21,7 +21,7 @@
 
 #include "use.h"
 
-#define H5D_FRIEND		/*suppress error about including H5Dpkg	  */
+#define H5D_FRIEND        /*suppress error about including H5Dpkg      */
 #define H5D_TESTING
 #include "H5Dpkg.h"
 
@@ -57,88 +57,88 @@ parse_option(int argc, char * const argv[])
     opterr = 0;
 
     while (1){
-	c = getopt (argc, argv, nagg_options);
-	if (-1 == c)
-	    break;
-	switch (c) {
-	  case 'h':
-	    usage(progname_g);
-	    exit(0);
-	    break;
-	  case 'f':	/* usecase data file name */
-	    UC_opts.filename = optarg;
-	    break;
-	  case 'i':	/* iterations */
-	    if ((UC_opts.iterations = HDatoi(optarg)) <= 0) {
-		fprintf(stderr, "bad iterations number %s, must be a positive integer\n", optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case 'l':	/* launch reader or writer only */
-	    switch (*optarg) {
-	      case 'r':	/* reader only */
-		UC_opts.launch = UC_READER;
-		break;
-	      case 'w': /* writer only */
-		UC_opts.launch = UC_WRITER;
-		break;
-	      default:
-		fprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-		break;
-	    }
-	    break;
-	  case 'n':	/* number of planes to write/read */
-	    if ((UC_opts.nplanes = HDstrtoul(optarg, NULL, 0)) <= 0) {
-		fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case 's':	/* use swmr file open mode */
+    c = getopt (argc, argv, nagg_options);
+    if (-1 == c)
+        break;
+    switch (c) {
+    case 'h':
+        usage(progname_g);
+        exit(0);
+        break;
+    case 'f':    /* usecase data file name */
+        UC_opts.filename = optarg;
+        break;
+    case 'i':    /* iterations */
+        if ((UC_opts.iterations = HDatoi(optarg)) <= 0) {
+            HDfprintf(stderr, "bad iterations number %s, must be a positive integer\n", optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case 'l':    /* launch reader or writer only */
+        switch (*optarg) {
+        case 'r':    /* reader only */
+        UC_opts.launch = UC_READER;
+        break;
+        case 'w': /* writer only */
+        UC_opts.launch = UC_WRITER;
+        break;
+        default:
+            HDfprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        break;
+        }
+        break;
+    case 'n':    /* number of planes to write/read */
+        if ((UC_opts.nplanes = HDstrtoul(optarg, NULL, 0)) <= 0) {
+            HDfprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case 's':    /* use swmr file open mode */
         use_swmr = HDatoi(optarg);
-	    if (use_swmr != 0 && use_swmr != 1) {
+        if (use_swmr != 0 && use_swmr != 1) {
             HDfprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
             usage(progname_g);
             Hgoto_error(-1);
-	    }
+        }
         UC_opts.use_swmr = (hbool_t)use_swmr;
-	    break;
-	  case 'y':	/* Number of planes per chunk */
-	    if ((UC_opts.chunkplanes = HDstrtoul(optarg, NULL, 0)) <= 0) {
-		fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case 'z':	/* size of chunk=(z,z) */
-	    if ((UC_opts.chunksize = HDstrtoull(optarg, NULL, 0)) <= 0) {
-		fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case '?':
-	    fprintf(stderr, "getopt returned '%c'.\n", c);
-	    Hgoto_error(-1);
-	  default:
-	    fprintf(stderr, "getopt returned unexpected value.\n");
-	    fprintf(stderr, "Unexpected value is %d\n", c);
-	    Hgoto_error(-1);
-	}
+        break;
+    case 'y':    /* Number of planes per chunk */
+        if ((UC_opts.chunkplanes = HDstrtoul(optarg, NULL, 0)) <= 0) {
+            HDfprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case 'z':    /* size of chunk=(z,z) */
+        if ((UC_opts.chunksize = HDstrtoull(optarg, NULL, 0)) <= 0) {
+            HDfprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case '?':
+        HDfprintf(stderr, "getopt returned '%c'.\n", c);
+        Hgoto_error(-1);
+    default:
+        HDfprintf(stderr, "getopt returned unexpected value.\n");
+        HDfprintf(stderr, "Unexpected value is %d\n", c);
+        Hgoto_error(-1);
+    }
     }
 
     /* set test file name if not given */
     if (!UC_opts.filename){
-	/* default data file name is <progname>.h5 */
-	if ((UC_opts.filename=(char*)HDmalloc(HDstrlen(progname_g)+4))==NULL) {
-	    fprintf(stderr, "malloc: failed\n");
-	    Hgoto_error(-1);
-	};
-	HDstrcpy(UC_opts.filename, progname_g);
-	HDstrcat(UC_opts.filename, ".h5");
+    /* default data file name is <progname>.h5 */
+    if ((UC_opts.filename=(char*)HDmalloc(HDstrlen(progname_g)+4))==NULL) {
+        HDfprintf(stderr, "malloc: failed\n");
+        Hgoto_error(-1);
+    };
+    HDstrcpy(UC_opts.filename, progname_g);
+    HDstrcat(UC_opts.filename, ".h5");
     }
 
 done:
@@ -148,31 +148,31 @@ done:
 
 /* Show parameters used for this use case */
 void show_parameters(void){
-    printf("===Parameters used:===\n");
-    printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)UC_opts.chunkdims[0], 
+    HDprintf("===Parameters used:===\n");
+    printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)UC_opts.chunkdims[0],
         (unsigned long long)UC_opts.chunkdims[1], (unsigned long long)UC_opts.chunkdims[2]);
-    printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)UC_opts.max_dims[0], 
+    printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)UC_opts.max_dims[0],
         (unsigned long long)UC_opts.max_dims[1], (unsigned long long)UC_opts.max_dims[2]);
-    printf("number of planes to write=%llu\n", (unsigned long long)UC_opts.nplanes);
-    printf("using SWMR mode=%s\n", UC_opts.use_swmr ? "yes(1)" : "no(0)");
-    printf("data filename=%s\n", UC_opts.filename);
-    printf("launch part=");
-	switch (UC_opts.launch){
-	case UC_READWRITE:
-	    printf("Reader/Writer\n");
-	    break;
-	case UC_WRITER:
-	    printf("Writer\n");
-	    break;
-	case UC_READER:
-	    printf("Reader\n");
-	    break;
-	default:
-	    /* should not happen */
-	    printf("Illegal part(%d)\n", UC_opts.launch);
-	};
-    printf("number of iterations=%d (not used yet)\n", UC_opts.iterations);
-    printf("===Parameters shown===\n");
+    HDprintf("number of planes to write=%llu\n", (unsigned long long)UC_opts.nplanes);
+    HDprintf("using SWMR mode=%s\n", UC_opts.use_swmr ? "yes(1)" : "no(0)");
+    HDprintf("data filename=%s\n", UC_opts.filename);
+    HDprintf("launch part=");
+    switch (UC_opts.launch){
+    case UC_READWRITE:
+        printf("Reader/Writer\n");
+        break;
+    case UC_WRITER:
+        printf("Writer\n");
+        break;
+    case UC_READER:
+        printf("Reader\n");
+        break;
+    default:
+        /* should not happen */
+        printf("Illegal part(%d)\n", UC_opts.launch);
+    };
+    HDprintf("number of iterations=%d (not used yet)\n", UC_opts.iterations);
+    HDprintf("===Parameters shown===\n");
 }
 
 /* Create the skeleton use case file for testing.
@@ -185,7 +185,7 @@ void show_parameters(void){
  */
 int create_uc_file(void)
 {
-    hsize_t dims[3];		/* Dataset starting dimensions */
+    hsize_t dims[3];        /* Dataset starting dimensions */
     hid_t fid;          /* File ID for new HDF5 file */
     hid_t dcpl;         /* Dataset creation property list */
     hid_t sid;          /* Dataspace ID */
@@ -217,7 +217,7 @@ int create_uc_file(void)
 
     /* create dataset of progname */
     if((dsid = H5Dcreate2(fid, progname_g, UC_DATATYPE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	return -1;
+    return -1;
 
     /* Check that the chunk index type is not version 1 B-tree.
      * Version 1 B-trees are not supported under SWMR.
@@ -225,13 +225,13 @@ int create_uc_file(void)
     if(H5D__layout_idx_type_test(dsid, &idx_type) < 0)
         return -1;
     if(idx_type == H5D_CHUNK_IDX_BTREE) {
-        fprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
+        HDfprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
         return -1;
     }
 
     /* Close everything */
     if(H5Dclose(dsid) < 0)
-	return -1;
+    return -1;
     if(H5Pclose(fapl) < 0)
         return -1;
     if(H5Pclose(dcpl) < 0)
@@ -254,17 +254,17 @@ int create_uc_file(void)
  */
 int write_uc_file(hbool_t tosend, hid_t fid)
 {
-    hid_t	dsid;         /* dataset ID */
-    hid_t	dcpl;         /* Dataset creation property list */
-    UC_CTYPE	*buffer, *bufptr;	/* data buffer */
-    hsize_t	cz=UC_opts.chunksize;		/* Chunk size */
-    hid_t	f_sid;	    /* dataset file space id */
-    hid_t	m_sid;	    /* memory space id */
-    int		rank;	    /* rank */
-    hsize_t 	chunk_dims[3];	/* Chunk dimensions */
-    hsize_t	dims[3];    /* Dataspace dimensions */
-    hsize_t	memdims[3]; /* Memory space dimensions */
-    hsize_t	start[3] = {0,0,0}, count[3];    /* Hyperslab selection values */
+    hid_t    dsid;         /* dataset ID */
+    hid_t    dcpl;         /* Dataset creation property list */
+    UC_CTYPE    *buffer, *bufptr;    /* data buffer */
+    hsize_t    cz=UC_opts.chunksize;        /* Chunk size */
+    hid_t    f_sid;        /* dataset file space id */
+    hid_t    m_sid;        /* memory space id */
+    int        rank;        /* rank */
+    hsize_t     chunk_dims[3];    /* Chunk dimensions */
+    hsize_t    dims[3];    /* Dataspace dimensions */
+    hsize_t    memdims[3]; /* Memory space dimensions */
+    hsize_t    start[3] = {0,0,0}, count[3];    /* Hyperslab selection values */
     hsize_t     i, j, k;
 
     if(tosend)
@@ -273,30 +273,30 @@ int write_uc_file(hbool_t tosend, hid_t fid)
 
     /* Open the dataset of the program name */
     if((dsid = H5Dopen2(fid, progname_g, H5P_DEFAULT)) < 0){
-	fprintf(stderr, "H5Dopen2 failed\n");
-	return -1;
+        HDfprintf(stderr, "H5Dopen2 failed\n");
+        return -1;
     }
 
     /* Find chunksize used */
     if ((dcpl = H5Dget_create_plist(dsid)) < 0){
-	fprintf(stderr, "H5Dget_create_plist failed\n");
-	return -1;
+        HDfprintf(stderr, "H5Dget_create_plist failed\n");
+        return -1;
     }
     if (H5D_CHUNKED != H5Pget_layout(dcpl)){
-	fprintf(stderr, "storage layout is not chunked\n");
-	return -1;
+        HDfprintf(stderr, "storage layout is not chunked\n");
+        return -1;
     }
     if ((rank = H5Pget_chunk(dcpl, 3, chunk_dims)) != 3){
-	fprintf(stderr, "storage rank is not 3\n");
-	return -1;
+        HDfprintf(stderr, "storage rank is not 3\n");
+        return -1;
     }
 
     /* verify chunk_dims against set paramenters */
     if (chunk_dims[0]!=UC_opts.chunkdims[0] || chunk_dims[1] != cz || chunk_dims[2] != cz){
-	fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
-	    (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], 
+        HDfprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
+        (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1],
             (unsigned long long)chunk_dims[2]);
-	return -1;
+        return -1;
     }
 
     /* allocate space for data buffer 1 X dims[1] X dims[2] of UC_CTYPE */
@@ -304,8 +304,8 @@ int write_uc_file(hbool_t tosend, hid_t fid)
     memdims[1] = UC_opts.dims[1];
     memdims[2] = UC_opts.dims[2];
     if ((buffer=(UC_CTYPE*)HDmalloc((size_t)memdims[1]*(size_t)memdims[2]*sizeof(UC_CTYPE)))==NULL) {
-	fprintf(stderr, "malloc: failed\n");
-	return -1;
+        HDfprintf(stderr, "malloc: failed\n");
+        return -1;
     };
 
     /*
@@ -314,28 +314,28 @@ int write_uc_file(hbool_t tosend, hid_t fid)
     f_sid = H5Dget_space(dsid);    /* Get filespace handle first. */
     rank  = H5Sget_simple_extent_ndims(f_sid);
     if (rank != UC_RANK){
-	fprintf(stderr, "rank(%d) of dataset does not match\n", rank);
-	return -1;
+        HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank);
+        return -1;
     }
     if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0){
-	fprintf(stderr, "H5Sget_simple_extent_dims got error\n");
-	return -1;
+        HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
+        return -1;
     }
-    printf("dataset rank %d, dimensions %llu x %llu x %llu\n",
-	   rank, (unsigned long long)(dims[0]), (unsigned long long)(dims[1]), 
+    HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n",
+    rank, (unsigned long long)(dims[0]), (unsigned long long)(dims[1]),
            (unsigned long long)(dims[2]));
     /* verify that file space dims are as expected and are consistent with memory space dims */
     if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]){
-	fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n",
-	    (unsigned long long)dims[0], (unsigned long long)dims[1], 
+        HDfprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n",
+        (unsigned long long)dims[0], (unsigned long long)dims[1],
             (unsigned long long)dims[2]);
-	return -1;
+        return -1;
     }
-    
+
     /* setup mem-space for buffer */
     if ((m_sid=H5Screate_simple(rank, memdims, NULL))<0){
-	fprintf(stderr, "H5Screate_simple for memory failed\n");
-	return -1;
+        HDfprintf(stderr, "H5Screate_simple for memory failed\n");
+        return -1;
     };
 
     /* write planes */
@@ -343,73 +343,73 @@ int write_uc_file(hbool_t tosend, hid_t fid)
     count[1]=dims[1];
     count[2]=dims[2];
     for (i=0; i<UC_opts.nplanes; i++){
-	/* fill buffer with value i+1 */
-	bufptr = buffer;
-	for (j=0; j<dims[1]; j++)
-	    for (k=0; k<dims[2]; k++)
-		*bufptr++ = (UC_CTYPE)i;
+    /* fill buffer with value i+1 */
+    bufptr = buffer;
+    for (j=0; j<dims[1]; j++)
+        for (k=0; k<dims[2]; k++)
+        *bufptr++ = (UC_CTYPE)i;
 
         /* Cork the dataset's metadata in the cache, if SWMR is enabled */
         if(UC_opts.use_swmr)
             if(H5Odisable_mdc_flushes(dsid) < 0) {
-                fprintf(stderr, "H5Odisable_mdc_flushes failed\n");
+                HDfprintf(stderr, "H5Odisable_mdc_flushes failed\n");
                 return -1;
             }
 
-	/* extend the dataset by one for new plane */
-	dims[0]=i+1;
+    /* extend the dataset by one for new plane */
+    dims[0]=i+1;
         if(H5Dset_extent(dsid, dims) < 0){
-	    fprintf(stderr, "H5Dset_extent failed\n");
+            HDfprintf(stderr, "H5Dset_extent failed\n");
             return -1;
-	}
+    }
 
         /* Get the dataset's dataspace */
         if((f_sid = H5Dget_space(dsid)) < 0){
-	    fprintf(stderr, "H5Dset_extent failed\n");
+            HDfprintf(stderr, "H5Dset_extent failed\n");
             return -1;
-	}
+    }
 
-	start[0]=i;
+    start[0]=i;
         /* Choose the next plane to write */
         if(H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0){
-	    fprintf(stderr, "Failed H5Sselect_hyperslab\n");
+            HDfprintf(stderr, "Failed H5Sselect_hyperslab\n");
             return -1;
-	}
+    }
 
         /* Write plane to the dataset */
         if(H5Dwrite(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0){
-	    fprintf(stderr, "Failed H5Dwrite\n");
+            HDfprintf(stderr, "Failed H5Dwrite\n");
             return -1;
-	}
+    }
 
         /* Uncork the dataset's metadata from the cache, if SWMR is enabled */
         if(UC_opts.use_swmr)
             if(H5Oenable_mdc_flushes(dsid) < 0) {
-                fprintf(stderr, "H5Oenable_mdc_flushes failed\n");
+                HDfprintf(stderr, "H5Oenable_mdc_flushes failed\n");
                 return -1;
             }
 
-	/* flush file to make the just written plane available. */
-	if(H5Dflush(dsid) < 0)
-	{
-	    fprintf(stderr, "Failed to H5Fflush file\n");
-	    return -1;
-	}
+    /* flush file to make the just written plane available. */
+    if(H5Dflush(dsid) < 0)
+    {
+        HDfprintf(stderr, "Failed to H5Fflush file\n");
+        return -1;
+    }
     }
 
     /* Done writing. Free/Close all resources including data file */
     HDfree(buffer);
     if (H5Dclose(dsid) < 0){
-	fprintf(stderr, "Failed to close datasete\n");
-	return -1;
+        HDfprintf(stderr, "Failed to close datasete\n");
+        return -1;
     }
     if (H5Sclose(m_sid) < 0){
-	fprintf(stderr, "Failed to close memory space\n");
-	return -1;
+        HDfprintf(stderr, "Failed to close memory space\n");
+        return -1;
     }
     if (H5Sclose(f_sid) < 0){
-	fprintf(stderr, "Failed to close file space\n");
-	return -1;
+        HDfprintf(stderr, "Failed to close file space\n");
+        return -1;
     }
 
     return 0;
@@ -429,21 +429,21 @@ int write_uc_file(hbool_t tosend, hid_t fid)
 int read_uc_file(hbool_t towait)
 {
     hid_t   fapl;         /* file access property list ID */
-    hid_t	fid;          /* File ID for new HDF5 file */
-    hid_t	dsid;         /* dataset ID */
-    char	*name;
-    UC_CTYPE	*buffer, *bufptr;	/* read data buffer */
-    hid_t	f_sid;	    /* dataset file space id */
-    hid_t	m_sid;	    /* memory space id */
-    int		rank;	    /* rank */
-    hsize_t	dims[3];    /* Dataspace dimensions */
-    hsize_t	memdims[3]; /* Memory space dimensions */
-    hsize_t     nplane=0, nplane_old=0;	/* nth plane, last nth plane */
-    hsize_t	start[3] = {0,0,0}, count[3];    /* Hyperslab selection values */
-    hsize_t	j, k;
-    int		nreadererr=0;
-    int		nerrs;
-    int		nonewplane;
+    hid_t    fid;          /* File ID for new HDF5 file */
+    hid_t    dsid;         /* dataset ID */
+    char    *name;
+    UC_CTYPE    *buffer, *bufptr;    /* read data buffer */
+    hid_t    f_sid;        /* dataset file space id */
+    hid_t    m_sid;        /* memory space id */
+    int        rank;        /* rank */
+    hsize_t    dims[3];    /* Dataspace dimensions */
+    hsize_t    memdims[3]; /* Memory space dimensions */
+    hsize_t     nplane=0, nplane_old=0;    /* nth plane, last nth plane */
+    hsize_t    start[3] = {0,0,0}, count[3];    /* Hyperslab selection values */
+    hsize_t    j, k;
+    int        nreadererr=0;
+    int        nerrs;
+    int        nonewplane;
 
     /* Before reading, wait for the message that H5Fopen is complete--file lock is released */
     if(towait && h5_wait_message(WRITER_MESSAGE) < 0) {
@@ -461,8 +461,8 @@ int read_uc_file(hbool_t towait)
         return -1;
     }
     if (H5Pclose(fapl) < 0){
-	    HDfprintf(stderr, "Failed to property list\n");
-	    return -1;
+        HDfprintf(stderr, "Failed to property list\n");
+        return -1;
     }
 
 
@@ -504,11 +504,11 @@ int read_uc_file(hbool_t towait)
             (unsigned long long)dims[0], (unsigned long long)dims[1],
             (unsigned long long)dims[2]);
         HDfprintf(stderr, "But memdims=(%llu,%llu,%llu)\n",
-            (unsigned long long)memdims[0], (unsigned long long)memdims[1], 
+            (unsigned long long)memdims[0], (unsigned long long)memdims[1],
             (unsigned long long)memdims[2]);
         return -1;
     }
-    
+
     /* setup mem-space for buffer */
     if ((m_sid=H5Screate_simple(rank, memdims, NULL))<0){
         HDfprintf(stderr, "H5Screate_simple for memory failed\n");
@@ -523,102 +523,102 @@ int read_uc_file(hbool_t towait)
     /* quit when all nplanes  have been read */
     nonewplane=0;
     while (nplane_old < UC_opts.nplanes ){
-	/* print progress message according to if new planes are availalbe */
-	if (nplane_old < dims[0]) {
-	    if (nonewplane){
+    /* print progress message according to if new planes are availalbe */
+    if (nplane_old < dims[0]) {
+        if (nonewplane){
             /* end the previous message */
             HDprintf("\n");
             nonewplane=0;
-	    }
-	    HDprintf("reading planes %llu to %llu\n", (unsigned long long)nplane_old, 
+        }
+        HDprintf("reading planes %llu to %llu\n", (unsigned long long)nplane_old,
                 (unsigned long long)dims[0]);
-	}else{
-	    if (nonewplane){
+    }else{
+        if (nonewplane){
             HDprintf(".");
-		if (nonewplane>=30){
-		    HDfprintf(stderr, "waited too long for new plane, quit.\n");
-		    return -1;
-		}
-	    }else{
+        if (nonewplane>=30){
+            HDfprintf(stderr, "waited too long for new plane, quit.\n");
+            return -1;
+        }
+        }else{
             /* print mesg only the first time; dots still no new plane */
             HDprintf("no new planes to read ");
-	    }
-	    nonewplane++;
-	    /* pause for a second */
+        }
+        nonewplane++;
+        /* pause for a second */
         HDsleep(1);
-	}
-	for (nplane=nplane_old; nplane < dims[0]; nplane++){
-	    /* read planes between last old nplanes and current extent */
-	    /* Get the dataset's dataspace */
-	    if((f_sid = H5Dget_space(dsid)) < 0){
+    }
+    for (nplane=nplane_old; nplane < dims[0]; nplane++){
+        /* read planes between last old nplanes and current extent */
+        /* Get the dataset's dataspace */
+        if((f_sid = H5Dget_space(dsid)) < 0){
             HDfprintf(stderr, "H5Dget_space failed\n");
             return -1;
-	    }
+        }
 
-	    start[0]=nplane;
-	    /* Choose the next plane to read */
-	    if(H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0){
+        start[0]=nplane;
+        /* Choose the next plane to read */
+        if(H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0){
             HDfprintf(stderr, "H5Sselect_hyperslab failed\n");
             return -1;
-	    }
+        }
 
-	    /* Read the plane from the dataset */
-	    if(H5Dread(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0){
+        /* Read the plane from the dataset */
+        if(H5Dread(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0){
             HDfprintf(stderr, "H5Dread failed\n");
             return -1;
-	    }
+        }
 
-	    /* compare read data with expected data value which is nplane */
-	    bufptr = buffer;
-	    nerrs=0;
-	    for (j=0; j<dims[1]; j++){
+        /* compare read data with expected data value which is nplane */
+        bufptr = buffer;
+        nerrs=0;
+        for (j=0; j<dims[1]; j++){
             for (k=0; k<dims[2]; k++){
                 if ((hsize_t)*bufptr++ != nplane){
                     if (++nerrs < ErrorReportMax){
                         HDfprintf(stderr,
                             "found error %llu plane(%llu,%llu), expected %llu, got %d\n",
-                            (unsigned long long)nplane, (unsigned long long)j, 
+                            (unsigned long long)nplane, (unsigned long long)j,
                             (unsigned long long)k, (unsigned long long)nplane, (int)*(bufptr-1));
                     }
                 }
             }
-	    }
-	    if (nerrs){
+        }
+        if (nerrs){
             nreadererr++;
-            HDfprintf(stderr, "found %d unexpected values in plane %llu\n", nerrs, 
+            HDfprintf(stderr, "found %d unexpected values in plane %llu\n", nerrs,
                     (unsigned long long)nplane);
-	    }
-	}
-	/* Have read all current planes */
-	nplane_old=dims[0];
+        }
+    }
+    /* Have read all current planes */
+    nplane_old=dims[0];
 
-	/* check if dataset has grown since last time */
+    /* check if dataset has grown since last time */
 #if 0
-	/* close dsid and file, then reopen them */
-	if (H5Dclose(dsid) < 0){
-	    HDfprintf(stderr, "H5Dclose failed\n");
-	    return -1;
-	}
-	if (H5Fclose(fid) < 0){
-	    HDfprintf(stderr, "H5Fclose failed\n");
-	    return -1;
-	}
-	if((fid = H5Fopen(name, H5F_ACC_RDONLY | (UC_opts.use_swmr ? H5F_ACC_SWMR_READ : 0), H5P_DEFAULT)) < 0){
-	    HDfprintf(stderr, "H5Fopen failed\n");
-	    return -1;
-	}
-	if((dsid = H5Dopen2(fid, progname_g, H5P_DEFAULT)) < 0){
-	    HDfprintf(stderr, "H5Dopen2 failed\n");
-	    return -1;
-	}
+    /* close dsid and file, then reopen them */
+    if (H5Dclose(dsid) < 0){
+        HDfprintf(stderr, "H5Dclose failed\n");
+        return -1;
+    }
+    if (H5Fclose(fid) < 0){
+        HDfprintf(stderr, "H5Fclose failed\n");
+        return -1;
+    }
+    if((fid = H5Fopen(name, H5F_ACC_RDONLY | (UC_opts.use_swmr ? H5F_ACC_SWMR_READ : 0), H5P_DEFAULT)) < 0){
+        HDfprintf(stderr, "H5Fopen failed\n");
+        return -1;
+    }
+    if((dsid = H5Dopen2(fid, progname_g, H5P_DEFAULT)) < 0){
+        HDfprintf(stderr, "H5Dopen2 failed\n");
+        return -1;
+    }
 #else
-	H5Drefresh(dsid);
+    H5Drefresh(dsid);
 #endif
-	f_sid = H5Dget_space(dsid);    /* Get filespace handle first. */
-	if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0){
-	    HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
-	    return -1;
-	}
+    f_sid = H5Dget_space(dsid);    /* Get filespace handle first. */
+    if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0){
+        HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
+        return -1;
+    }
     }
 
     /* Close the file */
diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c
index 67e2226..b349269 100644
--- a/test/use_disable_mdc_flushes.c
+++ b/test/use_disable_mdc_flushes.c
@@ -24,12 +24,12 @@
  */
 #ifdef H5_HAVE_FORK
 
-#define H5D_FRIEND		/*suppress error about including H5Dpkg	  */
+#define H5D_FRIEND        /*suppress error about including H5Dpkg      */
 #define H5D_TESTING
 #include "H5Dpkg.h"
 
 /* Global Variable definitions */
-const char *progname_g="use_disable_mdc_flushes";	/* program name */
+const char *progname_g="use_disable_mdc_flushes";    /* program name */
 
 /* these two definitions must match each other */
 #define UC_DATATYPE             H5T_NATIVE_SHORT    /* use case HDF5 data type */
@@ -59,7 +59,7 @@ static int setup_parameters(int argc, char * const argv[]);
  *
  * usage: use_disable_mdc_flushes [OPTIONS]
  * OPTIONS
- *  -h, --help 		  Print a usage message and exit
+ *  -h, --help           Print a usage message and exit
  *  -f FN                 Test file name [default: use_disable_mdc_flushes.h5]
  *  -n N, --nplanes=N     Number of planes to write. [default: 1000]
  *  -s N, --swmr=N        Use SWMR mode (0: no, non-0: yes) default is yes
@@ -69,19 +69,19 @@ static int setup_parameters(int argc, char * const argv[]);
 static void
 usage(const char *prog)
 {
-    fprintf(stderr, "usage: %s [OPTIONS]\n", prog);
-    fprintf(stderr, "  OPTIONS\n");
-    fprintf(stderr, "     -h          Print a usage message and exit\n");
-    fprintf(stderr, "     -f FN       Test file name [default: %s.h5]\n", prog);
-    fprintf(stderr, "     -n N        Number of planes to write. [default: 1000]\n");
-    fprintf(stderr, "     -s N        Use SWMR mode (0: no, non-0: yes) default is yes\n");
-    fprintf(stderr, "     -z N        Chunk size [default: %d]\n", Chunksize_DFT);
-    fprintf(stderr, "     -y N        Number of planes per chunk [default: 1]\n");
-    fprintf(stderr, "\n");
+    HDfprintf(stderr, "usage: %s [OPTIONS]\n", prog);
+    HDfprintf(stderr, "  OPTIONS\n");
+    HDfprintf(stderr, "     -h          Print a usage message and exit\n");
+    HDfprintf(stderr, "     -f FN       Test file name [default: %s.h5]\n", prog);
+    HDfprintf(stderr, "     -n N        Number of planes to write. [default: 1000]\n");
+    HDfprintf(stderr, "     -s N        Use SWMR mode (0: no, non-0: yes) default is yes\n");
+    HDfprintf(stderr, "     -z N        Chunk size [default: %d]\n", Chunksize_DFT);
+    HDfprintf(stderr, "     -y N        Number of planes per chunk [default: 1]\n");
+    HDfprintf(stderr, "\n");
 } /* usage() */
 
 
-/* 
+/*
  * Setup Use Case parameters by parsing command line options.
  * Setup default values if not set by options. */
 static int
@@ -96,64 +96,64 @@ parse_option(int argc, char * const argv[])
     opterr = 0;
 
     while (1){
-	c = getopt (argc, argv, cmd_options);
-	if (-1 == c)
-	    break;
-	switch (c) {
-	  case 'h':
-	    usage(progname_g);
-	    exit(0);
-	    break;
-	  case 'f':	/* usecase data file name */
-	    filename_g = optarg;
-	    break;
-	  case 'n':	/* number of planes to write/read */
-	    if ((nplanes_g = HDatoi(optarg)) <= 0){
-		fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case 's':	/* use swmr file open mode */
-	    if ((use_swmr_g = HDatoi(optarg)) < 0){
-		fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case 'y':	/* Number of planes per chunk */
-	    if ((chunkplanes_g = HDatoi(optarg)) <= 0){
-		fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case 'z':	/* size of chunk=(z,z) */
-	    if ((chunksize_g = HDatoi(optarg)) <= 0){
-		fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
-		usage(progname_g);
-		Hgoto_error(-1);
-	    };
-	    break;
-	  case '?':
-	    fprintf(stderr, "getopt returned '%c'.\n", c);
-	    Hgoto_error(-1);
-	  default:
-	    fprintf(stderr, "getopt returned unexpected value.\n");
-	    fprintf(stderr, "Unexpected value is %d\n", c);
-	    Hgoto_error(-1);
-	}
+    c = getopt (argc, argv, cmd_options);
+    if (-1 == c)
+        break;
+    switch (c) {
+    case 'h':
+        usage(progname_g);
+        exit(0);
+        break;
+    case 'f':    /* usecase data file name */
+        filename_g = optarg;
+        break;
+    case 'n':    /* number of planes to write/read */
+        if ((nplanes_g = HDatoi(optarg)) <= 0){
+        HDfprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case 's':    /* use swmr file open mode */
+        if ((use_swmr_g = HDatoi(optarg)) < 0){
+        HDfprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case 'y':    /* Number of planes per chunk */
+        if ((chunkplanes_g = HDatoi(optarg)) <= 0){
+        HDfprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case 'z':    /* size of chunk=(z,z) */
+        if ((chunksize_g = HDatoi(optarg)) <= 0){
+        HDfprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
+        usage(progname_g);
+        Hgoto_error(-1);
+        };
+        break;
+    case '?':
+        HDfprintf(stderr, "getopt returned '%c'.\n", c);
+        Hgoto_error(-1);
+    default:
+        HDfprintf(stderr, "getopt returned unexpected value.\n");
+        HDfprintf(stderr, "Unexpected value is %d\n", c);
+        Hgoto_error(-1);
+    }
     }
 
     /* set test file name if not given */
     if (!filename_g){
-	/* default data file name is <progname>.h5 */
-	if ((filename_g = (char*)HDmalloc(HDstrlen(progname_g)+4))==NULL) {
-	    fprintf(stderr, "malloc: failed\n");
-	    Hgoto_error(-1);
-	};
-	HDstrcpy(filename_g, progname_g);
-	HDstrcat(filename_g, ".h5");
+    /* default data file name is <progname>.h5 */
+    if ((filename_g = (char*)HDmalloc(HDstrlen(progname_g)+4))==NULL) {
+        HDfprintf(stderr, "malloc: failed\n");
+        Hgoto_error(-1);
+    };
+    HDstrcpy(filename_g, progname_g);
+    HDstrcat(filename_g, ".h5");
     }
 
 done:
@@ -162,35 +162,35 @@ done:
 } /* parse_option() */
 
 /* Show parameters used for this use case */
-static void 
+static void
 show_parameters(void)
 {
-    printf("===Parameters used:===\n");
-    printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)chunkdims_g[0], 
+    HDprintf("===Parameters used:===\n");
+    HDprintf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)chunkdims_g[0],
         (unsigned long long)chunkdims_g[1], (unsigned long long)chunkdims_g[2]);
-    printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)max_dims_g[0], 
+    HDprintf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)max_dims_g[0],
         (unsigned long long)max_dims_g[1], (unsigned long long)max_dims_g[2]);
-    printf("number of planes to write=%llu\n", (unsigned long long)nplanes_g);
-    printf("using SWMR mode=%s\n", use_swmr_g ? "yes(1)" : "no(0)");
-    printf("data filename=%s\n", filename_g);
-    printf("===Parameters shown===\n");
+    HDprintf("number of planes to write=%llu\n", (unsigned long long)nplanes_g);
+    HDprintf("using SWMR mode=%s\n", use_swmr_g ? "yes(1)" : "no(0)");
+    HDprintf("data filename=%s\n", filename_g);
+    HDprintf("===Parameters shown===\n");
 } /* show_parameters() */
 
-/* 
+/*
  * Setup parameters for the use case.
  * Return: 0 succeed; -1 fail.
  */
-static int 
+static int
 setup_parameters(int argc, char * const argv[])
 {
     /* use case defaults */
     chunksize_g = Chunksize_DFT;
-    use_swmr_g = 1;	/* use swmr open */
+    use_swmr_g = 1;    /* use swmr open */
     chunkplanes_g = 1;
 
     /* parse options */
     if (parse_option(argc, argv) < 0){
-	return(-1);
+    return(-1);
     }
     /* set chunk dims */
     chunkdims_g[0] = chunkplanes_g;
@@ -210,7 +210,7 @@ setup_parameters(int argc, char * const argv[])
     return(0);
 } /* setup_parameters() */
 
-/* 
+/*
  * Create the skeleton use case file for testing.
  * It has one 3d dataset using chunked storage.
  * The dataset is (unlimited, chunksize, chunksize).
@@ -219,10 +219,10 @@ setup_parameters(int argc, char * const argv[])
  *
  * Return: 0 succeed; -1 fail.
  */
-static int 
+static int
 create_file(void)
 {
-    hsize_t dims[3];		/* Dataset starting dimensions */
+    hsize_t dims[3];        /* Dataset starting dimensions */
     hid_t fid;          /* File ID for new HDF5 file */
     hid_t dcpl;         /* Dataset creation property list */
     hid_t sid;          /* Dataspace ID */
@@ -254,7 +254,7 @@ create_file(void)
 
     /* create dataset of progname */
     if((dsid = H5Dcreate2(fid, progname_g, UC_DATATYPE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	return -1;
+    return -1;
 
     /* Check that the chunk index type is not version 1 B-tree.
      * Version 1 B-trees are not supported under SWMR.
@@ -262,13 +262,13 @@ create_file(void)
     if(H5D__layout_idx_type_test(dsid, &idx_type) < 0)
         return -1;
     if(idx_type == H5D_CHUNK_IDX_BTREE) {
-        fprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
+        HDfprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
         return -1;
     }
 
     /* Close everything */
     if(H5Dclose(dsid) < 0)
-	return -1;
+    return -1;
     if(H5Pclose(fapl) < 0)
         return -1;
     if(H5Pclose(dcpl) < 0)
@@ -281,7 +281,7 @@ create_file(void)
     return 0;
 } /* create_file() */
 
-/* 
+/*
  * Append planes, each of (1,2*chunksize,2*chunksize) to the dataset.
  * In other words, 4 chunks are appended to the dataset at a time.
  * Fill each plane with the plane number and then write it at the nth plane.
@@ -290,24 +290,24 @@ create_file(void)
  *
  * Return: 0 succeed; -1 fail.
  */
-static int 
+static int
 write_file(void)
 {
-    hid_t	fid;          	/* File ID for new HDF5 file */
-    hid_t	dsid;         	/* dataset ID */
-    hid_t       fapl;         	/* File access property list */
-    hid_t	dcpl;      	/* Dataset creation property list */
-    char	*name;
-    UC_CTYPE	*buffer, *bufptr;	/* data buffer */
-    hsize_t	cz=chunksize_g;		/* Chunk size */
-    hid_t	f_sid;	    	/* dataset file space id */
-    hid_t	m_sid;	    	/* memory space id */
-    int		rank;	    	/* rank */
-    hsize_t 	chunk_dims[3];	/* Chunk dimensions */
-    hsize_t	dims[3];    	/* Dataspace dimensions */
-    hsize_t	memdims[3]; 	/* Memory space dimensions */
-    hsize_t	start[3] = {0,0,0}, count[3];    /* Hyperslab selection values */
-    hbool_t 	disabled;   	/* Object's disabled status */	
+    hid_t    fid;              /* File ID for new HDF5 file */
+    hid_t    dsid;             /* dataset ID */
+    hid_t       fapl;             /* File access property list */
+    hid_t    dcpl;          /* Dataset creation property list */
+    char    *name;
+    UC_CTYPE    *buffer, *bufptr;    /* data buffer */
+    hsize_t    cz=chunksize_g;        /* Chunk size */
+    hid_t    f_sid;            /* dataset file space id */
+    hid_t    m_sid;            /* memory space id */
+    int        rank;            /* rank */
+    hsize_t     chunk_dims[3];    /* Chunk dimensions */
+    hsize_t    dims[3];        /* Dataspace dimensions */
+    hsize_t    memdims[3];     /* Memory space dimensions */
+    hsize_t    start[3] = {0,0,0}, count[3];    /* Hyperslab selection values */
+    hbool_t     disabled;       /* Object's disabled status */
     hsize_t     i, j, k;
 
     name = filename_g;
@@ -319,51 +319,51 @@ write_file(void)
         if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
             return -1;
     if((fid = H5Fopen(name, H5F_ACC_RDWR | (use_swmr_g ? H5F_ACC_SWMR_WRITE : 0), fapl)) < 0){
-	fprintf(stderr, "H5Fopen failed\n");
+    HDfprintf(stderr, "H5Fopen failed\n");
         return -1;
     }
 
     /* Open the dataset of the program name */
     if((dsid = H5Dopen2(fid, progname_g, H5P_DEFAULT)) < 0){
-	fprintf(stderr, "H5Dopen2 failed\n");
-	return -1;
+    HDfprintf(stderr, "H5Dopen2 failed\n");
+    return -1;
     }
 
     /* Disabled mdc flushed for the dataset */
     if(H5Odisable_mdc_flushes(dsid) < 0) {
-	fprintf(stderr, "H5Odisable_mdc_flushes failed\n");
-	return -1;
+    HDfprintf(stderr, "H5Odisable_mdc_flushes failed\n");
+    return -1;
     }
 
     /* Get mdc disabled status of the dataset */
     if(H5Oare_mdc_flushes_disabled(dsid, &disabled) < 0) {
-	fprintf(stderr, "H5Oare_mdc_flushes_disabled failed\n");
-	return -1;
+    HDfprintf(stderr, "H5Oare_mdc_flushes_disabled failed\n");
+    return -1;
     } else if(disabled)
-	printf("Dataset has disabled mdc flushes.\n");
+    HDprintf("Dataset has disabled mdc flushes.\n");
     else
-	printf("Dataset should have disabled its mdc flushes.\n");
+    HDprintf("Dataset should have disabled its mdc flushes.\n");
 
     /* Find chunksize used */
     if ((dcpl = H5Dget_create_plist(dsid)) < 0){
-	fprintf(stderr, "H5Dget_create_plist failed\n");
-	return -1;
+    HDfprintf(stderr, "H5Dget_create_plist failed\n");
+    return -1;
     }
     if (H5D_CHUNKED != H5Pget_layout(dcpl)){
-	fprintf(stderr, "storage layout is not chunked\n");
-	return -1;
+    HDfprintf(stderr, "storage layout is not chunked\n");
+    return -1;
     }
     if ((rank = H5Pget_chunk(dcpl, 3, chunk_dims)) != 3){
-	fprintf(stderr, "storage rank is not 3\n");
-	return -1;
+    HDfprintf(stderr, "storage rank is not 3\n");
+    return -1;
     }
 
     /* verify chunk_dims against set paramenters */
     if (chunk_dims[0]!= chunkdims_g[0] || chunk_dims[1] != cz || chunk_dims[2] != cz){
-	fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
-	    (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], 
+    HDfprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
+        (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1],
             (unsigned long long)chunk_dims[2]);
-	return -1;
+    return -1;
     }
 
     /* allocate space for data buffer 1 X dims[1] X dims[2] of UC_CTYPE */
@@ -371,8 +371,8 @@ write_file(void)
     memdims[1] = dims_g[1];
     memdims[2] = dims_g[2];
     if ((buffer=(UC_CTYPE*)HDmalloc((size_t)memdims[1]*(size_t)memdims[2]*sizeof(UC_CTYPE)))==NULL) {
-	fprintf(stderr, "malloc: failed\n");
-	return -1;
+    HDfprintf(stderr, "malloc: failed\n");
+    return -1;
     };
 
     /*
@@ -381,28 +381,28 @@ write_file(void)
     f_sid = H5Dget_space(dsid);    /* Get filespace handle first. */
     rank  = H5Sget_simple_extent_ndims(f_sid);
     if (rank != UC_RANK){
-	fprintf(stderr, "rank(%d) of dataset does not match\n", rank);
-	return -1;
+    HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank);
+    return -1;
     }
     if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0){
-	fprintf(stderr, "H5Sget_simple_extent_dims got error\n");
-	return -1;
+    HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
+    return -1;
     }
-    printf("dataset rank %d, dimensions %llu x %llu x %llu\n",
-	   rank, (unsigned long long)(dims[0]), (unsigned long long)(dims[1]), 
+    HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n",
+    rank, (unsigned long long)(dims[0]), (unsigned long long)(dims[1]),
            (unsigned long long)(dims[2]));
     /* verify that file space dims are as expected and are consistent with memory space dims */
     if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]){
-	fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n",
-	    (unsigned long long)dims[0], (unsigned long long)dims[1], 
+    HDfprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n",
+        (unsigned long long)dims[0], (unsigned long long)dims[1],
             (unsigned long long)dims[2]);
-	return -1;
+    return -1;
     }
-    
+
     /* setup mem-space for buffer */
     if ((m_sid=H5Screate_simple(rank, memdims, NULL))<0){
-	fprintf(stderr, "H5Screate_simple for memory failed\n");
-	return -1;
+    HDfprintf(stderr, "H5Screate_simple for memory failed\n");
+    return -1;
     };
 
     /* write planes */
@@ -410,82 +410,82 @@ write_file(void)
     count[1]=dims[1];
     count[2]=dims[2];
     for (i=0; i<nplanes_g; i++){
-	/* fill buffer with value i+1 */
-	bufptr = buffer;
-	for (j=0; j<dims[1]; j++)
-	    for (k=0; k<dims[2]; k++)
-		*bufptr++ = i;
-
-	/* extend the dataset by one for new plane */
-	dims[0]=i+1;
+    /* fill buffer with value i+1 */
+    bufptr = buffer;
+    for (j=0; j<dims[1]; j++)
+        for (k=0; k<dims[2]; k++)
+        *bufptr++ = i;
+
+    /* extend the dataset by one for new plane */
+    dims[0]=i+1;
         if(H5Dset_extent(dsid, dims) < 0){
-	    fprintf(stderr, "H5Dset_extent failed\n");
+        HDfprintf(stderr, "H5Dset_extent failed\n");
             return -1;
-	}
+    }
 
         /* Get the dataset's dataspace */
         if((f_sid = H5Dget_space(dsid)) < 0){
-	    fprintf(stderr, "H5Dset_extent failed\n");
+        HDfprintf(stderr, "H5Dset_extent failed\n");
             return -1;
-	}
+    }
 
-	start[0]=i;
+    start[0]=i;
         /* Choose the next plane to write */
         if(H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0){
-	    fprintf(stderr, "Failed H5Sselect_hyperslab\n");
+        HDfprintf(stderr, "Failed H5Sselect_hyperslab\n");
             return -1;
-	}
+    }
 
         /* Write plane to the dataset */
         if(H5Dwrite(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0){
-	    fprintf(stderr, "Failed H5Dwrite\n");
+        HDfprintf(stderr, "Failed H5Dwrite\n");
             return -1;
-	}
-
-	/* Flush the dataset for every "chunkplanes_g" planes */
-	if(!((i + 1) % (hsize_t)chunkplanes_g)) {
-	    if(H5Dflush(dsid) < 0) {
-		fprintf(stderr, "Failed to H5Dflush dataset\n");
-		return -1;
-	    }
-	}
+    }
+
+    /* Flush the dataset for every "chunkplanes_g" planes */
+    if(!((i + 1) % (hsize_t)chunkplanes_g)) {
+        if(H5Dflush(dsid) < 0) {
+        HDfprintf(stderr, "Failed to H5Dflush dataset\n");
+        return -1;
+        }
+    }
     }
 
     if(H5Dflush(dsid) < 0) {
-	fprintf(stderr, "Failed to H5Dflush dataset\n");
-	return -1;
+    HDfprintf(stderr, "Failed to H5Dflush dataset\n");
+    return -1;
     }
 
     /* Enable mdc flushes for the dataset */
     /* Closing the dataset later will enable mdc flushes automatically if this is not done */
     if(disabled)
-	if(H5Oenable_mdc_flushes(dsid) < 0) {
-	    fprintf(stderr, "Failed to H5Oenable_mdc_flushes\n");
-	    return -1;
-	}
+    if(H5Oenable_mdc_flushes(dsid) < 0) {
+        HDfprintf(stderr, "Failed to H5Oenable_mdc_flushes\n");
+        return -1;
+    }
 
     /* Done writing. Free/Close all resources including data file */
     HDfree(buffer);
 
     if(H5Dclose(dsid) < 0){
-	fprintf(stderr, "Failed to close datasete\n");
-	return -1;
+    HDfprintf(stderr, "Failed to close datasete\n");
+    return -1;
     }
     if(H5Sclose(m_sid) < 0){
-	fprintf(stderr, "Failed to close memory space\n");
-	return -1;
+    HDfprintf(stderr, "Failed to close memory space\n");
+    return -1;
     }
     if(H5Sclose(f_sid) < 0){
-	fprintf(stderr, "Failed to close file space\n");
-	return -1;
+    HDfprintf(stderr, "Failed to close file space\n");
+    return -1;
     }
     if(H5Pclose(fapl) < 0){
-	fprintf(stderr, "Failed to property list\n");
-	return -1;
+    HDfprintf(stderr, "Failed to property list\n");
+    return -1;
     }
     if(H5Fclose(fid) < 0){
-	fprintf(stderr, "Failed to close file id\n");
-	return -1;
+    HDfprintf(stderr, "Failed to close file id\n");
+    return -1;
     }
 
     return 0;
@@ -493,7 +493,7 @@ write_file(void)
 
 
 
-/* Overall Algorithm: 
+/* Overall Algorithm:
  * Parse options from user;
  * Generate/pre-created test files needed and close it;
  * Write to the file.
@@ -505,31 +505,31 @@ main(int argc, char *argv[])
 
     /* initialization */
     if(setup_parameters(argc, argv) < 0)
-	Hgoto_error(1);
+    Hgoto_error(1);
 
     /* ============*/
     /* Create file */
     /* ============*/
-    printf("Creating skeleton data file for testing H5Odisable_mdc_flushes()...\n");
+    HDprintf("Creating skeleton data file for testing H5Odisable_mdc_flushes()...\n");
     if(create_file() < 0) {
-	fprintf(stderr, "***encounter error\n");
-	Hgoto_error(1);
+        HDfprintf(stderr, "***encounter error\n");
+        Hgoto_error(1);
     } /* end if */
     else
-	printf("File created.\n");
+        HDprintf("File created.\n");
 
-    printf("writing to the file\n");
+    HDprintf("writing to the file\n");
     if(write_file() < 0) {
-	fprintf(stderr, "write_file encountered error\n");
-	Hgoto_error(1);
+        HDfprintf(stderr, "write_file encountered error\n");
+        Hgoto_error(1);
     }
 
 done:
     /* Print result and exit */
     if(ret_value != 0)
-	printf("Error(s) encountered\n");
+        HDprintf("Error(s) encountered\n");
     else
-	printf("All passed\n");
+        HDprintf("All passed\n");
 
     return(ret_value);
 }
diff --git a/test/vds_swmr.h b/test/vds_swmr.h
index a8e4d50..f2e7a6d 100644
--- a/test/vds_swmr.h
+++ b/test/vds_swmr.h
@@ -128,7 +128,6 @@ static hsize_t PLANES[N_SOURCES][RANK] = {
     {1, SM_HEIGHT, WIDTH},
     {1, LG_HEIGHT, WIDTH}
 };
-static hsize_t VDS_PLANE[RANK] = {1, FULL_HEIGHT, WIDTH};
 
 /* File names for source datasets */
 static char FILE_NAMES[N_SOURCES][NAME_LEN] = {
diff --git a/test/vds_swmr_gen.c b/test/vds_swmr_gen.c
index 24c6131..1cb9744 100644
--- a/test/vds_swmr_gen.c
+++ b/test/vds_swmr_gen.c
@@ -61,7 +61,7 @@ main(void)
     map_start = 0;
 
     /* All SWMR files need to use the latest file format */
-    if((faplid = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if((faplid = h5_fileaccess()) < 0)
         TEST_ERROR
     if(H5Pset_libver_bounds(faplid, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         TEST_ERROR
diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c
index 42721d5..eb9a82b 100644
--- a/test/vds_swmr_reader.c
+++ b/test/vds_swmr_reader.c
@@ -14,10 +14,13 @@
 #include "h5test.h"
 #include "vds_swmr.h"
 
+static hsize_t VDS_PLANE[RANK] = {1, FULL_HEIGHT, WIDTH};
+
 int
 main(void)
 {
     hid_t fid           = -1;   /* HDF5 file ID                     */
+    hid_t faplid        = -1;   /* file access property list ID                */
     hid_t did           = -1;   /* dataset ID                       */
     hid_t msid          = -1;   /* memory dataspace ID              */
     hid_t fsid          = -1;   /* file dataspace ID                */
@@ -34,7 +37,9 @@ main(void)
 
 
     /* Open the VDS file and dataset */
-    if((fid = H5Fopen(VDS_FILE_NAME, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, H5P_DEFAULT)) < 0)
+    if((faplid = h5_fileaccess()) < 0)
+        TEST_ERROR
+    if((fid = H5Fopen(VDS_FILE_NAME, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, faplid)) < 0)
         TEST_ERROR
     if((did = H5Dopen2(fid, VDS_DSET_NAME, H5P_DEFAULT)) < 0)
         TEST_ERROR
@@ -97,13 +102,14 @@ main(void)
             TEST_ERROR
         if(H5Dread(did, H5T_NATIVE_INT, msid, fsid, H5P_DEFAULT, buffer) < 0)
             TEST_ERROR
-
         if(H5Sclose(fsid) < 0)
             TEST_ERROR
 
     } while (dims[0] < N_PLANES_TO_WRITE);
 
     /* Close file and dataset */
+    if(H5Pclose(faplid) < 0)
+        TEST_ERROR
     if(H5Sclose(msid) < 0)
         TEST_ERROR
     if(H5Dclose(did) < 0)
@@ -121,6 +127,8 @@ error:
     H5E_BEGIN_TRY {
         if(fid >= 0)
             (void)H5Fclose(fid);
+        if(faplid >= 0)
+            (void)H5Pclose(faplid);
         if(did >= 0)
             (void)H5Dclose(did);
         if(msid >= 0)
diff --git a/test/vds_swmr_writer.c b/test/vds_swmr_writer.c
index 7824aa0..d62ecaf 100644
--- a/test/vds_swmr_writer.c
+++ b/test/vds_swmr_writer.c
@@ -56,7 +56,7 @@ main(int argc, char *argv[])
 
     /* Open the source file and dataset */
     /* All SWMR files need to use the latest file format */
-    if((faplid = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if((faplid = h5_fileaccess()) < 0)
         TEST_ERROR
     if(H5Pset_libver_bounds(faplid, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         TEST_ERROR
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 3ee5393..c2153e5 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -119,7 +119,7 @@ print_incoming_data(void)
             HDmemset(data, 0, PRINT_DATA_MAX_SIZE+1);
             MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status);
 
-            printf("%s", data);
+            HDprintf("%s", data);
         }
     } while(incomingMessage);
 }
@@ -1119,7 +1119,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                 /*Set up args to pass to worker task. */
                 if(HDstrlen(obj1_fullpath) > 255 ||
                    HDstrlen(obj2_fullpath) > 255) {
-                    printf("The parallel diff only supports object names up to 255 characters\n");
+                    HDprintf("The parallel diff only supports object names up to 255 characters\n");
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 } /* end if */
 
@@ -1247,7 +1247,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                             MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
                         } /* end else-if */
                         else {
-                            printf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
+                            HDprintf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
                             MPI_Abort(MPI_COMM_WORLD, 0);
                             MPI_Finalize();
                         } /* end else */
@@ -1324,10 +1324,10 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 
                 MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status);
 
-                printf("%s", data);
+                HDprintf("%s", data);
             } /* end else-if */
             else {
-                printf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
+                HDprintf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
                 MPI_Abort(MPI_COMM_WORLD, 0);
             } /* end else */
         } /* end while */
diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c
index db61d51..cfe7422 100644
--- a/tools/lib/h5tools_filters.c
+++ b/tools/lib/h5tools_filters.c
@@ -20,7 +20,7 @@
  */
 static void print_filter_warning(const char *dname, const char *fname)
 {
-    fprintf(stderr,
+    HDfprintf(stderr,
             "Warning: dataset <%s> cannot be read, %s filter is not available\n",
             dname, fname);
 }
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 5519437..19911dc 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -823,14 +823,14 @@ trav_attr(hid_t
     const char          *buf = op_data->path;
 
     if((strlen(buf)==1) && (*buf=='/'))
-        printf(" %-10s %s%s", "attribute", buf, attr_name);
+        HDprintf(" %-10s %s%s", "attribute", buf, attr_name);
     else
-        printf(" %-10s %s/%s", "attribute", buf, attr_name);
+        HDprintf(" %-10s %s/%s", "attribute", buf, attr_name);
 
 #ifdef H5TRAV_PRINT_SPACE
     if(trav_verbosity < 2) {
 #endif
-        printf("\n");
+        HDprintf("\n");
 #ifdef H5TRAV_PRINT_SPACE
     }
     else {
@@ -850,26 +850,26 @@ trav_attr(hid_t
             switch(space_type) {
                 case H5S_SCALAR:
                     /* scalar dataspace */
-                    printf(" scalar\n");
+                    HDprintf(" scalar\n");
                     break;
 
                 case H5S_SIMPLE:
                     /* simple dataspace */
-                    printf(" {");
+                    HDprintf(" {");
                     for (i = 0; i < ndims; i++) {
-                        printf("%s" HSIZE_T_FORMAT, i?", ":"", size[i]);
+                        HDprintf("%s" HSIZE_T_FORMAT, i?", ":"", size[i]);
                     }
-                    printf("}\n");
+                    HDprintf("}\n");
                     break;
 
                 case H5S_NULL:
                     /* null dataspace */
-                    printf(" null\n");
+                    HDprintf(" null\n");
                     break;
 
                 default:
                     /* Unknown dataspace type */
-                    printf(" unknown\n");
+                    HDprintf(" unknown\n");
                     break;
             } /* end switch */
 
@@ -903,21 +903,21 @@ trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
      */
     switch(oinfo->type) {
         case H5O_TYPE_GROUP:
-            printf(" %-10s %s", "group", path);
+            HDprintf(" %-10s %s", "group", path);
             break;
 
         case H5O_TYPE_DATASET:
-            printf(" %-10s %s", "dataset", path);
+            HDprintf(" %-10s %s", "dataset", path);
             break;
 
         case H5O_TYPE_NAMED_DATATYPE:
-            printf(" %-10s %s", "datatype", path);
+            HDprintf(" %-10s %s", "datatype", path);
             break;
 
         case H5O_TYPE_UNKNOWN:
         case H5O_TYPE_NTYPES:
         default:
-            printf(" %-10s %s", "unknown object type", path);
+            HDprintf(" %-10s %s", "unknown object type", path);
             break;
     } /* end switch */
 
@@ -927,14 +927,14 @@ trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
 
         op_data.path = path;
         /* Finish printing line about object */
-        printf("\n");
+        HDprintf("\n");
         if(trav_verbosity > 0)
             H5Aiterate_by_name(print_udata->fid, path, trav_index_by, trav_index_order,
                                NULL, trav_attr, &op_data, H5P_DEFAULT);
     }
     else
         /* Print the link's original name */
-        printf(" -> %s\n", already_visited);
+        HDprintf(" -> %s\n", already_visited);
 
     return(0);
 } /* end trav_print_visit_obj() */
@@ -962,12 +962,12 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
                 if(targbuf) {
                     if(H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
                         targbuf[0] = 0;
-                    printf(" %-10s %s -> %s\n", "link", path, targbuf);
+                    HDprintf(" %-10s %s -> %s\n", "link", path, targbuf);
                     HDfree(targbuf);
                 }
             } /* end if */
             else
-                printf(" %-10s %s ->\n", "link", path);
+                HDprintf(" %-10s %s ->\n", "link", path);
             break;
 
         case H5L_TYPE_EXTERNAL:
@@ -981,12 +981,12 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
                     if(H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
                         targbuf[0] = 0;
                     if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &objname) >= 0)
-                        printf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname);
+                        HDprintf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname);
                     HDfree(targbuf);
                 }
             } /* end if */
             else
-                printf(" %-10s %s ->\n", "ext link", path);
+                HDprintf(" %-10s %s ->\n", "ext link", path);
             break;
 
         case H5L_TYPE_HARD:
@@ -996,7 +996,7 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
         default:
-            printf(" %-10s %s -> ???\n", "unknown type of UD link", path);
+            HDprintf(" %-10s %s -> ???\n", "unknown type of UD link", path);
             break;
     } /* end switch() */
 
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index 1800810..9490cd9 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -381,10 +381,10 @@ main (int argc, const char *argv[])
     *-------------------------------------------------------------------------*/
 
     if (verbose) {
-        printf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n",
+        HDprintf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n",
         fname_src, oname_src, fname_dst, oname_dst);
         if (flag) {
-            printf("Using %s flag\n", str_flag);
+            HDprintf("Using %s flag\n", str_flag);
         }
     }
 
@@ -419,7 +419,7 @@ main (int argc, const char *argv[])
 
         /* Display some output if requested */
         if(verbose)
-            printf("%s: Creating parent groups\n", h5tools_getprogname());
+            HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
     } /* end if */
     else {
         /* error, if parent groups doesn't already exist in destination file */
@@ -490,7 +490,7 @@ main (int argc, const char *argv[])
     leave(EXIT_SUCCESS);
 
 done:
-    printf("Error in copy...Exiting\n");
+    HDprintf("Error in copy...Exiting\n");
 
     /* free link info path */
     if (linkinfo.trg_path)
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index 0c1521e..362e3f2 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -62,9 +62,9 @@ static void check_options(diff_opt_t* opts)
      * These options are mutually exclusive.
      */
     if ((opts->d + opts->p + opts->use_system_epsilon) > 1) {
-        printf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
-        printf("use no more than one.\n");
-        printf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
+        HDprintf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
+        HDprintf("use no more than one.\n");
+        HDprintf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
         h5diff_exit(EXIT_FAILURE);
     }
 }
@@ -186,7 +186,7 @@ void parse_command_line(int argc,
 
             /* create linked list of excluding objects */
             if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
-                printf("Error: lack of memory!\n");
+                HDprintf("Error: lack of memory!\n");
                 h5diff_exit(EXIT_FAILURE);
             }
 
@@ -212,7 +212,7 @@ void parse_command_line(int argc,
             opts->d=1;
 
             if (check_d_input(opt_arg) == - 1) {
-                printf("<-d %s> is not a valid option\n", opt_arg);
+                HDprintf("<-d %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -226,7 +226,7 @@ void parse_command_line(int argc,
         case 'p':
             opts->p=1;
             if (check_p_input(opt_arg) == -1) {
-                printf("<-p %s> is not a valid option\n", opt_arg);
+                HDprintf("<-p %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -240,7 +240,7 @@ void parse_command_line(int argc,
         case 'n':
             opts->n=1;
             if ( check_n_input(opt_arg) == -1) {
-                printf("<-n %s> is not a valid option\n", opt_arg);
+                HDprintf("<-n %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -309,20 +309,20 @@ void parse_command_line(int argc,
          return;
 
      if (opts->cmn_objs == 0) {
-         printf("No common objects found. Files are not comparable.\n");
+         HDprintf("No common objects found. Files are not comparable.\n");
          if (!opts->m_verbose)
-             printf("Use -v for a list of objects.\n");
+             HDprintf("Use -v for a list of objects.\n");
      }
 
      if (opts->not_cmp == 1) {
          if (opts->m_list_not_cmp == 0) {
-             printf("--------------------------------\n");
-             printf("Some objects are not comparable\n");
-             printf("--------------------------------\n");
+             HDprintf("--------------------------------\n");
+             HDprintf("Some objects are not comparable\n");
+             HDprintf("--------------------------------\n");
              if (opts->m_verbose)
-                 printf("Use -c for a list of objects without details of differences.\n");
+                 HDprintf("Use -c for a list of objects without details of differences.\n");
              else
-                 printf("Use -c for a list of objects.\n");
+                 HDprintf("Use -c for a list of objects.\n");
          }
      }
  }
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index 83240cb..380ab3b 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -68,7 +68,7 @@ int main(int argc, const char *argv[])
 
     if(g_nTasks == 1)
     {
-        printf("Only 1 task available...doing serial diff\n");
+        HDprintf("Only 1 task available...doing serial diff\n");
 
         g_Parallel = 0;
 
@@ -148,12 +148,12 @@ ph5diff_worker(int nID)
                 /* Open the files */
                 if ((file1_id = H5Fopen (filenames[0], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
                 {
-                    printf ("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]);
+                    HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
                 if ((file2_id = H5Fopen (filenames[1], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
                 {
-                    printf ("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]);
+                    HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
                 /* enable error reporting */
@@ -170,7 +170,7 @@ ph5diff_worker(int nID)
             /* Make certain we've received the filenames and opened the files already */
             if(file1_id < 0 || file2_id < 0)
             {
-                printf("ph5diff_worker: ERROR: work received before/without filenames\n");
+                HDprintf("ph5diff_worker: ERROR: work received before/without filenames\n");
                 break;
             }
 
@@ -199,7 +199,7 @@ ph5diff_worker(int nID)
                     char out_data[PRINT_DATA_MAX_SIZE];
                     int tmp;
 
-                    memset(out_data, 0, PRINT_DATA_MAX_SIZE);
+                    HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE);
                     i=0;
 
                     rewind(overflow_file);
@@ -210,7 +210,7 @@ ph5diff_worker(int nID)
                         {
                             MPI_Send(out_data, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD);
                             i=0;
-                            memset(out_data, 0, PRINT_DATA_MAX_SIZE);
+                            HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE);
                         }
                     }
 
@@ -221,8 +221,8 @@ ph5diff_worker(int nID)
                     overflow_file = NULL;
                 }
 
-                fflush(stdout);
-                memset(outBuff, 0, OUTBUFF_SIZE);
+                HDfflush(stdout);
+                HDmemset(outBuff, 0, OUTBUFF_SIZE);
                 outBuffOffset = 0;
 
                 MPI_Send(&diffs, sizeof(diffs), MPI_BYTE, 0, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD);
@@ -238,7 +238,7 @@ ph5diff_worker(int nID)
         }
         else
         {
-            printf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG);
+            HDprintf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG);
             break;
         }
 
@@ -266,14 +266,14 @@ void print_manager_output(void)
     /* If there was something we buffered, let's print it now */
     if( (outBuffOffset>0) && g_Parallel)
     {
-        printf("%s", outBuff);
+        HDprintf("%s", outBuff);
 
         if(overflow_file)
         {
             int     tmp;
             rewind(overflow_file);
-            while((tmp = getc(overflow_file)) >= 0)
-                putchar(tmp);
+            while((tmp = HDgetc(overflow_file)) >= 0)
+                HDputchar(tmp);
             fclose(overflow_file);
             overflow_file = NULL;
         }
@@ -321,6 +321,6 @@ void h5diff_exit(int status)
     /* Always exit(0), since MPI implementations do weird stuff when they
      *  receive a non-zero exit value. - QAK
      */
-    exit(0);
+    HDexit(0);
 }
 
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 5c47abd..ccbede5 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -864,7 +864,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);
@@ -2022,7 +2022,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/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index 2fa9fd0..fdbdd40 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -587,7 +587,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 {
@@ -598,7 +598,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 {
@@ -607,7 +607,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/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index e96dea5..c18df6c 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -483,7 +483,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
         } /*H5T_REFERENCE*/
 
         if (options->verbose)
-            printf(FORMAT_OBJ_ATTR, "attr", name);
+            HDprintf(FORMAT_OBJ_ATTR, "attr", name);
 
         /*-------------------------------------------------------------------------
          * close
@@ -545,7 +545,7 @@ static int check_options(pack_opt_t *options) {
     */
     if (options->verbose && have_request(options) /* only print if requested */) {
         if (options->all_layout == 1) {
-            printf("All objects to modify layout are...\n");
+            HDprintf("All objects to modify layout are...\n");
             switch (options->layout_g) {
             case H5D_COMPACT:
                 strcpy(slayout, "compact");
@@ -566,17 +566,17 @@ static int check_options(pack_opt_t *options) {
                 strcpy(slayout, "invalid layout\n");
                 HGOTO_DONE(FAIL);
             }
-            printf(" Apply %s layout to all", slayout);
+            HDprintf(" Apply %s layout to all", slayout);
             if (H5D_CHUNKED == options->layout_g) {
-                printf("with dimension [ ");
+                HDprintf("with dimension [ ");
                 for (j = 0; j < options->chunk_g.rank; j++)
-                    printf("%d ", (int) options->chunk_g.chunk_lengths[j]);
-                printf("]");
+                    HDprintf("%d ", (int) options->chunk_g.chunk_lengths[j]);
+                HDprintf("]");
             }
-            printf("\n");
+            HDprintf("\n");
         }
         else
-            printf("No all objects to modify layout\n");
+            HDprintf("No all objects to modify layout\n");
     }/* verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
@@ -584,16 +584,16 @@ static int check_options(pack_opt_t *options) {
 
         if (options->op_tbl->objs[i].chunk.rank > 0) {
             if (options->verbose) {
-                printf(" <%s> with chunk size ", name);
+                HDprintf(" <%s> with chunk size ", name);
                 for (k = 0; k < options->op_tbl->objs[i].chunk.rank; k++)
-                    printf("%d ", (int) options->op_tbl->objs[i].chunk.chunk_lengths[k]);
-                printf("\n");
+                    HDprintf("%d ", (int) options->op_tbl->objs[i].chunk.chunk_lengths[k]);
+                HDprintf("\n");
             }
             has_ck = 1;
         }
         else if (options->op_tbl->objs[i].chunk.rank == -2) {
             if (options->verbose)
-                printf(" <%s> %s\n", name, "NONE (contiguous)");
+                HDprintf(" <%s> %s\n", name, "NONE (contiguous)");
             has_ck = 1;
         }
     }
@@ -608,33 +608,33 @@ static int check_options(pack_opt_t *options) {
 
     if (options->verbose && have_request(options) /* only print if requested */) {
         if (options->all_filter == 1) {
-            printf("All objects to apply filter are...\n");
+            HDprintf("All objects to apply filter are...\n");
             for (k = 0; k < options->n_filter_g; k++) {
                 H5Z_filter_t filtn = options->filter_g[k].filtn;
                 if (filtn < 0) {
-                    printf(" Unknown\n");
+                    HDprintf(" Unknown\n");
                     continue;
                 }
                 switch (filtn) {
                 case H5Z_FILTER_NONE:
-                    printf(" Uncompress all\n");
+                    HDprintf(" Uncompress all\n");
                     break;
                 case H5Z_FILTER_SHUFFLE:
                 case H5Z_FILTER_FLETCHER32:
-                    printf(" All with %s\n", get_sfilter(filtn));
+                    HDprintf(" All with %s\n", get_sfilter(filtn));
                     break;
                 case H5Z_FILTER_SZIP:
                 case H5Z_FILTER_DEFLATE:
-                    printf(" All with %s, parameter %d\n", get_sfilter(filtn), options->filter_g[k].cd_values[0]);
+                    HDprintf(" All with %s, parameter %d\n", get_sfilter(filtn), options->filter_g[k].cd_values[0]);
                     break;
                 default:
-                    printf(" User Defined %d\n", filtn);
+                    HDprintf(" User Defined %d\n", filtn);
                     break;
                 } /* k */
             };
         }
         else
-            printf("No all objects to apply filter\n");
+            HDprintf("No all objects to apply filter\n");
     } /* verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
@@ -645,9 +645,9 @@ static int check_options(pack_opt_t *options) {
             if (options->verbose) {
                 if(pack.filter[j].filtn >= 0) {
                     if(pack.filter[j].filtn > H5Z_FILTER_SCALEOFFSET)
-                        printf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn), pack.filter[j].filtn);
+                        HDprintf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn), pack.filter[j].filtn);
                     else
-                        printf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn));
+                        HDprintf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn));
                 }
             }
             has_cp = 1;
@@ -678,7 +678,7 @@ static int check_options(pack_opt_t *options) {
     */
     if (options->ublock_filename != NULL && options->ublock_size == 0) {
         if (options->verbose) {
-            printf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n", options->ublock_filename);
+            HDprintf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n", options->ublock_filename);
             options->ublock_size = 1024;
         }
     }
@@ -747,19 +747,19 @@ static int check_objects(const char* fname, pack_opt_t *options) {
      */
 
     if (options->verbose)
-        printf("Opening file. Searching %zu objects to modify ...\n", travt->nobjs);
+        HDprintf("Opening file. Searching %zu objects to modify ...\n", travt->nobjs);
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
         char* name = options->op_tbl->objs[i].path;
         if (options->verbose)
-            printf(" <%s>", name);
+            HDprintf(" <%s>", name);
 
         /* the input object names are present in the file and are valid */
         if (h5trav_getindext(name, travt) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "%s Could not find <%s> in file <%s>. Exiting...\n",
                     (options->verbose ? "\n" : ""), name, fname);
         if (options->verbose)
-            printf("...Found\n");
+            HDprintf("...Found\n");
 
         for (ifil = 0; ifil < options->op_tbl->objs[i].nfilters; ifil++) {
             if (options->op_tbl->objs[i].filter[ifil].filtn < 0)
@@ -799,7 +799,7 @@ static int check_objects(const char* fname, pack_opt_t *options) {
                     }
 
                     if (csize < ppb) {
-                        printf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n");
+                        HDprintf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n");
                         HGOTO_DONE(0);
                     }
                 }
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 8122d6d..13adb7c 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -296,7 +296,7 @@ print_user_block(fnamein, fidin);
      *-------------------------------------------------------------------------
      */
     if (options->verbose)
-        printf("Making new file ...\n");
+        HDprintf("Making new file ...\n");
 
     if ((fidout = H5Fcreate(fnameout, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Fcreate could not create file <%s>:", fnameout);
@@ -624,9 +624,9 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
      */
 
     if (options->verbose) {
-        printf("-----------------------------------------\n");
-        printf(" Type     Filter (Compression)     Name\n");
-        printf("-----------------------------------------\n");
+        HDprintf("-----------------------------------------\n");
+        HDprintf(" Type     Filter (Compression)     Name\n");
+        HDprintf("-----------------------------------------\n");
     }
 
     if (travt->objs) {
@@ -645,7 +645,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                  */
             case H5TRAV_TYPE_GROUP:
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "group", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "group", travt->objs[i].name);
 
                 /* open input group */
                 if ((grp_in = H5Gopen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
@@ -880,7 +880,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                             if (dset_out == FAIL) {
                                 H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, H5E_tools_min_id_g, "H5Dcreate2 failed");
                                 if (options->verbose)
-                                    printf(" warning: could not create dataset <%s>. Applying original settings\n", travt->objs[i].name);
+                                    HDprintf(" warning: could not create dataset <%s>. Applying original settings\n", travt->objs[i].name);
 
                                 if ((dset_out = H5Dcreate2(fidout, travt->objs[i].name, wtype_id, f_space_id, H5P_DEFAULT, dcpl_in, H5P_DEFAULT)) < 0)
                                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dcreate2 failed");
@@ -1043,10 +1043,10 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                  (in case there was a filter)
                                  */
                                 if (has_filter && apply_s == 0)
-                                    printf(" <warning: filter not applied to %s. dataset smaller than %d bytes>\n", travt->objs[i].name, (int) options->min_comp);
+                                    HDprintf(" <warning: filter not applied to %s. dataset smaller than %d bytes>\n", travt->objs[i].name, (int) options->min_comp);
 
                                 if (has_filter && apply_f == 0)
-                                    printf(" <warning: could not apply the filter to %s>\n", travt->objs[i].name);
+                                    HDprintf(" <warning: could not apply the filter to %s>\n", travt->objs[i].name);
                             } /* verbose */
 
                             /*-------------------------------------------------------------------------
@@ -1127,7 +1127,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose failed");
 
                     if (options->verbose)
-                        printf(FORMAT_OBJ, "dset", travt->objs[i].name);
+                        HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name);
 
                 } /* end do we have request for filter/chunking */
                 break;
@@ -1138,7 +1138,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
              */
             case H5TRAV_TYPE_NAMED_DATATYPE:
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "type", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "type", travt->objs[i].name);
 
                 if ((type_in = H5Topen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Topen2 failed");
@@ -1177,13 +1177,13 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
             case H5TRAV_TYPE_LINK:
             case H5TRAV_TYPE_UDLINK:
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "link", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "link", travt->objs[i].name);
 
                 if (H5Lcopy(fidin, travt->objs[i].name, fidout, travt->objs[i].name, H5P_DEFAULT, H5P_DEFAULT) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Lcopy failed");
 
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "link", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "link", travt->objs[i].name);
                 break;
 
             default:
@@ -1278,7 +1278,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
@@ -1292,7 +1292,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) ");
@@ -1326,15 +1326,15 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
     }/*i*/
 
     if (!pr)
-        printf(FORMAT_OBJ, "dset", objname);
+        HDprintf(FORMAT_OBJ, "dset", objname);
     else {
         char str[512], temp[512];
 
         HDstrcpy(str, "dset     ");
         HDstrcat(str, strfilter);
-        sprintf(temp, "  (%.3f:1)", ratio);
+        HDsprintf(temp, "  (%.3f:1)", ratio);
         HDstrcat(str, temp);
-        printf(FORMAT_OBJ, str, objname);
+        HDprintf(FORMAT_OBJ, str, objname);
     }
 }
 
@@ -1461,10 +1461,10 @@ print_user_block(const char *filename, hid_t fid)
 
         for (i = 0; i < nread; i++) {
 
-            printf("%c ", rbuf[i]);
+            HDprintf("%c ", rbuf[i]);
 
         }
-        printf("\n");
+        HDprintf("\n");
 
         if (nread < 0) {
             HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "nread < 0");
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index f5846ba..7e8951f 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -158,7 +158,7 @@ int do_copy_refobjs(hid_t fidin,
                         if(nelmts) {
                             buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf==NULL) {
-                                printf("cannot read into memory\n" );
+                                HDprintf("cannot read into memory\n" );
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                             } /* end if */
                             if(H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -166,7 +166,7 @@ int do_copy_refobjs(hid_t fidin,
 
                             refbuf = (hobj_ref_t*) HDcalloc((unsigned)nelmts, msize);
                             if(refbuf == NULL){
-                                printf("cannot allocate memory\n" );
+                                HDprintf("cannot allocate memory\n" );
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                             } /* end if */
                             for(u = 0; u < nelmts; u++) {
@@ -183,8 +183,8 @@ int do_copy_refobjs(hid_t fidin,
                                     if(H5Rcreate(&refbuf[u], fidout, refname, H5R_OBJECT, (hid_t)-1) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Rcreate failed");
                                     if(options->verbose) {
-                                        printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-                                        printf("object <%s> object reference created to <%s>\n",
+                                        HDprintf(FORMAT_OBJ,"dset",travt->objs[i].name );
+                                        HDprintf("object <%s> object reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
@@ -234,7 +234,7 @@ int do_copy_refobjs(hid_t fidin,
                         if(nelmts) {
                             buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf == NULL) {
-                                printf("cannot read into memory\n");
+                                HDprintf("cannot read into memory\n");
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                             } /* end if */
                             if(H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -246,7 +246,7 @@ int do_copy_refobjs(hid_t fidin,
                              */
                             refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */
                             if(refbuf == NULL) {
-                                printf("cannot allocate memory\n");
+                                HDprintf("cannot allocate memory\n");
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                             } /* end if */
 
@@ -271,8 +271,8 @@ int do_copy_refobjs(hid_t fidin,
                                     if(H5Sclose(region_id) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
                                     if(options->verbose) {
-                                        printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-                                        printf("object <%s> region reference created to <%s>\n",
+                                        HDprintf(FORMAT_OBJ,"dset",travt->objs[i].name );
+                                        HDprintf("object <%s> region reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
@@ -590,7 +590,7 @@ static int copy_refs_attr(hid_t loc_in,
             if((is_ref || is_ref_array) && (H5R_OBJ_REF_BUF_SIZE==msize)) {
                 buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                 if(buf == NULL) {
-                    printf("cannot read into memory\n");
+                    HDprintf("cannot read into memory\n");
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
                 if(H5Aread(attr_id, mtype_id, buf) < 0)
@@ -598,7 +598,7 @@ static int copy_refs_attr(hid_t loc_in,
 
                 refbuf = (hobj_ref_t *)HDcalloc((unsigned)nelmts, msize);
                 if(refbuf == NULL) {
-                    printf("cannot allocate memory\n");
+                    HDprintf("cannot allocate memory\n");
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                 } /* end if */
 
@@ -611,7 +611,7 @@ static int copy_refs_attr(hid_t loc_in,
                 buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
                 if(H5Aread(attr_id, mtype_id, buf) < 0)
@@ -623,7 +623,7 @@ static int copy_refs_attr(hid_t loc_in,
                  */
                 refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */
                 if(refbuf == NULL) {
-                    printf( "cannot allocate memory\n" );
+                    HDprintf( "cannot allocate memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                 } /* end if */
 
@@ -638,7 +638,7 @@ static int copy_refs_attr(hid_t loc_in,
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
 
@@ -679,7 +679,7 @@ static int copy_refs_attr(hid_t loc_in,
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
 
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index b3ccc3f..bd10e8b 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -357,12 +357,12 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
     /* Add attribute count to proper bin */
     bin = ceil_log10((unsigned long)oi->num_attrs);
     if((bin + 1) > iter->attr_nbins) {
-  iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long));
+        iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long));
         HDassert(iter->attr_bins);
 
   /* Initialize counts for intermediate bins */
         while(iter->attr_nbins < bin)
-      iter->attr_bins[iter->attr_nbins++] = 0;
+            iter->attr_bins[iter->attr_nbins++] = 0;
         iter->attr_nbins++;
 
         /* Initialize count for new bin */
@@ -509,8 +509,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "attribute_stats() failed");
 
     /* Get storage info */
-    if((storage = H5Dget_storage_size(did)) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_storage_size() failed");
+    /* Failure 0 indistinguishable from no-data-stored 0 */
+    storage = H5Dget_storage_size(did);
 
     /* Gather layout statistics */
     if((dcpl = H5Dget_create_plist(did)) < 0)
@@ -535,7 +535,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     if(num_ext) {
         iter->nexternal += (unsigned long)num_ext;
         iter->dset_external_storage_size += (unsigned long)storage;
-    } else
+    }
+    else
         iter->dset_storage_size += storage;
 
     /* Gather dataspace statistics */
@@ -931,7 +932,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                         error_msg("Invalid threshold for small groups\n");
                         goto error;
                     }
-                } else
+                }
+                else
                     error_msg("Missing threshold for small groups\n");
 
                 break;
@@ -953,7 +955,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                         error_msg("Invalid threshold for small datasets\n");
                         goto error;
                     }
-                } else
+                }
+                else
                     error_msg("Missing threshold for small datasets\n");
 
                 break;
@@ -975,7 +978,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                         error_msg("Invalid threshold for small # of attributes\n");
                         goto error;
                     }
-                } else
+                }
+                else
                     error_msg("Missing threshold for small # of attributes\n");
 
                 break;
@@ -1126,13 +1130,13 @@ iter_free(iter_t *iter)
 static herr_t
 print_file_info(const iter_t *iter)
 {
-    printf("File information\n");
-    printf("\t# of unique groups: %lu\n", iter->uniq_groups);
-    printf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
-    printf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
-    printf("\t# of unique links: %lu\n", iter->uniq_links);
-    printf("\t# of unique other: %lu\n", iter->uniq_others);
-    printf("\tMax. # of links to object: %lu\n", iter->max_links);
+    HDprintf("File information\n");
+    HDprintf("\t# of unique groups: %lu\n", iter->uniq_groups);
+    HDprintf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
+    HDprintf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
+    HDprintf("\t# of unique links: %lu\n", iter->uniq_links);
+    HDprintf("\t# of unique other: %lu\n", iter->uniq_others);
+    HDprintf("\tMax. # of links to object: %lu\n", iter->max_links);
     HDfprintf(stdout, "\tMax. # of objects in group: %Hu\n", iter->max_fanout);
 
     return 0;
@@ -1162,15 +1166,12 @@ print_file_metadata(const iter_t *iter)
     HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size);
 
     HDfprintf(stdout, "\tObject headers: (total/unused)\n");
-    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n",
-                iter->group_ohdr_info.total_size,
-    iter->group_ohdr_info.free_size);
+    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
+            iter->group_ohdr_info.free_size);
     HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n",
-    iter->dset_ohdr_info.total_size,
-    iter->dset_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n",
-                iter->dtype_ohdr_info.total_size,
-    iter->dtype_ohdr_info.free_size);
+            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size,
+            iter->dtype_ohdr_info.free_size);
 
     HDfprintf(stdout, "\tGroups:\n");
     HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
@@ -1229,28 +1230,28 @@ print_group_info(const iter_t *iter)
     total = 0;
     for(u = 0; u < (unsigned)sgroups_threshold; u++) {
         if(iter->num_small_groups[u] > 0) {
-            printf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
+            HDprintf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
             total += iter->num_small_groups[u];
         } /* end if */
     } /* end for */
-    printf("\tTotal # of small groups: %lu\n", total);
+    HDprintf("\tTotal # of small groups: %lu\n", total);
 
-    printf("Group bins:\n");
+    HDprintf("Group bins:\n");
     total = 0;
     if((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) {
-       printf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
+       HDprintf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
        total = iter->group_bins[0];
     } /* end if */
     power = 1;
     for(u = 1; u < iter->group_nbins; u++) {
         if(iter->group_bins[u] > 0) {
-           printf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
+           HDprintf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
                     iter->group_bins[u]);
            total += iter->group_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    printf("\tTotal # of groups: %lu\n", total);
+    HDprintf("\tTotal # of groups: %lu\n", total);
 
     return 0;
 } /* print_group_info() */
@@ -1271,7 +1272,7 @@ print_group_info(const iter_t *iter)
 static herr_t
 print_group_metadata(const iter_t *iter)
 {
-    printf("File space information for groups' metadata (in bytes):\n");
+    HDprintf("File space information for groups' metadata (in bytes):\n");
 
     HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
             iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
@@ -1304,66 +1305,66 @@ print_dataset_info(const iter_t *iter)
     unsigned u;                 /* Local index variable */
 
     if(iter->uniq_dsets > 0) {
-        printf("Dataset dimension information:\n");
-        printf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
-        printf("\tDataset ranks:\n");
+        HDprintf("Dataset dimension information:\n");
+        HDprintf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
+        HDprintf("\tDataset ranks:\n");
         for(u = 0; u < H5S_MAX_RANK; u++)
             if(iter->dset_rank_count[u] > 0)
-                printf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
+                HDprintf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
 
-        printf("1-D Dataset information:\n");
+        HDprintf("1-D Dataset information:\n");
         HDfprintf(stdout, "\tMax. dimension size of 1-D datasets: %Hu\n", iter->max_dset_dims);
-        printf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
+        HDprintf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
         total = 0;
         for(u = 0; u < (unsigned)sdsets_threshold; u++) {
             if(iter->small_dset_dims[u] > 0) {
-                printf("\t\t# of datasets with dimension sizes %u: %lu\n", u,
+                HDprintf("\t\t# of datasets with dimension sizes %u: %lu\n", u,
                          iter->small_dset_dims[u]);
                 total += iter->small_dset_dims[u];
             } /* end if */
         } /* end for */
-        printf("\t\tTotal # of small datasets: %lu\n", total);
+        HDprintf("\t\tTotal # of small datasets: %lu\n", total);
 
         /* Protect against no datasets in file */
         if(iter->dset_dim_nbins > 0) {
-            printf("\t1-D Dataset dimension bins:\n");
+            HDprintf("\t1-D Dataset dimension bins:\n");
             total = 0;
             if(iter->dset_dim_bins[0] > 0) {
-                printf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
+                HDprintf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
                 total = iter->dset_dim_bins[0];
             } /* end if */
             power = 1;
             for(u = 1; u < iter->dset_dim_nbins; u++) {
                 if(iter->dset_dim_bins[u] > 0) {
-                    printf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
+                    HDprintf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
                              iter->dset_dim_bins[u]);
                     total += iter->dset_dim_bins[u];
                 } /* end if */
                 power *= 10;
             } /* end for */
-            printf("\t\tTotal # of datasets: %lu\n", total);
+            HDprintf("\t\tTotal # of datasets: %lu\n", total);
         } /* end if */
 
-        printf("Dataset storage information:\n");
+        HDprintf("Dataset storage information:\n");
         HDfprintf(stdout, "\tTotal raw data size: %Hu\n", iter->dset_storage_size);
         HDfprintf(stdout, "\tTotal external raw data size: %Hu\n", iter->dset_external_storage_size);
 
-        printf("Dataset layout information:\n");
+        HDprintf("Dataset layout information:\n");
         for(u = 0; u < H5D_NLAYOUTS; u++)
-            printf("\tDataset layout counts[%s]: %lu\n", (u == H5D_COMPACT ? "COMPACT" :
+            HDprintf("\tDataset layout counts[%s]: %lu\n", (u == H5D_COMPACT ? "COMPACT" :
                 (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "VIRTUAL"))), iter->dset_layouts[u]);
-        printf("\tNumber of external files : %lu\n", iter->nexternal);
-
-        printf("Dataset filters information:\n");
-        printf("\tNumber of datasets with:\n");
-        printf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR+1]);
-        printf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
-        printf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
-        printf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
-        printf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
-        printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
-        printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
-        printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
+        HDprintf("\tNumber of external files : %lu\n", iter->nexternal);
+
+        HDprintf("Dataset filters information:\n");
+        HDprintf("\tNumber of datasets with:\n");
+        HDprintf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR+1]);
+        HDprintf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
+        HDprintf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
+        HDprintf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
+        HDprintf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
+        HDprintf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
+        HDprintf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
+        HDprintf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
     } /* end if */
 
     return 0;
@@ -1386,7 +1387,7 @@ print_dataset_info(const iter_t *iter)
 static herr_t
 print_dset_metadata(const iter_t *iter)
 {
-    printf("File space information for datasets' metadata (in bytes):\n");
+    HDprintf("File space information for datasets' metadata (in bytes):\n");
 
     HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
             iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
@@ -1420,20 +1421,20 @@ print_dset_dtype_meta(const iter_t *iter)
     unsigned u;                 /* Local index variable */
 
     if(iter->dset_ntypes) {
-        printf("Dataset datatype information:\n");
-        printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
+        HDprintf("Dataset datatype information:\n");
+        HDprintf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
         total = 0;
         for(u = 0; u < iter->dset_ntypes; u++) {
             H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
-            printf("\tDataset datatype #%u:\n", u);
-            printf("\t\tCount (total/named) = (%lu/%lu)\n",
+            HDprintf("\tDataset datatype #%u:\n", u);
+            HDprintf("\t\tCount (total/named) = (%lu/%lu)\n",
                     iter->dset_type_info[u].count, iter->dset_type_info[u].named);
-            printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
+            HDprintf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
                     (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
             H5Tclose(iter->dset_type_info[u].tid);
             total += iter->dset_type_info[u].count;
         } /* end for */
-        printf("\tTotal dataset datatype count: %lu\n", total);
+        HDprintf("\tTotal dataset datatype count: %lu\n", total);
     } /* end if */
 
     return 0;
@@ -1461,29 +1462,29 @@ print_attr_info(const iter_t *iter)
     unsigned long total;        /* Total count for various statistics */
     unsigned u;                 /* Local index variable */
 
-    printf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
+    HDprintf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
     total = 0;
     for(u = 1; u <= (unsigned)sattrs_threshold; u++) {
         if(iter->num_small_attrs[u] > 0) {
-            printf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
+            HDprintf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
             total += iter->num_small_attrs[u];
         } /* end if */
     } /* end for */
-    printf("\tTotal # of objects with small # of attributes: %lu\n", total);
+    HDprintf("\tTotal # of objects with small # of attributes: %lu\n", total);
 
-    printf("Attribute bins:\n");
+    HDprintf("Attribute bins:\n");
     total = 0;
     power = 1;
     for(u = 1; u < iter->attr_nbins; u++) {
         if(iter->attr_bins[u] > 0) {
-           printf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
+           HDprintf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
                     iter->attr_bins[u]);
            total += iter->attr_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    printf("\tTotal # of objects with attributes: %lu\n", total);
-    printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
+    HDprintf("\tTotal # of objects with attributes: %lu\n", total);
+    HDprintf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
 
     return 0;
 } /* print_attr_info() */
@@ -1515,25 +1516,25 @@ print_freespace_info(const iter_t *iter)
     total = 0;
     for(u = 0; u < SIZE_SMALL_SECTS; u++) {
         if(iter->num_small_sects[u] > 0) {
-            printf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
+            HDprintf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
             total += iter->num_small_sects[u];
         } /* end if */
     } /* end for */
     printf("\tTotal # of small size sections: %lu\n", total);
 
-    printf("Free-space section bins:\n");
+    HDprintf("Free-space section bins:\n");
 
     total = 0;
     power = 1;
     for(u = 1; u < iter->sect_nbins; u++) {
         if(iter->sect_bins[u] > 0) {
-           printf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1,
+           HDprintf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1,
                     iter->sect_bins[u]);
            total += iter->sect_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    printf("\tTotal # of sections: %lu\n", total);
+    HDprintf("\tTotal # of sections: %lu\n", total);
 
     return 0;
 } /* print_freespace_info() */
@@ -1561,7 +1562,7 @@ print_storage_summary(const iter_t *iter)
 
     HDfprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]);
     HDfprintf(stdout, "File space page size: %Hu bytes\n", iter->fsp_size);
-    printf("Summary of file space information:\n");
+    HDprintf("Summary of file space information:\n");
     total_meta =
             iter->super_size + iter->super_ext_size + iter->ublk_size +
             iter->group_ohdr_info.total_size +
@@ -1669,7 +1670,7 @@ print_file_statistics(const iter_t *iter)
 static void
 print_object_statistics(const char *name)
 {
-    printf("Object name %s\n", name);
+    HDprintf("Object name %s\n", name);
 } /* print_object_statistics() */
 
 
@@ -1751,7 +1752,7 @@ main(int argc, const char *argv[])
         hid_t               fcpl;
         H5F_info2_t         finfo;
 
-        printf("Filename: %s\n", fname);
+        HDprintf("Filename: %s\n", fname);
 
         fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
         if(fid < 0) {
@@ -1786,7 +1787,7 @@ main(int argc, const char *argv[])
 
         if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
             error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
-                h5tools_setstatus(EXIT_FAILURE);
+            h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
 
@@ -1815,7 +1816,8 @@ main(int argc, const char *argv[])
                 if(h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) < 0) {
                     error_msg("unable to traverse object \"%s\"\n", hand->obj[u]);
                     h5tools_setstatus(EXIT_FAILURE);
-                } else
+                }
+                else
                     print_statistics(hand->obj[u], &iter);
             } /* end for */
         } /* end if */
@@ -1823,7 +1825,8 @@ main(int argc, const char *argv[])
             if(h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) < 0) {
                 error_msg("unable to traverse objects/links in file \"%s\"\n", fname);
                 h5tools_setstatus(EXIT_FAILURE);
-            } else
+            }
+            else
                 print_statistics("/", &iter);
         } /* end else */
     } /* end if */
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index 088e6e9..96d6b9f 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -21,19 +21,19 @@
  *
  *-------------------------------------------------------------------------
  */
-#define H5A_FRIEND		/*suppress error about including H5Apkg  */
-#define H5B2_FRIEND		/*suppress error about including H5B2pkg */
-#define H5B2_TESTING		/*suppress warning about H5B2 testing funcs*/
-#define H5D_FRIEND		/*suppress error about including H5Dpkg  */
-#define H5EA_FRIEND		/*suppress error about including H5EApkg */
-#define H5EA_TESTING		/*suppress warning about H5EA testing funcs*/
-#define H5FA_FRIEND		/*suppress error about including H5FApkg */
-#define H5FA_TESTING		/*suppress warning about H5FA testing funcs*/
-#define H5F_FRIEND		/*suppress error about including H5Fpkg  */
-#define H5G_FRIEND		/*suppress error about including H5Gpkg  */
-#define H5HF_FRIEND		/*suppress error about including H5HFpkg */
-#define H5O_FRIEND		/*suppress error about including H5Opkg  */
-#define H5SM_FRIEND		/*suppress error about including H5SMpkg */
+#define H5A_FRIEND        /*suppress error about including H5Apkg  */
+#define H5B2_FRIEND        /*suppress error about including H5B2pkg */
+#define H5B2_TESTING        /*suppress warning about H5B2 testing funcs*/
+#define H5D_FRIEND        /*suppress error about including H5Dpkg  */
+#define H5EA_FRIEND        /*suppress error about including H5EApkg */
+#define H5EA_TESTING        /*suppress warning about H5EA testing funcs*/
+#define H5FA_FRIEND        /*suppress error about including H5FApkg */
+#define H5FA_TESTING        /*suppress warning about H5FA testing funcs*/
+#define H5F_FRIEND        /*suppress error about including H5Fpkg  */
+#define H5G_FRIEND        /*suppress error about including H5Gpkg  */
+#define H5HF_FRIEND        /*suppress error about including H5HFpkg */
+#define H5O_FRIEND        /*suppress error about including H5Opkg  */
+#define H5SM_FRIEND        /*suppress error about including H5SMpkg */
 
 #include "H5private.h"  /* Generic Functions    */
 #include "H5Apkg.h"     /* Attributes           */
@@ -57,7 +57,7 @@
 
 #define VCOL    50
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5B2_class
  *
@@ -80,68 +80,68 @@ get_H5B2_class(const uint8_t *sig)
     const H5B2_class_t *cls;
 
     switch(subtype) {
-        case H5B2_TEST_ID:
-            cls = H5B2_TEST;
-            break;
+    case H5B2_TEST_ID:
+        cls = H5B2_TEST;
+        break;
 
-        case H5B2_FHEAP_HUGE_INDIR_ID:
-            cls = H5HF_HUGE_BT2_INDIR;
-            break;
+    case H5B2_FHEAP_HUGE_INDIR_ID:
+        cls = H5HF_HUGE_BT2_INDIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
-            cls = H5HF_HUGE_BT2_FILT_INDIR;
-            break;
+    case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
+        cls = H5HF_HUGE_BT2_FILT_INDIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_DIR_ID:
-            cls = H5HF_HUGE_BT2_DIR;
-            break;
+    case H5B2_FHEAP_HUGE_DIR_ID:
+        cls = H5HF_HUGE_BT2_DIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_FILT_DIR_ID:
-            cls = H5HF_HUGE_BT2_FILT_DIR;
-            break;
+    case H5B2_FHEAP_HUGE_FILT_DIR_ID:
+        cls = H5HF_HUGE_BT2_FILT_DIR;
+        break;
 
-        case H5B2_GRP_DENSE_NAME_ID:
-            cls = H5G_BT2_NAME;
-            break;
+    case H5B2_GRP_DENSE_NAME_ID:
+        cls = H5G_BT2_NAME;
+        break;
 
-        case H5B2_GRP_DENSE_CORDER_ID:
-            cls = H5G_BT2_CORDER;
-            break;
+    case H5B2_GRP_DENSE_CORDER_ID:
+        cls = H5G_BT2_CORDER;
+        break;
 
-        case H5B2_SOHM_INDEX_ID:
-            cls = H5SM_INDEX;
-            break;
+    case H5B2_SOHM_INDEX_ID:
+        cls = H5SM_INDEX;
+        break;
 
-        case H5B2_ATTR_DENSE_NAME_ID:
-            cls = H5A_BT2_NAME;
-            break;
+    case H5B2_ATTR_DENSE_NAME_ID:
+        cls = H5A_BT2_NAME;
+        break;
 
-        case H5B2_ATTR_DENSE_CORDER_ID:
-            cls = H5A_BT2_CORDER;
-            break;
+    case H5B2_ATTR_DENSE_CORDER_ID:
+        cls = H5A_BT2_CORDER;
+        break;
 
-        case H5B2_CDSET_ID:
-            cls = H5D_BT2;
-            break;
+    case H5B2_CDSET_ID:
+        cls = H5D_BT2;
+        break;
 
-        case H5B2_CDSET_FILT_ID:
-            cls = H5D_BT2_FILT;
-            break;
+    case H5B2_CDSET_FILT_ID:
+        cls = H5D_BT2_FILT;
+        break;
 
-        case H5B2_TEST2_ID:
-            cls = H5B2_TEST2;
-            break;
+    case H5B2_TEST2_ID:
+        cls = H5B2_TEST2;
+        break;
 
-        case H5B2_NUM_BTREE_ID:
-        default:
-            HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
-            HDexit(4);
+    case H5B2_NUM_BTREE_ID:
+    default:
+        HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5B2_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5EA_class
  *
@@ -164,28 +164,28 @@ get_H5EA_class(const uint8_t *sig)
     const H5EA_class_t *cls;
 
     switch(clsid) {
-        case H5EA_CLS_TEST_ID:
-            cls = H5EA_CLS_TEST;
-            break;
+    case H5EA_CLS_TEST_ID:
+        cls = H5EA_CLS_TEST;
+        break;
 
-        case H5EA_CLS_CHUNK_ID:
-            cls = H5EA_CLS_CHUNK;
-            break;
+    case H5EA_CLS_CHUNK_ID:
+        cls = H5EA_CLS_CHUNK;
+        break;
 
-        case H5EA_CLS_FILT_CHUNK_ID:
-            cls = H5EA_CLS_FILT_CHUNK;
-            break;
+    case H5EA_CLS_FILT_CHUNK_ID:
+        cls = H5EA_CLS_FILT_CHUNK;
+        break;
 
-        case H5EA_NUM_CLS_ID:
-        default:
-            HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
-            HDexit(4);
+    case H5EA_NUM_CLS_ID:
+    default:
+        HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5EA_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5FA_class
  *
@@ -208,28 +208,28 @@ get_H5FA_class(const uint8_t *sig)
     const H5FA_class_t *cls;
 
     switch(clsid) {
-        case H5FA_CLS_TEST_ID:
-            cls = H5FA_CLS_TEST;
-            break;
+    case H5FA_CLS_TEST_ID:
+        cls = H5FA_CLS_TEST;
+        break;
 
-        case H5FA_CLS_CHUNK_ID:
-            cls = H5FA_CLS_CHUNK;
-            break;
+    case H5FA_CLS_CHUNK_ID:
+        cls = H5FA_CLS_CHUNK;
+        break;
 
-        case H5FA_CLS_FILT_CHUNK_ID:
-            cls = H5FA_CLS_FILT_CHUNK;
-            break;
+    case H5FA_CLS_FILT_CHUNK_ID:
+        cls = H5FA_CLS_FILT_CHUNK;
+        break;
 
-        case H5FA_NUM_CLS_ID: 
-        default:
-            HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
-            HDexit(4);
+    case H5FA_NUM_CLS_ID:
+    default:
+        HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5FA_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -254,13 +254,13 @@ main(int argc, char *argv[])
     uint8_t     sig[H5F_SIGNATURE_LEN];
     size_t      u;
     H5E_auto2_t func;
-    void 	*edata;
+    void     *edata;
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     herr_t      status = SUCCEED;
 
     if(argc == 1) {
-  	HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
-  	HDexit(1);
+        HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
+        HDexit(1);
     } /* end if */
 
     /* Initialize the library */
@@ -274,15 +274,15 @@ main(int argc, char *argv[])
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     /*
-     * Open the file and get the file descriptor.
-     */
+    * Open the file and get the file descriptor.
+    */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
         HDfprintf(stderr, "cannot create file access property list\n");
         HDexit(1);
     } /* 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) {
@@ -309,8 +309,8 @@ main(int argc, char *argv[])
     }
 
     /*
-     * Parse command arguments.
-     */
+    * Parse command arguments.
+    */
     if(argc > 2)
         addr = (haddr_t)HDstrtoll(argv[2], NULL, 0);
     if(argc > 3)
@@ -323,8 +323,8 @@ main(int argc, char *argv[])
         extra4 = (haddr_t)HDstrtoll(argv[6], NULL, 0);
 
     /*
-     * Read the signature at the specified file position.
-     */
+    * Read the signature at the specified file position.
+    */
     HDfprintf(stdout, "Reading signature at address %a (rel)\n", addr);
     if(H5F_block_read(f, H5FD_MEM_SUPER, addr, sizeof(sig), sig) < 0) {
         HDfprintf(stderr, "cannot read signature\n");
@@ -332,26 +332,28 @@ main(int argc, char *argv[])
     }
     if(!HDmemcmp(sig, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) {
         /*
-         * Debug the file's super block.
-         */
+        * Debug the file's super block.
+        */
         status = H5F_debug(f, stdout, 0, VCOL);
 
     } else if(!HDmemcmp(sig, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a local heap.
-         */
+        * Debug a local heap.
+        */
         status = H5HL_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp (sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
-	/*
-	 * Debug a global heap collection.
-	 */
-	status = H5HG_debug(f, addr, stdout, 0, VCOL);
+    }
+    else if(!HDmemcmp (sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+        /*
+        * Debug a global heap collection.
+        */
+        status = H5HG_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a symbol table node.
-         */
+        * Debug a symbol table node.
+        */
 
         /* Check for extra parameters */
         if(extra == 0) {
@@ -362,107 +364,109 @@ main(int argc, char *argv[])
 
         status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
 
-    } else if(!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a B-tree.  B-trees are debugged through the B-tree
-         * subclass.  The subclass identifier is the byte immediately
-         * after the B-tree signature.
-         */
+        * Debug a B-tree.  B-trees are debugged through the B-tree
+        * subclass.  The subclass identifier is the byte immediately
+        * after the B-tree signature.
+        */
         H5B_subid_t subtype = (H5B_subid_t)sig[H5_SIZEOF_MAGIC];
         unsigned    ndims;
         uint32_t    dim[H5O_LAYOUT_NDIMS];
 
         switch(subtype) {
-            case H5B_SNODE_ID:
-                /* Check for extra parameters */
-                if(extra == 0) {
-                    HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
-                    HDfprintf(stderr, "B-tree symbol table node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
-                    HDexit(4);
-                } /* end if */
+        case H5B_SNODE_ID:
+            /* Check for extra parameters */
+            if(extra == 0) {
+                HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
+                HDfprintf(stderr, "B-tree symbol table node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
+                HDexit(4);
+            } /* end if */
 
-                status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
-                break;
+            status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
+            break;
 
-            case H5B_CHUNK_ID:
-                /* Check for extra parameters */
-                if(extra == 0) {
-                    HDfprintf(stderr, "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
+        case H5B_CHUNK_ID:
+            /* Check for extra parameters */
+            if(extra == 0) {
+                HDfprintf(stderr, "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
+                HDfprintf(stderr, "B-tree chunked storage node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
+                HDexit(4);
+            } /* end if */
+
+            /* Build array of chunk dimensions */
+            ndims = (unsigned)extra;
+            dim[0] = (uint32_t)extra2;
+            if(ndims > 1)
+                dim[1] = (uint32_t)extra3;
+            if(ndims > 2)
+                dim[2] = (uint32_t)extra4;
+
+            /* Check for dimension error */
+            if(ndims > 3) {
+                HDfprintf(stderr, "ERROR: Only 3 dimensions support currently (fix h5debug)\n");
+                HDfprintf(stderr, "B-tree chunked storage node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
+                HDexit(4);
+            } /* end for */
+            for(u = 0; u < ndims; u++)
+                if(0 == dim[u]) {
+                    HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
                     HDfprintf(stderr, "B-tree chunked storage node usage:\n");
                     HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
                     HDexit(4);
                 } /* end if */
 
-                /* Build array of chunk dimensions */
-                ndims = (unsigned)extra;
-                dim[0] = (uint32_t)extra2;
-                if(ndims > 1)
-                    dim[1] = (uint32_t)extra3;
-                if(ndims > 2)
-                    dim[2] = (uint32_t)extra4;
-
-                /* Check for dimension error */
-                if(ndims > 3) {
-                    HDfprintf(stderr, "ERROR: Only 3 dimensions support currently (fix h5debug)\n");
-                    HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                    HDexit(4);
-                } /* end for */
-                for(u = 0; u < ndims; u++)
-                    if(0 == dim[u]) {
-                        HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
-                        HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                        HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                        HDexit(4);
-                    } /* end if */
-
-                /* Set the last dimension (the element size) to zero */
-                dim[ndims] = 0;
-
-                status = H5D_btree_debug(f, addr, stdout, 0, VCOL, ndims, dim);
-                break;
-
-            case H5B_NUM_BTREE_ID:
-            default:
-                HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
-                HDexit(4);
+            /* Set the last dimension (the element size) to zero */
+            dim[ndims] = 0;
+
+            status = H5D_btree_debug(f, addr, stdout, 0, VCOL, ndims, dim);
+            break;
+
+        case H5B_NUM_BTREE_ID:
+        default:
+            HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
+            HDexit(4);
         }
 
-    } else if(!HDmemcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a v2 B-tree header.
-         */
+        * Debug a v2 B-tree header.
+        */
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
-	    if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && extra == 0) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && extra == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the layout message in order to dump header\n");
             HDfprintf(stderr, "v2 B-tree hdr usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n");
             HDexit(4);
-	    } /* end if */
+        } /* end if */
 
         status = H5B2__hdr_debug(f, addr, stdout, 0, VCOL, cls, (haddr_t)extra);
 
-    } else if(!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a v2 B-tree internal node.
-         */
+        * Debug a v2 B-tree internal node.
+        */
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
         /* Check for enough valid parameters */
-	if((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
-	   (extra == 0 || extra2 == 0 || extra3 == 0 || extra4 == 0)) {
-
-            fprintf(stderr, "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object header address containing the layout message in order to dump internal node\n");
-            fprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
-            fprintf(stderr, "v2 B-tree internal node usage:\n");
-            fprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth> <object header address>\n");
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 || extra4 == 0)) {
+            HDfprintf(stderr, "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object header address containing the layout message in order to dump internal node\n");
+            HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
+            HDfprintf(stderr, "v2 B-tree internal node usage:\n");
+            HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth> <object header address>\n");
             HDexit(4);
 
-        } else if(extra == 0 || extra2 == 0 || extra3 == 0) {
+        }
+        else if(extra == 0 || extra2 == 0 || extra3 == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and depth in order to dump internal node\n");
             HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
             HDfprintf(stderr, "v2 B-tree internal node usage:\n");
@@ -472,23 +476,24 @@ main(int argc, char *argv[])
 
         status = H5B2__int_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (unsigned)extra3, (haddr_t)extra4);
 
-    } else if(!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a v2 B-tree leaf node.
-         */
+        * Debug a v2 B-tree leaf node.
+        */
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
         /* Check for enough valid parameters */
-	if((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
-	   (extra == 0 || extra2 == 0 || extra3 == 0 )) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 )) {
 
-            fprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header address containing the layout message in order to dump leaf node\n");
-            fprintf(stderr, "v2 B-tree leaf node usage:\n");
-            fprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records> <object header address>\n");
+            HDfprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header address containing the layout message in order to dump leaf node\n");
+            HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
+            HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records> <object header address>\n");
             HDexit(4);
 
-        } else if(extra == 0 || extra2 == 0) {
+        }
+        else if(extra == 0 || extra2 == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and number of records in order to dump leaf node\n");
             HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records>\n");
@@ -497,16 +502,18 @@ main(int argc, char *argv[])
 
         status = H5B2__leaf_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (haddr_t)extra3);
 
-    } else if(!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fractal heap header.
-         */
+        * Debug a fractal heap header.
+        */
         status = H5HF_hdr_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fractal heap direct block.
-         */
+        * Debug a fractal heap direct block.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0 || extra2 == 0) {
@@ -518,10 +525,11 @@ main(int argc, char *argv[])
 
         status = H5HF_dblock_debug(f, addr, stdout, 0, VCOL, extra, (size_t)extra2);
 
-    } else if(!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fractal heap indirect block.
-         */
+        * Debug a fractal heap indirect block.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0 || extra2 == 0) {
@@ -533,17 +541,19 @@ main(int argc, char *argv[])
 
         status = H5HF_iblock_debug(f, addr, stdout, 0, VCOL, extra, (unsigned)extra2);
 
-    } else if(!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a free space header.
-         */
+        * Debug a free space header.
+        */
 
         status = H5FS_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug free space serialized sections.
-         */
+        * Debug free space serialized sections.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0 || extra2 == 0) {
@@ -555,17 +565,19 @@ main(int argc, char *argv[])
 
         status = H5FS_sects_debug(f, addr, stdout, 0, VCOL, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug shared message master table.
-         */
+        * Debug shared message master table.
+        */
 
         status = H5SM_table_debug(f, addr, stdout, 0, VCOL, (unsigned) UFAIL, (unsigned) UFAIL);
 
-    } else if(!HDmemcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug shared message list index.
-         */
+        * Debug shared message list index.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0) {
@@ -577,10 +589,11 @@ main(int argc, char *argv[])
 
         status = H5SM_list_debug(f, addr, stdout, 0, VCOL, (haddr_t)extra);
 
-    } else if(!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray header.
-         */
+        * Debug an extensible aray header.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -594,10 +607,11 @@ main(int argc, char *argv[])
 
         status = H5EA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
 
-    } else if(!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray index block.
-         */
+        * Debug an extensible aray index block.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -611,10 +625,11 @@ main(int argc, char *argv[])
 
         status = H5EA__iblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray super block.
-         */
+        * Debug an extensible aray super block.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -628,10 +643,11 @@ main(int argc, char *argv[])
 
         status = H5EA__sblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, extra3);
 
-    } else if(!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray data block.
-         */
+        * Debug an extensible aray data block.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -645,10 +661,11 @@ main(int argc, char *argv[])
 
         status = H5EA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (size_t)extra2, extra3);
 
-    } else if(!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fixed array header.
-         */
+        * Debug a fixed array header.
+        */
         const H5FA_class_t *cls = get_H5FA_class(sig);
         HDassert(cls);
 
@@ -662,10 +679,11 @@ main(int argc, char *argv[])
 
         status = H5FA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
 
-    } else if(!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fixed array data block.
-         */
+        * Debug a fixed array data block.
+        */
         const H5FA_class_t *cls = get_H5FA_class(sig);
         HDassert(cls);
 
@@ -679,33 +697,37 @@ main(int argc, char *argv[])
 
         status = H5FA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug v2 object header (which have signatures).
-         */
+        * Debug v2 object header (which have signatures).
+        */
 
         status = H5O_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(sig[0] == H5O_VERSION_1) {
+    }
+    else if(sig[0] == H5O_VERSION_1) {
         /*
-         * This could be a v1 object header.  Since they don't have a signature
-         * it's a somewhat "ify" detection.
-         */
+        * This could be a v1 object header.  Since they don't have a signature
+        * it's a somewhat "ify" detection.
+        */
         status = H5O_debug(f, addr, stdout, 0, VCOL);
 
-    } else {
+    }
+    else {
         /*
-         * Got some other unrecognized signature.
-         */
-        printf("%-*s ", VCOL, "Signature:");
+        * Got some other unrecognized signature.
+        */
+        HDprintf("%-*s ", VCOL, "Signature:");
         for (u = 0; u < sizeof(sig); u++) {
             if (sig[u] > ' ' && sig[u] <= '~' && '\\' != sig[u])
                 HDputchar(sig[u]);
             else if ('\\' == sig[u]) {
                 HDputchar('\\');
                 HDputchar('\\');
-            } else
-                printf("\\%03o", sig[u]);
+            }
+            else
+                HDprintf("\\%03o", sig[u]);
         }
         HDputchar('\n');
 
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index b7ff73c..feb60d4 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -251,7 +251,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
+            HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
     } /* end if */
 
     /* Attempt to open an existing HDF5 file first */
@@ -284,7 +284,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: Creating parent groups\n", h5tools_getprogname());
+            HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
     } /* end if */
 
     /* Loop over creating requested groups */
@@ -305,7 +305,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: created group '%s'\n", h5tools_getprogname(), params.groups[curr_group]);
+            HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params.groups[curr_group]);
     } /* end for */
 
     /* Close link creation property list */
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index 2f4d93e..d516fa0 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -15,19 +15,19 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Wednesday, May 13, 1998
  *
- * Purpose:	Repartitions a file family.  This program can be used to
- *		split a single file into a family of files, join a family of
- *		files into a single file, or copy one family to another while
- *		changing the size of the family members.  It can also be used
- *		to copy a single file to a single file with holes.
+ * Purpose:    Repartitions a file family.  This program can be used to
+ *        split a single file into a family of files, join a family of
+ *        files into a single file, or copy one family to another while
+ *        changing the size of the family members.  It can also be used
+ *        to copy a single file to a single file with holes.
  */
 
 /* See H5private.h for how to include system headers */
 #include "hdf5.h"
 #include "H5private.h"
 
-#define NAMELEN	4096
-#define GB	*1024*1024*1024
+#define NAMELEN    4096
+#define GB    *1024*1024*1024
 
 /* Make these 2 private properties(defined in H5Fprivate.h) available to h5repart.
  * The first one updates the member file size in the superblock.  The second one
@@ -36,15 +36,15 @@
 #define H5F_ACS_FAMILY_NEWSIZE_NAME            "family_newsize"
 #define H5F_ACS_FAMILY_TO_SINGLE_NAME          "family_to_single"
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	usage
+ * Function:    usage
  *
- * Purpose:	Prints a usage message.
+ * Purpose:    Prints a usage message.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Modifications:
@@ -54,98 +54,99 @@
 static void
 usage (const char *progname)
 {
-    fprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] 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   Deprecated version of -family_to_single (below)\n");
-    fprintf(stderr, "   -family_to_single   Change file driver from family to the default single-file VFD (windows or 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 "
-	    "`k' for kB.\n");
-    fprintf(stderr, "File family names include an integer printf "
-	    "format such as `%%d'\n");
-    exit (EXIT_FAILURE);
+    HDfprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n",
+        progname);
+    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   Deprecated version of -family_to_single (below)\n");
+    HDfprintf(stderr, "   -family_to_single   Change file driver from family to the default single-file VFD (windows or 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");
+    HDfprintf(stderr, "File family names include an integer printf "
+        "format such as `%%d'\n");
+    HDexit (EXIT_FAILURE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	get_size
+ * Function:    get_size
  *
- * Purpose:	Reads a size option of the form `-XNS' where `X' is any
- *		letter, `N' is a multi-character positive decimal number, and
- *		`S' is an optional suffix letter in the set [GgMmk].  The
- *		option may also be split among two arguments as: `-X NS'.
- *		The input value of ARGNO is the argument number for the
- *		switch in the ARGV vector and ARGC is the number of entries
- *		in that vector.
+ * Purpose:    Reads a size option of the form `-XNS' where `X' is any
+ *        letter, `N' is a multi-character positive decimal number, and
+ *        `S' is an optional suffix letter in the set [GgMmk].  The
+ *        option may also be split among two arguments as: `-X NS'.
+ *        The input value of ARGNO is the argument number for the
+ *        switch in the ARGV vector and ARGC is the number of entries
+ *        in that vector.
  *
- * Return:	Success:	The value N multiplied according to the
- *				suffix S.  On return ARGNO will be the number
- *				of the next argument to process.
+ * Return:    Success:    The value N multiplied according to the
+ *                suffix S.  On return ARGNO will be the number
+ *                of the next argument to process.
  *
- *		Failure:	Calls usage() which exits with a non-zero
- *				status.
+ *        Failure:    Calls usage() which exits with a non-zero
+ *                status.
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static off_t
 get_size (const char *progname, int *argno, int argc, char *argv[])
 {
-    off_t	retval=-1;
-    char	*suffix;
+    off_t    retval=-1;
+    char    *suffix;
 
     if (isdigit ((int)(argv[*argno][2]))) {
-	retval = strtol (argv[*argno]+2, &suffix, 10);
-	(*argno)++;
-    } else if (argv[*argno][2] || *argno+1>=argc) {
-	usage (progname);
-    } else {
-	retval = strtol (argv[*argno+1], &suffix, 0);
-	if (suffix==argv[*argno+1]) usage (progname);
-	*argno += 2;
+        retval = HDstrtol(argv[*argno]+2, &suffix, 10);
+        (*argno)++;
+    }
+    else if (argv[*argno][2] || *argno+1>=argc) {
+        usage (progname);
+    }
+    else {
+        retval = HDstrtol(argv[*argno+1], &suffix, 0);
+        if (suffix == argv[*argno+1])
+            usage (progname);
+        *argno += 2;
     }
     if (suffix && suffix[0] && !suffix[1]) {
-	switch (*suffix) {
-	case 'G':
-	case 'g':
-	    retval *= 1024 * 1024 * 1024;
-	    break;
-	case 'M':
-	case 'm':
-	    retval *= 1024 * 1024;
-	    break;
-	case 'k':
-	    retval *= 1024;
-	    break;
-	default:
-	    usage (progname);
-	}
-    } else if (suffix && suffix[0]) {
-	usage (progname);
+        switch (*suffix) {
+        case 'G':
+        case 'g':
+            retval *= 1024 * 1024 * 1024;
+            break;
+        case 'M':
+        case 'm':
+            retval *= 1024 * 1024;
+            break;
+        case 'k':
+            retval *= 1024;
+            break;
+        default:
+            usage(progname);
+        }
+    }
+    else if (suffix && suffix[0]) {
+        usage (progname);
     }
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Split an hdf5 file
+ * Purpose:    Split an hdf5 file
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Modifications:
@@ -155,36 +156,36 @@ get_size (const char *progname, int *argno, int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-    const char	*prog_name;		/*program name			*/
-    size_t	blk_size=1024;		/*size of each I/O block	*/
-    char	*buf=NULL;		/*I/O block buffer		*/
-    size_t	n, i;			/*counters			*/
-    ssize_t	nio;			/*I/O return value		*/
-    int		argno=1;		/*program argument number	*/
-    int		src, dst=-1;		/*source & destination files	*/
-    int		need_seek=FALSE;	/*destination needs to seek?	*/
-    int		need_write;		/*data needs to be written?	*/
-    h5_stat_t sb;                       /*temporary file stat buffer	*/
-
-    int		verbose=FALSE;		/*display file names?		*/
-
-    const char	*src_gen_name;  /*general source name		*/
-    char	*src_name=NULL;	    /*source member name		*/
-
-    int		src_is_family;		/*is source name a family name?	*/
-    int		src_membno=0;		/*source member number		*/
-
-    const char	*dst_gen_name;	/*general destination name	*/
-    char	*dst_name=NULL;	    /*destination member name	*/
-    int		dst_is_family;		/*is dst name a family name?	*/
-    int		dst_membno=0;		/*destination member number	*/
-
-    off_t	left_overs=0;		/*amount of zeros left over	*/
-    off_t	src_offset=0;		/*offset in source member	*/
-    off_t	dst_offset=0;		/*offset in destination member	*/
-    off_t	src_size;           /*source logical member size	*/
-    off_t	src_act_size;		/*source actual member size	*/
-    off_t	dst_size=1 GB;		/*destination logical memb size	*/
+    const char    *prog_name;        /*program name            */
+    size_t    blk_size=1024;        /*size of each I/O block    */
+    char    *buf=NULL;        /*I/O block buffer        */
+    size_t    n, i;            /*counters            */
+    ssize_t    nio;            /*I/O return value        */
+    int        argno=1;        /*program argument number    */
+    int        src, dst=-1;        /*source & destination files    */
+    int        need_seek=FALSE;    /*destination needs to seek?    */
+    int        need_write;        /*data needs to be written?    */
+    h5_stat_t sb;                       /*temporary file stat buffer    */
+
+    int        verbose=FALSE;        /*display file names?        */
+
+    const char    *src_gen_name;  /*general source name        */
+    char    *src_name=NULL;        /*source member name        */
+
+    int        src_is_family;        /*is source name a family name?    */
+    int        src_membno=0;        /*source member number        */
+
+    const char    *dst_gen_name;    /*general destination name    */
+    char    *dst_name=NULL;        /*destination member name    */
+    int        dst_is_family;        /*is dst name a family name?    */
+    int        dst_membno=0;        /*destination member number    */
+
+    off_t    left_overs=0;        /*amount of zeros left over    */
+    off_t    src_offset=0;        /*offset in source member    */
+    off_t    dst_offset=0;        /*offset in destination member    */
+    off_t    src_size;           /*source logical member size    */
+    off_t    src_act_size;        /*source actual member size    */
+    off_t    dst_size=1 GB;        /*destination logical memb size    */
     hid_t       fapl;                   /*file access property list     */
     hid_t       file;
     hsize_t     hdsize;                 /*destination logical memb size */
@@ -193,48 +194,50 @@ main (int argc, char *argv[])
     /*
      * Get the program name from argv[0]. Use only the last component.
      */
-    if ((prog_name=strrchr (argv[0], '/'))) prog_name++;
-    else prog_name = argv[0];
+    if ((prog_name = HDstrrchr (argv[0], '/')))
+        prog_name++;
+    else
+        prog_name = argv[0];
 
     /*
      * Parse switches.
      */
-    while (argno<argc && '-'==argv[argno][0]) {
-        if (!strcmp (argv[argno], "-v")) {
+    while (argno < argc && '-' == argv[argno][0]) {
+        if (!HDstrcmp(argv[argno], "-v")) {
             verbose = TRUE;
             argno++;
-        } else if (!strcmp(argv[argno], "-V")) {
-            printf("This is %s version %u.%u release %u\n",
-                prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
-            exit(EXIT_SUCCESS);
-        } else if (!strcmp (argv[argno], "-family_to_sec2")) {
+        } else if (!HDstrcmp(argv[argno], "-V")) {
+            HDprintf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
+            HDexit(EXIT_SUCCESS);
+        } else if (!HDstrcmp(argv[argno], "-family_to_sec2")) {
             family_to_single = TRUE;
             argno++;
-        } else if (!strcmp (argv[argno], "-family_to_single")) {
+        } else if (!HDstrcmp(argv[argno], "-family_to_single")) {
             family_to_single = TRUE;
             argno++;
-        } else if ('b'==argv[argno][1]) {
-            blk_size = (size_t)get_size (prog_name, &argno, argc, argv);
-        } else if ('m'==argv[argno][1]) {
-            dst_size = get_size (prog_name, &argno, argc, argv);
+        } else if ('b' == argv[argno][1]) {
+            blk_size = (size_t) get_size(prog_name, &argno, argc, argv);
+        } else if ('m' == argv[argno][1]) {
+            dst_size = get_size(prog_name, &argno, argc, argv);
         } else {
-            usage (prog_name);
+            usage(prog_name);
         } /* end if */
     } /* end while */
 
     /* allocate names */
     if(NULL == (src_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     if(NULL == (dst_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
 
     /*
      * Get the name for the source file and open the first member.  The size
      * of the first member determines the logical size of all the members.
      */
-    if (argno>=argc) usage (prog_name);
+    if (argno >= argc)
+        usage(prog_name);
     src_gen_name = argv[argno++];
-    sprintf (src_name, src_gen_name, src_membno);
+    HDsprintf(src_name, src_gen_name, src_membno);
     src_is_family = strcmp (src_name, src_gen_name);
 
     if ((src = HDopen(src_name, O_RDONLY)) < 0) {
@@ -242,157 +245,170 @@ main (int argc, char *argv[])
         HDexit(EXIT_FAILURE);
     }
 
-    if (HDfstat(src, &sb)<0) {
-        perror ("fstat");
-        exit (EXIT_FAILURE);
+    if (HDfstat(src, &sb) < 0) {
+        HDperror("fstat");
+        HDexit(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.
      */
-    if (argno>=argc) usage (prog_name);
+    if (argno>=argc)
+        usage (prog_name);
     dst_gen_name = argv[argno++];
-    sprintf (dst_name, dst_gen_name, dst_membno);
-    dst_is_family = strcmp (dst_name, dst_gen_name);
+    HDsprintf(dst_name, dst_gen_name, dst_membno);
+    dst_is_family = HDstrcmp(dst_name, dst_gen_name);
 
     if ((dst = HDopen(dst_name, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
         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);
+    if (argno < argc)
+        usage (prog_name);
 
     /* Now the real work, split the file */
     buf = (char *)HDmalloc(blk_size);
     while (src_offset<src_size) {
 
-	/* Read a block.  The amount to read is the minimum of:
-	 *    1. The I/O block size
-	 *    2. What's left to write in the destination member
-	 *    3. Left over zeros or what's left in the source member.
-	 */
-	n = blk_size;
-	if (dst_is_family) n = (size_t)MIN((off_t)n, dst_size-dst_offset);
-	if (left_overs) {
-	    n = (size_t)MIN ((off_t)n, left_overs);
-	    left_overs = left_overs - (off_t)n;
-	    need_write = FALSE;
-	} else if (src_offset<src_act_size) {
-	    n = (size_t)MIN ((off_t)n, src_act_size-src_offset);
-	    if ((nio=HDread (src, buf, n))<0) {
-		perror ("read");
-		exit (EXIT_FAILURE);
-	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short read\n", src_name);
-		exit (EXIT_FAILURE);
-	    }
-	    for (i=0; i<n; i++) {
-		if (buf[i]) break;
-	    }
-	    need_write = (i<n);
-	} else {
-	    n = 0;
-	    left_overs = src_size - src_act_size;
-	    need_write = FALSE;
-	}
-
-	/*
-	 * If the block contains non-zero data then write it to the
-	 * destination, otherwise just remember that we'll have to do a seek
-	 * later in the destination when we finally get non-zero data.
-	 */
-	if (need_write) {
-	    if (need_seek && HDlseek (dst, dst_offset, SEEK_SET)<0) {
-		perror ("HDlseek");
-		exit (EXIT_FAILURE);
-	    }
-	    if ((nio=HDwrite (dst, buf, n))<0) {
-		perror ("write");
-		exit (EXIT_FAILURE);
-	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short write\n", dst_name);
-		exit (EXIT_FAILURE);
-	    }
-	    need_seek = FALSE;
-	} else {
-	    need_seek = TRUE;
-	}
-
-	/*
-	 * Update the source offset and open the next source family member if
-	 * necessary.  The source stream ends at the first member which
-	 * cannot be opened because it doesn't exist.  At the end of the
-	 * source stream, update the destination offset and break out of the
-	 * loop.   The destination offset must be updated so we can fix
-	 * trailing holes.
-	 */
-	src_offset = src_offset + (off_t)n;
-	if (src_offset==src_act_size) {
-	    HDclose (src);
-	    if (!src_is_family) {
-                dst_offset = dst_offset + (off_t)n;
-		break;
-	    }
-	    sprintf (src_name, src_gen_name, ++src_membno);
-	    if ((src = HDopen(src_name, O_RDONLY)) < 0 && ENOENT == errno) {
-            dst_offset = dst_offset + (off_t)n;
-            break;
-	    } else if (src<0) {
-		perror (src_name);
-		exit (EXIT_FAILURE);
-	    }
-	    if (HDfstat (src, &sb)<0) {
-		perror ("fstat");
-		exit (EXIT_FAILURE);
-	    }
-	    src_act_size = sb.st_size;
-	    if (src_act_size>src_size) {
-		fprintf (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);
-	}
-
-	/*
-	 * Update the destination offset, opening a new member if one will be
-	 * needed. The first member is extended to the logical member size
-	 * but other members might be smaller if they end with a hole.
-	 */
-        dst_offset = dst_offset + (off_t)n;
-	if (dst_is_family && dst_offset==dst_size) {
-	    if (0==dst_membno) {
-		if (HDlseek (dst, dst_size-1, SEEK_SET)<0) {
-		    perror ("HDHDlseek");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDread (dst, buf, 1)<0) {
-		    perror ("read");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDlseek (dst, dst_size-1, SEEK_SET)<0) {
-		    perror ("HDlseek");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDwrite (dst, buf, 1)<0) {
-		    perror ("write");
-		    exit (EXIT_FAILURE);
-		}
-	    }
-	    HDclose (dst);
-	    sprintf (dst_name, dst_gen_name, ++dst_membno);
-	    if ((dst = HDopen(dst_name, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
-            HDperror(dst_name);
-            HDexit(EXIT_FAILURE);
-	    }
-	    dst_offset = 0;
-	    need_seek = FALSE;
-	    if (verbose) fprintf (stderr, "> %s\n", dst_name);
-	}
+    /* Read a block.  The amount to read is the minimum of:
+    *    1. The I/O block size
+    *    2. What's left to write in the destination member
+    *    3. Left over zeros or what's left in the source member.
+    */
+        n = blk_size;
+        if (dst_is_family)
+            n = (size_t)MIN((off_t)n, dst_size-dst_offset);
+        if (left_overs) {
+            n = (size_t)MIN((off_t)n, left_overs);
+            left_overs = left_overs - (off_t) n;
+            need_write = FALSE;
+        }
+        else if (src_offset < src_act_size) {
+            n = (size_t)MIN((off_t)n, src_act_size-src_offset);
+            if ((nio = HDread(src, buf, n)) < 0) {
+                HDperror("read");
+                HDexit(EXIT_FAILURE);
+            }
+            else if ((size_t) nio != n) {
+                HDfprintf(stderr, "%s: short read\n", src_name);
+                HDexit(EXIT_FAILURE);
+            }
+            for (i = 0; i < n; i++) {
+                if (buf[i])
+                    break;
+            }
+            need_write = (i < n);
+        }
+        else {
+            n = 0;
+            left_overs = src_size - src_act_size;
+            need_write = FALSE;
+        }
+
+    /*
+    * If the block contains non-zero data then write it to the
+    * destination, otherwise just remember that we'll have to do a seek
+    * later in the destination when we finally get non-zero data.
+    */
+        if (need_write) {
+            if (need_seek && HDlseek (dst, dst_offset, SEEK_SET) < 0) {
+                HDperror("HDlseek");
+                HDexit(EXIT_FAILURE);
+            }
+            if ((nio = HDwrite(dst, buf, n)) < 0) {
+                HDperror("write");
+                HDexit(EXIT_FAILURE);
+            }
+            else if ((size_t) nio != n) {
+                HDfprintf(stderr, "%s: short write\n", dst_name);
+                HDexit(EXIT_FAILURE);
+            }
+            need_seek = FALSE;
+        }
+        else {
+            need_seek = TRUE;
+        }
+
+    /*
+    * Update the source offset and open the next source family member if
+    * necessary.  The source stream ends at the first member which
+    * cannot be opened because it doesn't exist.  At the end of the
+    * source stream, update the destination offset and break out of the
+    * loop.   The destination offset must be updated so we can fix
+    * trailing holes.
+    */
+        src_offset = src_offset + (off_t) n;
+        if (src_offset == src_act_size) {
+            HDclose(src);
+            if (!src_is_family) {
+                dst_offset = dst_offset + (off_t) n;
+                break;
+            }
+            HDsprintf(src_name, src_gen_name, ++src_membno);
+            if ((src = HDopen(src_name, O_RDONLY)) < 0 && ENOENT == errno) {
+                dst_offset = dst_offset + (off_t) n;
+                break;
+            }
+            else if (src < 0) {
+                HDperror(src_name);
+                HDexit(EXIT_FAILURE);
+            }
+            if (HDfstat (src, &sb) < 0) {
+                HDperror("fstat");
+                HDexit(EXIT_FAILURE);
+            }
+            src_act_size = sb.st_size;
+            if (src_act_size > src_size) {
+                HDfprintf(stderr, "%s: member truncated to %lu bytes\n", src_name, (unsigned long) src_size);
+            }
+            src_offset = 0;
+            if (verbose)
+                HDfprintf(stderr, "< %s\n", src_name);
+        }
+
+    /*
+    * Update the destination offset, opening a new member if one will be
+    * needed. The first member is extended to the logical member size
+    * but other members might be smaller if they end with a hole.
+    */
+        dst_offset = dst_offset + (off_t) n;
+        if (dst_is_family && dst_offset == dst_size) {
+            if (0 == dst_membno) {
+                if (HDlseek (dst, dst_size-1, SEEK_SET) < 0) {
+                    HDperror("HDHDlseek");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDread (dst, buf, 1) < 0) {
+                    HDperror("read");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDlseek (dst, dst_size-1, SEEK_SET) < 0) {
+                    HDperror("HDlseek");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDwrite (dst, buf, 1) < 0) {
+                    HDperror("write");
+                    HDexit(EXIT_FAILURE);
+                }
+            }
+            HDclose(dst);
+            HDsprintf(dst_name, dst_gen_name, ++dst_membno);
+            if ((dst = HDopen(dst_name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
+                HDperror(dst_name);
+                HDexit(EXIT_FAILURE);
+            }
+            dst_offset = 0;
+            need_seek = FALSE;
+            if (verbose)
+                HDfprintf(stderr, "> %s\n", dst_name);
+        }
     }
 
     /*
@@ -401,30 +417,30 @@ main (int argc, char *argv[])
      * family has been truncated.
      */
     if (need_seek) {
-	if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
-	    perror ("HDlseek");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDread (dst, buf, 1)<0) {
-	    perror ("read");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
-	    perror ("HDlseek");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDwrite (dst, buf, 1)<0) {
-	    perror ("write");
-	    exit (EXIT_FAILURE);
-	}
+        if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
+            HDperror ("HDlseek");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDread (dst, buf, 1)<0) {
+            HDperror ("read");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
+            HDperror ("HDlseek");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDwrite (dst, buf, 1)<0) {
+            HDperror ("write");
+            HDexit (EXIT_FAILURE);
+        }
     }
     HDclose (dst);
 
     /* Modify family driver information saved in superblock through private property.
      * These private properties are for this tool only. */
-    if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) {
-        perror ("H5Pcreate");
-        exit (EXIT_FAILURE);
+    if ((fapl=H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+        HDperror ("H5Pcreate");
+        HDexit (EXIT_FAILURE);
     }
 
     if(family_to_single) {
@@ -433,23 +449,24 @@ main (int argc, char *argv[])
          * the library to ignore the family driver information saved in the superblock.
          */
         if(H5Pset(fapl, H5F_ACS_FAMILY_TO_SINGLE_NAME, &family_to_single) < 0) {
-            perror ("H5Pset");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset");
+            HDexit (EXIT_FAILURE);
         }
-    } else {
+    }
+    else {
         /* Modify family size saved in superblock through private property. It signals
          * library to save the new member size(specified in command line) in superblock.
          * This private property is for this tool only. */
         if(H5Pset_fapl_family(fapl, H5F_FAMILY_DEFAULT, H5P_DEFAULT) < 0) {
-            perror ("H5Pset_fapl_family");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset_fapl_family");
+            HDexit (EXIT_FAILURE);
         }
 
         /* Set the property of the new member size as hsize_t */
         hdsize = (hsize_t)dst_size;
         if(H5Pset(fapl, H5F_ACS_FAMILY_NEWSIZE_NAME, &hdsize) < 0) {
-            perror ("H5Pset");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset");
+            HDexit (EXIT_FAILURE);
         }
     }
 
@@ -465,16 +482,16 @@ main (int argc, char *argv[])
         file = H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl);
     } H5E_END_TRY;
 
-    if(file>=0) {
-        if(H5Fclose(file)<0) {
-            perror ("H5Fclose");
-            exit (EXIT_FAILURE);
+    if(file >= 0) {
+        if(H5Fclose(file) < 0) {
+            HDperror("H5Fclose");
+            HDexit(EXIT_FAILURE);
         } /* end if */
     } /* end if */
 
-    if(H5Pclose(fapl)<0) {
-        perror ("H5Pclose");
-        exit (EXIT_FAILURE);
+    if(H5Pclose(fapl) < 0) {
+        HDperror("H5Pclose");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Free resources and return */
diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c
index 9f5d916..f6aa72f 100644
--- a/tools/test/h5copy/h5copygentest.c
+++ b/tools/test/h5copy/h5copygentest.c
@@ -326,7 +326,7 @@ static void gent_nested_vl(hid_t loc_id)
  * Function:    gent_att_compound_vlstr
  *
  * Purpose:     Generate a dataset and a group.
- *              Both has an attribute with a compound datatype consisting 
+ *              Both has an attribute with a compound datatype consisting
  *              of a variable length string
  *
  *-------------------------------------------------------------------------
@@ -337,15 +337,15 @@ static void gent_att_compound_vlstr(hid_t loc_id)
         int i;
         const char *v;
     } s1;
-    hsize_t dim[1] = {1};	/* Dimension size */
-    hid_t sid = -1; 		/* Dataspace ID */
-    hid_t tid = -1; 		/* Datatype ID */
-    hid_t aid = -1; 		/* Attribute ID */
-    hid_t did = -1; 		/* Dataset ID */
-    hid_t gid = -1; 		/* Group ID */
-    hid_t vl_str_tid = -1;	/* Variable length datatype ID */
-    hid_t cmpd_tid = -1;	/* Compound datatype ID */
-    hid_t null_sid = -1;	/* Null dataspace ID */
+    hsize_t dim[1] = {1};    /* Dimension size */
+    hid_t sid = -1;         /* Dataspace ID */
+    hid_t tid = -1;         /* Datatype ID */
+    hid_t aid = -1;         /* Attribute ID */
+    hid_t did = -1;         /* Dataset ID */
+    hid_t gid = -1;         /* Group ID */
+    hid_t vl_str_tid = -1;    /* Variable length datatype ID */
+    hid_t cmpd_tid = -1;    /* Compound datatype ID */
+    hid_t null_sid = -1;    /* Null dataspace ID */
     s1 buf;                 /* Buffer */
 
     buf.i = 9;
@@ -509,7 +509,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;
     }
@@ -517,7 +517,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;
     }
@@ -525,7 +525,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;
     }
@@ -538,7 +538,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;
     }
@@ -547,14 +547,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;
     }
@@ -562,7 +562,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;
     }
@@ -570,7 +570,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;
     }
@@ -578,7 +578,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;
     }
@@ -618,7 +618,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;
     }
@@ -627,7 +627,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;
     }
@@ -636,7 +636,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;
     }
@@ -645,7 +645,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;
     }
@@ -654,7 +654,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;
     }
@@ -663,7 +663,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;
     }
@@ -672,7 +672,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;
     }
@@ -683,7 +683,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;
     }
@@ -692,7 +692,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;
     }
@@ -701,7 +701,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;
     }
@@ -725,30 +725,30 @@ out:
  *------------------------------------------------------------------------*/
 static void Test_Obj_Copy(void)
 {
-    hid_t fid = -1;		        /* File id */
-    hid_t fapl_new = (-1);	        /* File access property id */
-    unsigned new_format;		/* New format or old format */
+    hid_t fid = -1;                /* File id */
+    hid_t fapl_new = (-1);            /* File access property id */
+    unsigned new_format;        /* New format or old format */
 
     if((fapl_new = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-        fprintf(stderr, "Error: H5Pcreate failed.\n");
+        HDfprintf(stderr, "Error: H5Pcreate failed.\n");
         goto out;
     }
     if(H5Pset_libver_bounds(fapl_new, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-        fprintf(stderr, "Error: H5Pset_libver_bounds failed.\n");
+        HDfprintf(stderr, "Error: H5Pset_libver_bounds failed.\n");
         goto out;
     }
 
     /* Test with old & new format groups */
     for(new_format = FALSE; new_format <= TRUE; new_format++) {
-    
+
         /* Set the FAPL for the type of format */
         /* Create source file */
         if(new_format)
-	    fid = H5Fcreate(HDF_FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_new);
-	else
-	    fid = H5Fcreate(HDF_FILE1_NEW, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        fid = H5Fcreate(HDF_FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_new);
+    else
+        fid = H5Fcreate(HDF_FILE1_NEW, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
         if(fid < 0) {
-            fprintf(stderr, "Error: H5Fcreate failed.\n");
+            HDfprintf(stderr, "Error: H5Fcreate failed.\n");
             goto out;
         }
 
@@ -756,7 +756,7 @@ static void Test_Obj_Copy(void)
         gent_empty_group(fid);
         gent_nested_datasets(fid);
         gent_nested_group(fid);
-	gent_att_compound_vlstr(fid);
+    gent_att_compound_vlstr(fid);
 
         H5Fclose(fid);
         fid = (-1);
@@ -786,19 +786,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:
     /*-----------------------------------------------------------------------
@@ -829,7 +829,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;
     }
@@ -845,7 +845,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;
     }
@@ -878,7 +878,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;
     }
@@ -890,7 +890,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;
     }
@@ -899,7 +899,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;
     }
@@ -908,7 +908,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;
     }
@@ -917,7 +917,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;
     }
@@ -926,7 +926,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;
     }
@@ -953,26 +953,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/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 4f92cae..d60e393 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -310,11 +310,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;
     }
 
@@ -1065,7 +1065,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;
     }
@@ -1075,28 +1075,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;
     }
@@ -1107,13 +1107,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;
     }
@@ -1124,7 +1124,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;
     }
@@ -1133,7 +1133,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;
     }
@@ -1143,28 +1143,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;
     }
@@ -1175,13 +1175,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;
     }
@@ -1192,7 +1192,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;
     }
@@ -1423,7 +1423,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;
     }
@@ -1433,7 +1433,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;
     }
@@ -1441,7 +1441,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;
     }
@@ -1451,14 +1451,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;
     }
@@ -1498,7 +1498,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;
     }
@@ -1508,7 +1508,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;
     }
@@ -1519,21 +1519,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;
     }
@@ -1544,42 +1544,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;
     }
@@ -1619,7 +1619,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;
     }
@@ -1629,21 +1629,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;
     }
@@ -1654,20 +1654,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;
     }
@@ -1679,84 +1679,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;
     }
@@ -1801,7 +1801,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;
     }
@@ -1809,7 +1809,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;
     }
@@ -1821,14 +1821,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;
     }
@@ -1839,21 +1839,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;
     }
@@ -1865,42 +1865,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;
     }
@@ -1945,7 +1945,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;
     }
@@ -1953,7 +1953,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;
     }
@@ -1964,7 +1964,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;
     }
@@ -1976,14 +1976,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;
     }
@@ -1995,14 +1995,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;
     }
@@ -2014,21 +2014,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;
     }
@@ -2158,14 +2158,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;
     }
@@ -2176,14 +2176,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;
     }
@@ -2191,14 +2191,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;
     }
@@ -2209,28 +2209,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;
     }
@@ -2238,28 +2238,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;
     }
@@ -2270,28 +2270,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;
     }
@@ -2299,28 +2299,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;
     }
@@ -2361,14 +2361,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;
     }
@@ -2379,28 +2379,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;
     }
@@ -2408,28 +2408,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;
     }
@@ -2440,21 +2440,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;
     }
@@ -2462,21 +2462,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;
     }
@@ -2487,54 +2487,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;
     }
@@ -2542,54 +2542,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;
     }
@@ -2600,28 +2600,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;
     }
@@ -2629,28 +2629,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;
     }
@@ -2661,21 +2661,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;
     }
@@ -2683,21 +2683,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;
     }
@@ -2709,14 +2709,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;
     }
@@ -2790,28 +2790,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;
     }
@@ -2886,7 +2886,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;
     }
@@ -2910,7 +2910,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;
     }
@@ -2944,14 +2944,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;
     }
@@ -2975,7 +2975,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;
     }
@@ -2996,7 +2996,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;
     }
@@ -3020,7 +3020,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;
     }
@@ -3030,7 +3030,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;
     }
@@ -3083,14 +3083,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;
     }
@@ -3101,7 +3101,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;
     }
@@ -3110,7 +3110,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;
     }
@@ -3121,21 +3121,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;
     }
@@ -3143,21 +3143,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;
     }
@@ -3204,14 +3204,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;
     }
@@ -3222,7 +3222,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;
     }
@@ -3230,7 +3230,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;
     }
@@ -3239,7 +3239,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;
     }
@@ -3250,21 +3250,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;
     }
@@ -3272,21 +3272,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;
     }
@@ -3332,14 +3332,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;
     }
@@ -3350,7 +3350,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;
     }
@@ -3361,14 +3361,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;
     }
@@ -3376,7 +3376,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;
     }
@@ -3698,7 +3698,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;
         }
@@ -3706,7 +3706,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;
         }
@@ -3717,7 +3717,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;
     }
@@ -3727,7 +3727,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;
     }
@@ -3735,7 +3735,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;
     }
@@ -3745,7 +3745,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;
     }
@@ -3753,7 +3753,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;
     }
@@ -3763,7 +3763,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;
     }
@@ -3771,7 +3771,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;
     }
@@ -3779,7 +3779,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;
     }
@@ -3789,7 +3789,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;
     }
@@ -3797,14 +3797,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;
     }
@@ -3814,7 +3814,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;
     }
@@ -3928,7 +3928,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;
     }
@@ -3938,7 +3938,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;
     }
@@ -3948,7 +3948,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;
     }
@@ -3958,7 +3958,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;
     }
@@ -3968,7 +3968,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;
     }
@@ -3978,7 +3978,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;
     }
@@ -3988,7 +3988,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;
     }
@@ -3998,7 +3998,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;
     }
@@ -4014,7 +4014,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;
     }
@@ -4136,14 +4136,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;
     }
@@ -4154,13 +4154,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;
     }
@@ -4794,7 +4794,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;
     }
@@ -4804,14 +4804,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;
     }
@@ -4824,13 +4824,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;
     }
@@ -4839,7 +4839,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;
     }
 
@@ -4849,13 +4849,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;
     }
@@ -4875,7 +4875,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;
     }
 
@@ -5085,14 +5085,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/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 63c4033..cb77771 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -562,7 +562,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);
@@ -1372,7 +1372,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);
@@ -1403,7 +1403,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);
@@ -1411,7 +1411,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);
@@ -1607,7 +1607,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);
@@ -1926,9 +1926,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);
@@ -1940,7 +1940,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);
@@ -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_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);
@@ -1973,7 +1973,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);
@@ -2006,7 +2006,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);
@@ -2020,7 +2020,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);
@@ -2703,14 +2703,14 @@ gent_vldatatypes2(void)
     for(i = 0; i < SPACE1_DIM1; i++) {
         wdata[i].p = (hvl_t *)HDmalloc((i + 1) * sizeof(hvl_t));
         if(wdata[i].p == NULL) {
-            printf("Cannot allocate memory for VL data! i=%u\n", i);
+            HDprintf("Cannot allocate memory for VL data! i=%u\n", i);
             return;
         } /* end if */
         wdata[i].len = i + 1;
         for(t1 = (hvl_t *)wdata[i].p, j = 0; j < (i + 1); j++, t1++) {
             t1->p = (unsigned *)HDmalloc((j + 1) * sizeof(unsigned));
             if(t1->p == NULL) {
-                printf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j);
+                HDprintf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j);
                 return;
             } /* end if */
             t1->len=j+1;
@@ -3762,9 +3762,9 @@ 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]);*/
+        /*HDprintf("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);
     }
     memb_map[H5FD_MEM_DEFAULT] = H5FD_MEM_SUPER;
@@ -3803,7 +3803,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);
     }
@@ -6274,7 +6274,7 @@ static int gent_ldouble(void)
     return 0;
 
     error:
-    printf("error !\n");
+    HDprintf("error !\n");
     return -1;
 
 }
@@ -6437,7 +6437,7 @@ gent_bigdims(void)
     return;
 
     out:
-    printf("Error.....\n");
+    HDprintf("Error.....\n");
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
         H5Sclose(f_sid);
@@ -6629,7 +6629,7 @@ gent_group_creation_order(void)
     return;
 
     out:
-    printf("Error.....\n");
+    HDprintf("Error.....\n");
     H5E_BEGIN_TRY {
         H5Gclose(gid);
         H5Pclose(gcpl_id);
@@ -6898,7 +6898,7 @@ gent_attr_creation_order(void)
     return;
 
     out:
-    printf("Error.....\n");
+    HDprintf("Error.....\n");
     H5E_BEGIN_TRY {
         H5Gclose(gid);
         H5Dclose(did);
diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c
index bbb67b6..560f1b3 100644
--- a/tools/test/h5import/h5importtest.c
+++ b/tools/test/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);
 
  /*-------------------------------------------------------------------------
@@ -436,21 +436,21 @@ main(void)
         {
             char c = bin8w[i];
             if ( HDfwrite( &c, sizeof(char), 1, sp) != 1 )
-                printf("error writing file\n");
+                HDprintf("error writing file\n");
         }
         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/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index 1644440..56b4ead 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -172,7 +172,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);
@@ -203,7 +203,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);
@@ -211,7 +211,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/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index ea362f5..2fce729 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -126,7 +126,7 @@ main (int argc, const char *argv[])
 
     ifname = HDstrdup(argv[opt_ind]);
 
-  testval = H5Fis_hdf5 (ifname);
+    testval = H5Fis_hdf5 (ifname);
 
     if(testval <= 0) {
         error_msg("Input HDF5 file is not HDF \"%s\"\n", ifname);
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index a89bf10..057cbbd 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -3108,7 +3108,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)
@@ -3133,7 +3133,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)
@@ -3195,7 +3195,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;
     }
@@ -6182,7 +6182,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;
     }
@@ -6191,7 +6191,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;
     }
@@ -6200,7 +6200,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;
     }
@@ -6209,7 +6209,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;
     }
@@ -6251,7 +6251,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;
     }
@@ -6260,7 +6260,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;
     }
@@ -6269,7 +6269,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;
     }
@@ -6278,7 +6278,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;
     }
@@ -6324,7 +6324,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;
     }
@@ -6332,7 +6332,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;
     }
@@ -6340,7 +6340,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;
     }
@@ -6352,7 +6352,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;
     }
@@ -6365,7 +6365,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;
      }
@@ -6378,7 +6378,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;
     }
@@ -6387,7 +6387,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;
     }
@@ -6396,7 +6396,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;
     }
@@ -6453,7 +6453,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;
     }
@@ -6462,7 +6462,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;
     }
@@ -6471,7 +6471,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;
     }
@@ -6482,7 +6482,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;
     }
@@ -6490,7 +6490,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;
     }
@@ -6498,7 +6498,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;
     }
@@ -6511,7 +6511,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;
     }
@@ -6520,7 +6520,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;
     }
@@ -6573,7 +6573,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;
     }
@@ -6582,7 +6582,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;
     }
@@ -6591,7 +6591,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;
     }
@@ -6600,7 +6600,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;
     }
@@ -6609,7 +6609,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;
     }
@@ -6618,7 +6618,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;
     }
@@ -6627,7 +6627,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;
     }
@@ -6636,7 +6636,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;
     }
@@ -6649,7 +6649,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;
     }
@@ -6658,7 +6658,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;
     }
@@ -6691,7 +6691,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;
     }
 
@@ -6699,7 +6699,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;
     }
 
@@ -6707,7 +6707,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;
     }
 
@@ -6831,7 +6831,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;
     }
@@ -6841,7 +6841,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;
     }
@@ -6854,7 +6854,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;
     }
@@ -6869,7 +6869,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;
     }
@@ -6893,7 +6893,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;
     }
@@ -6903,7 +6903,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;
     }
@@ -6913,7 +6913,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;
     }
@@ -6927,7 +6927,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;
     }
@@ -6949,14 +6949,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;
     }
@@ -6970,7 +6970,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;
     }
@@ -6996,7 +6996,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;
     }
@@ -7004,7 +7004,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;
     }
@@ -7012,7 +7012,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;
     }
@@ -7030,7 +7030,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;
     }
@@ -7039,7 +7039,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;
     }
@@ -7060,14 +7060,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;
     }
@@ -7085,7 +7085,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;
     }
@@ -7094,7 +7094,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;
     }